From 5ac355eaa1dd42ebf65eef9538e85f9314ac23b0 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 10 Jul 2017 22:32:48 +0900
Subject: [PATCH 001/138] #795 Add a read or unread label to knowledge list

---
 document/database/A5M2_knowledge.pdf          | Bin 70119 -> 70126 bytes
 document/database/knowledge.a5er              |  33 ++++++++-------
 .../knowledge/config/SystemConfig.java        |   2 +
 .../control/open/KnowledgeControl.java        |   2 +
 .../project/knowledge/dao/KnowledgesDao.java  |   5 +++
 .../knowledge/dao/ViewHistoriesDao.java       |  31 ++++++++++++++
 .../knowledge/dao/gen/GenKnowledgesDao.java   |   3 ++
 .../entity/gen/GenKnowledgesEntity.java       |  19 +++++++++
 .../knowledge/logic/KnowledgeLogic.java       |  39 +++++++++++++++++-
 .../project/knowledge/vo/StockKnowledge.java  |  16 +++++++
 src/main/resources/appresource.properties     |   2 +
 src/main/resources/appresource_ja.properties  |   2 +
 .../KnowledgesDao/KnowledgesDao_insert.sql    |   2 +
 .../KnowledgesDao_raw_insert.sql              |   2 +
 .../KnowledgesDao/KnowledgesDao_update.sql    |   1 +
 .../project/knowledge/database/ddl.sql        |   8 ++++
 .../open/knowledge/partials/common_list.jsp   |  23 +++++++----
 src/main/webapp/css/knowledge-list.css        |   6 ++-
 18 files changed, 171 insertions(+), 25 deletions(-)

diff --git a/document/database/A5M2_knowledge.pdf b/document/database/A5M2_knowledge.pdf
index a6ef73af790775e0587713114342c785e6a2803d..ec98598a6a76b5df7ac4bd55c29db5fea1899619 100755
GIT binary patch
delta 23069
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

delta 23119
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

diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
index 34604e0ca..c6e152e15 100755
--- a/document/database/knowledge.a5er
+++ b/document/database/knowledge.a5er
@@ -228,7 +228,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=ITEM_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4194,5115,6185,R,R
+Position="MAIN",0,4194,5115,6199,R,R
 Dependence=0
 Caption=
 PName=
@@ -236,7 +236,7 @@ ModifiedDateTime=20170220204434
 LineMode=0
 Bar1=419
 Bar2=512
-Bar3=618
+Bar3=620
 TermPos1=R
 TermPos2=R
 
@@ -267,7 +267,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4662,4335,5351,R,R
+Position="MAIN",0,4662,4335,5353,R,R
 Dependence=0
 Caption=
 PName=
@@ -303,7 +303,7 @@ Fields1=KNOWLEDGE_ID,ITEM_NO
 Fields2=KNOWLEDGE_ID,ITEM_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4139,4896,5177,R,R
+Position="MAIN",0,4139,4896,5178,R,R
 Dependence=1
 Caption=
 PName=
@@ -420,7 +420,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4320,4611,5405,R,R
+Position="MAIN",0,4320,4611,5418,R,R
 Dependence=1
 Caption=
 PName=
@@ -428,7 +428,7 @@ ModifiedDateTime=20170222215225
 LineMode=0
 Bar1=432
 Bar2=461
-Bar3=540
+Bar3=542
 TermPos1=R
 TermPos2=R
 
@@ -570,7 +570,7 @@ Fields1=HOOK_ID
 Fields2=HOOK
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4124,4194,3050,R,R
+Position="MAIN",0,4124,4194,3043,R,R
 Dependence=0
 Caption=
 PName=
@@ -578,7 +578,7 @@ ModifiedDateTime=20161206104307
 LineMode=0
 Bar1=412
 Bar2=419
-Bar3=305
+Bar3=304
 TermPos1=R
 TermPos2=R
 
@@ -1108,7 +1108,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,5026,7091,5584,R,R
+Position="MAIN",0,5026,7091,6143,R,R
 Dependence=1
 Caption=
 PName=
@@ -1116,7 +1116,7 @@ ModifiedDateTime=20150910041644
 LineMode=0
 Bar1=503
 Bar2=709
-Bar3=558
+Bar3=614
 TermPos1=R
 TermPos2=R
 
@@ -1376,10 +1376,12 @@ Field="HISTORY_NO","HISTORY_NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
 Field="日時","VIEW_DATE_TIME","@DATETIME","NOT NULL",,"","",$FFFFFFFF,""
 Index=IDX_VIEW_HISTORIES_KNOWLEDGE_ID=0,KNOWLEDGE_ID
+Index=IDX_VIEW_HISTORIES_INSERT_USER=0,INSERT_USER
+Index=IDX_VIEW_HISTORIES_KNOWLEDGE_ID_INSERT_USER=0,KNOWLEDGE_ID,INSERT_USER
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20150416233623
+ModifiedDateTime=20170705135644
 Position="MAIN",50,1400
 
 [Relation]
@@ -1391,7 +1393,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,2082,5725,4629,R,R
+Position="MAIN",0,2082,5725,4638,R,R
 Dependence=1
 Caption=
 PName=
@@ -1399,7 +1401,7 @@ ModifiedDateTime=20150910042925
 LineMode=0
 Bar1=208
 Bar2=572
-Bar3=463
+Bar3=464
 TermPos1=R
 TermPos2=R
 
@@ -1503,7 +1505,7 @@ Fields1=TAG_ID
 Fields2=TAG_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4552,5672,4658,R,R
+Position="MAIN",0,4552,5672,4659,R,R
 Dependence=1
 Caption=
 PName=
@@ -1626,12 +1628,13 @@ Field="タグID一覧","TAG_IDS","@VARCHAR(1024)",,,"","",$FFFFFFFF,""
 Field="タグ名称一覧","TAG_NAMES","text",,,"","",$FFFFFFFF,""
 Field="いいね件数","LIKE_COUNT","bigint",,,"","",$FFFFFFFF,""
 Field="コメント件数","COMMENT_COUNT","@INT",,,"","",$FFFFFFFF,""
+Field="参照件数","VIEW_COUNT","bigint",,,"","",$FFFFFFFF,""
 Field="テンプレートの種類ID","TYPE_ID","@INT",,,"","",$FFFFFFFF,""
 Field="通知ステータス","NOTIFY_STATUS","@INT",,,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20161118153424
+ModifiedDateTime=20170705135801
 Position="MAIN",700,1100
 
 [Comment]
diff --git a/src/main/java/org/support/project/knowledge/config/SystemConfig.java b/src/main/java/org/support/project/knowledge/config/SystemConfig.java
index 27e880533..087112f17 100644
--- a/src/main/java/org/support/project/knowledge/config/SystemConfig.java
+++ b/src/main/java/org/support/project/knowledge/config/SystemConfig.java
@@ -17,6 +17,8 @@ public class SystemConfig {
     
     //public static final String KNOWLEDGE_ENV_KEY = "KNOWLEDGE_HOME";
     
+    public static final int SYSTEM_USER_ID = -1;
+    
     /** システム設定情報 */
     private static ServiceConfigsEntity serviceConfigsEntity = null;
     /** 言語毎のシステム設定情報 */
diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 40ccb4300..dc42d50d9 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -470,6 +470,7 @@ public Boundary list() throws Exception {
             }
     
             List<StockKnowledge> stocks = knowledgeLogic.setStockInfo(knowledges, loginedUser);
+            KnowledgeLogic.get().setViewed(stocks, getLoginedUser());
             setAttribute("knowledges", stocks);
             LOG.trace("検索終了");
             
@@ -516,6 +517,7 @@ public Boundary events() throws InvalidParamException {
                 Participations participations = EventsLogic.get().isParticipation(stock.getKnowledgeId(), getLoginUserId());
                 stock.setParticipations(participations);
             }
+            KnowledgeLogic.get().setViewed(stocks, getLoginedUser());
             setAttribute("knowledges", stocks);
         } catch (java.text.ParseException e) {
             return sendError(HttpStatus.SC_400_BAD_REQUEST, "BAD REQUEST");
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
index a303f82df..e83dc86f3 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
@@ -311,4 +311,9 @@ public List<KnowledgesEntity> selectAccessAbleKnowledgeOnIdPrefix(String q, Logi
         return executeQueryList(sql, KnowledgesEntity.class, params.toArray(new Object[0]));
     }
 
+    public void updateViewCount(Long count, Long knowledgeId) {
+        String sql = "UPDATE KNOWLEDGES SET VIEW_COUNT = ? WHERE KNOWLEDGE_ID = ?";
+        executeUpdate(sql, count, knowledgeId);
+    }
+
 }
diff --git a/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
index 188cb3f4a..bd8144f58 100644
--- a/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
@@ -1,9 +1,13 @@
 package org.support.project.knowledge.dao;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.dao.gen.GenViewHistoriesDao;
+import org.support.project.knowledge.vo.StockKnowledge;
 
 /**
  * ナレッジの参照履歴
@@ -22,5 +26,32 @@ public class ViewHistoriesDao extends GenViewHistoriesDao {
     public static ViewHistoriesDao get() {
         return Container.getComp(ViewHistoriesDao.class);
     }
+    
+    /**
+     * 指定のKnowledgeを参照したことがあるか検索して取得
+     * @param stocks
+     * @param userId
+     * @return
+     */
+    public List<Long> selectViewdKnowledgeIds(List<StockKnowledge> stocks, Integer userId) {
+        if (stocks == null || stocks.isEmpty()) {
+            return new ArrayList<>();
+        }
+        StringBuilder sql = new StringBuilder();
+        sql.append("SELECT DISTINCT KNOWLEDGE_ID FROM VIEW_HISTORIES WHERE KNOWLEDGE_ID IN (");
+        int cnt = 0;
+        List<Object> params = new ArrayList<>();
+        for (StockKnowledge knowledge : stocks) {
+            if (cnt > 0) {
+                sql.append(", ");
+            }
+            params.add(knowledge.getKnowledgeId());
+            sql.append("?");
+            cnt++;
+        }
+        sql.append(") AND INSERT_USER = ?");
+        params.add(userId);
+        return executeQueryList(sql.toString(), Long.class, params.toArray(new Object[0]));
+    }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
index eed483399..edfa1ffb7 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
@@ -127,6 +127,7 @@ public KnowledgesEntity rawPhysicalInsert(KnowledgesEntity entity) {
             entity.getTagNames(), 
             entity.getLikeCount(), 
             entity.getCommentCount(), 
+            entity.getViewCount(), 
             entity.getTypeId(), 
             entity.getNotifyStatus(), 
             entity.getInsertUser(), 
@@ -159,6 +160,7 @@ public KnowledgesEntity physicalInsert(KnowledgesEntity entity) {
             entity.getTagNames(), 
             entity.getLikeCount(), 
             entity.getCommentCount(), 
+            entity.getViewCount(), 
             entity.getTypeId(), 
             entity.getNotifyStatus(), 
             entity.getInsertUser(), 
@@ -213,6 +215,7 @@ public KnowledgesEntity physicalUpdate(KnowledgesEntity entity) {
             entity.getTagNames(), 
             entity.getLikeCount(), 
             entity.getCommentCount(), 
+            entity.getViewCount(), 
             entity.getTypeId(), 
             entity.getNotifyStatus(), 
             entity.getInsertUser(), 
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
index e63499d45..381eefd72 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
@@ -65,6 +65,8 @@ public GenKnowledgesEntity(Long knowledgeId) {
     private Long likeCount;
     /** コメント件数 */
     private Integer commentCount;
+    /** 参照件数 */
+    private Long viewCount;
     /** テンプレートの種類ID */
     private Integer typeId;
     /** 通知ステータス */
@@ -208,6 +210,22 @@ public GenKnowledgesEntity setCommentCount(Integer commentCount) {
         return this;
     }
 
+    /**
+     * Get 参照件数.
+     * @return 参照件数
+     */
+    public Long getViewCount() {
+        return this.viewCount;
+    }
+    /**
+     * Set 参照件数.
+     * @param viewCount 参照件数
+     * @return this object     */
+    public GenKnowledgesEntity setViewCount(Long viewCount) {
+        this.viewCount = viewCount;
+        return this;
+    }
+
     /**
      * Get テンプレートの種類ID.
      * @return テンプレートの種類ID
@@ -376,6 +394,7 @@ public String toString() {
         builder.append("tagNames = ").append(tagNames).append("\n");
         builder.append("likeCount = ").append(likeCount).append("\n");
         builder.append("commentCount = ").append(commentCount).append("\n");
+        builder.append("viewCount = ").append(viewCount).append("\n");
         builder.append("typeId = ").append(typeId).append("\n");
         builder.append("notifyStatus = ").append(notifyStatus).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index 1c6f1063c..62c0f99b6 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -20,6 +20,7 @@
 import org.support.project.di.Instance;
 import org.support.project.knowledge.bat.FileParseBat;
 import org.support.project.knowledge.config.IndexType;
+import org.support.project.knowledge.config.SystemConfig;
 import org.support.project.knowledge.dao.CommentsDao;
 import org.support.project.knowledge.dao.DraftItemValuesDao;
 import org.support.project.knowledge.dao.DraftKnowledgesDao;
@@ -1078,6 +1079,7 @@ public void deleteOnUser(Integer loginUserId) throws Exception {
      * @param knowledgeId
      * @param loginedUser
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void addViewHistory(Long knowledgeId, LoginedUser loginedUser) {
         ViewHistoriesDao historiesDao = ViewHistoriesDao.get();
         ViewHistoriesEntity historiesEntity = new ViewHistoriesEntity();
@@ -1085,8 +1087,20 @@ public void addViewHistory(Long knowledgeId, LoginedUser loginedUser) {
         historiesEntity.setViewDateTime(new Timestamp(new Date().getTime()));
         if (loginedUser != null) {
             historiesEntity.setInsertUser(loginedUser.getUserId());
+        } else {
+            historiesEntity.setInsertUser(SystemConfig.SYSTEM_USER_ID);
         }
         historiesDao.insert(historiesEntity);
+        
+        KnowledgesEntity entity = KnowledgesDao.get().selectOnKey(knowledgeId);
+        if (entity != null) {
+            Long count = entity.getViewCount();
+            if (count == null) {
+                count = new Long(0);
+            }
+            count = count + 1;
+            KnowledgesDao.get().updateViewCount(count, knowledgeId);
+        }
     }
 
     /**
@@ -1559,7 +1573,28 @@ public List<KnowledgesEntity> selectAccessAbleKnowledge(String q, LoginedUser lo
         }
         return KnowledgesDao.get().selectAccessAbleKnowledgeOnIdPrefix(q, loginedUser, limit, offset);
     }
-
-    
     
+    /**
+     * 参照済かどうかをセットする
+     * @param stocks
+     * @param loginedUser
+     */
+    public void setViewed(List<StockKnowledge> stocks, LoginedUser loginedUser) {
+        if (stocks == null) {
+            return;
+        }
+        if (loginedUser == null) {
+            // 未ログインユーザは、未読かんりしないので、全て既読にする
+            for (StockKnowledge knowledge : stocks) {
+                knowledge.setViewed(true);
+            }
+            return;
+        }
+        List<Long> knowledgeIds = ViewHistoriesDao.get().selectViewdKnowledgeIds(stocks, loginedUser.getUserId());
+        for (StockKnowledge knowledge : stocks) {
+            if (knowledgeIds.contains(knowledge.getKnowledgeId())) {
+                knowledge.setViewed(true);
+            }
+        }
+    }
 }
diff --git a/src/main/java/org/support/project/knowledge/vo/StockKnowledge.java b/src/main/java/org/support/project/knowledge/vo/StockKnowledge.java
index 0c015a2fc..65e4b4d0b 100644
--- a/src/main/java/org/support/project/knowledge/vo/StockKnowledge.java
+++ b/src/main/java/org/support/project/knowledge/vo/StockKnowledge.java
@@ -15,6 +15,8 @@ public class StockKnowledge extends KnowledgesEntity {
     
     private Participations participations;
     
+    private boolean viewed = false;
+    
     /**
      * Get stocks
      * @return the stocks
@@ -44,6 +46,20 @@ public Participations getParticipations() {
     public void setParticipations(Participations participations) {
         this.participations = participations;
     }
+
+    /**
+     * @return the viewed
+     */
+    public boolean isViewed() {
+        return viewed;
+    }
+
+    /**
+     * @param viewed the viewed to set
+     */
+    public void setViewed(boolean viewed) {
+        this.viewed = viewed;
+    }
     
     
 }
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 26c0a01be..233424a67 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -113,6 +113,8 @@ label.new=New
 label.initialize=Initialize
 label.move.up=Move Up
 label.move.down=Move Down
+label.unread=Unread
+label.read=Read
 
 label.public.view=<i class="fa fa-globe"></i>&nbsp;[Public]
 label.protect.view=<i class="fa fa-gavel"></i>&nbsp;[Protection]
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index f8494e4d8..701f9fe3c 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -113,6 +113,8 @@ label.new=新規作成
 label.initialize=初期化
 label.move.up=上へ移動
 label.move.down=下へ移動
+label.unread=未読
+label.read=既読
 
 label.public.view=<i class="fa fa-globe"></i>&nbsp;[公開]
 label.protect.view=<i class="fa fa-gavel"></i>&nbsp;[保護]
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_insert.sql
index b6d05f0b4..f40c1b718 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_insert.sql
@@ -8,6 +8,7 @@ KNOWLEDGE_ID
  , TAG_NAMES
  , LIKE_COUNT
  , COMMENT_COUNT
+ , VIEW_COUNT
  , TYPE_ID
  , NOTIFY_STATUS
  , INSERT_USER
@@ -31,4 +32,5 @@ DEFAULT
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_raw_insert.sql
index ad7d0565e..11925a065 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_raw_insert.sql
@@ -8,6 +8,7 @@ KNOWLEDGE_ID
  , TAG_NAMES
  , LIKE_COUNT
  , COMMENT_COUNT
+ , VIEW_COUNT
  , TYPE_ID
  , NOTIFY_STATUS
  , INSERT_USER
@@ -31,4 +32,5 @@ KNOWLEDGE_ID
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_update.sql
index e9e7eac9a..88ac91462 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_update.sql
@@ -7,6 +7,7 @@ SET
  , TAG_NAMES = ?
  , LIKE_COUNT = ?
  , COMMENT_COUNT = ?
+ , VIEW_COUNT = ?
  , TYPE_ID = ?
  , NOTIFY_STATUS = ?
  , INSERT_USER = ?
diff --git a/src/main/resources/org/support/project/knowledge/database/ddl.sql b/src/main/resources/org/support/project/knowledge/database/ddl.sql
index aa7ff4623..4c6e5eb0a 100644
--- a/src/main/resources/org/support/project/knowledge/database/ddl.sql
+++ b/src/main/resources/org/support/project/knowledge/database/ddl.sql
@@ -617,6 +617,12 @@ create table VIEW_HISTORIES (
 create index IDX_VIEW_HISTORIES_KNOWLEDGE_ID
   on VIEW_HISTORIES(KNOWLEDGE_ID);
 
+create index IDX_VIEW_HISTORIES_INSERT_USER
+  on VIEW_HISTORIES(INSERT_USER);
+
+create index IDX_VIEW_HISTORIES_KNOWLEDGE_ID_INSERT_USER
+  on VIEW_HISTORIES(KNOWLEDGE_ID,INSERT_USER);
+
 -- ストックしたナレッジ
 drop table if exists STOCK_KNOWLEDGES cascade;
 
@@ -723,6 +729,7 @@ create table KNOWLEDGES (
   , TAG_NAMES text
   , LIKE_COUNT bigint
   , COMMENT_COUNT integer
+  , VIEW_COUNT bigint
   , TYPE_ID integer
   , NOTIFY_STATUS integer
   , INSERT_USER integer
@@ -1218,6 +1225,7 @@ comment on column KNOWLEDGES.TAG_IDS is 'タグID一覧';
 comment on column KNOWLEDGES.TAG_NAMES is 'タグ名称一覧';
 comment on column KNOWLEDGES.LIKE_COUNT is 'いいね件数';
 comment on column KNOWLEDGES.COMMENT_COUNT is 'コメント件数';
+comment on column KNOWLEDGES.VIEW_COUNT is '参照件数';
 comment on column KNOWLEDGES.TYPE_ID is 'テンプレートの種類ID';
 comment on column KNOWLEDGES.NOTIFY_STATUS is '通知ステータス';
 comment on column KNOWLEDGES.INSERT_USER is '登録ユーザ';
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp
index b7ae0718a..e70d5a60e 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp
@@ -31,8 +31,19 @@
     </c:if>
 
     <c:forEach var="knowledge" items="${list_data}" varStatus="status">
-        <% KnowledgesEntity knowledge = (KnowledgesEntity) pageContext.getAttribute("knowledge"); %>
-        <div class="knowledge_item">
+        <% KnowledgesEntity knowledge = (KnowledgesEntity) pageContext.getAttribute("knowledge");
+        StockKnowledge stock = null;
+        String unread = "";
+        String unreadLabel = "";
+        if (knowledge instanceof StockKnowledge) { 
+            stock = (StockKnowledge) knowledge;
+            if (!stock.isViewed()) {
+                unread = "unread";
+                unreadLabel = "[" + jspUtil.label("label.unread") + "]";
+            }
+        }
+        %>
+        <div class="knowledge_item <%= unread %>">
             <div class="insert_info">
                 <a href="<%=request.getContextPath()%>/open.knowledge/view/<%=jspUtil.out("knowledge.knowledgeId")%><%=jspUtil.out("params")%>"
                     class="text-primary btn-link">
@@ -44,6 +55,7 @@
                     </div>
                 </a>
                 <div>
+                    <%= unreadLabel %>
                     <img src="<%=request.getContextPath()%>/images/loader.gif"
                         data-echo="<%=request.getContextPath()%>/open.account/icon/<%=jspUtil.out("knowledge.insertUser")%>" alt="icon"
                         width="20" height="20" />
@@ -69,11 +81,8 @@
                  <div>
                      <i class="fa fa-calendar"></i>&nbsp;
                      <%= jspUtil.label("knowledge.list.event.datetime") %>: <%= knowledge.getLocalStartDateTime(jspUtil.locale(), timezone) %>
-                     
                      <%
-                     if (knowledge instanceof StockKnowledge) { 
-                         StockKnowledge stock = (StockKnowledge) knowledge;
-                         if (stock.getParticipations() != null) {
+                         if (stock != null && stock.getParticipations() != null) {
                      %>
                      <i class="fa fa-users"></i>&nbsp;<%= stock.getParticipations().getCount() %> /  <%= stock.getParticipations().getLimit() %>
                      <% if (stock.getParticipations().getStatus() != null) { %>
@@ -85,7 +94,7 @@
                          <% } %>
                      </span>
                      <% } %>
-                     <% } } %>
+                     <% } %>
                  </div>
                  <% } %>
             </div>
diff --git a/src/main/webapp/css/knowledge-list.css b/src/main/webapp/css/knowledge-list.css
index c9b79df07..3cbed54a9 100644
--- a/src/main/webapp/css/knowledge-list.css
+++ b/src/main/webapp/css/knowledge-list.css
@@ -10,7 +10,6 @@
     padding-right: 5px;
     border-bottom: 1px solid #cccccc;
 }
-
 .knowledge_item:hover {
     border: 1px solid #ccc;
     color:black;
@@ -25,6 +24,11 @@
     text-decoration: none;
     outline: 0;
 }
+.unread {
+    background-color: #e5fcff;
+}
+
+
 .list-title {
     font-size: 20px;
     padding-top: 10px;

From 9bab2f1937d3622331d4bfda780983382460204c Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 13 Jul 2017 07:12:37 +0900
Subject: [PATCH 002/138] #795 Add migrate database to v 1.11.0

---
 .../project/knowledge/deploy/InitDB.java      |  4 +++-
 .../deploy/v1_11_0/Migrate_1_11_0.java        | 21 +++++++++++++++++++
 .../deploy/v1_11_0/migrate_v1_11_0.sql        | 12 +++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_0.java
 create mode 100644 src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_0.sql

diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
index f71d5c0d4..a3661fc7d 100644
--- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java
+++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
@@ -20,6 +20,7 @@
 import org.support.project.knowledge.deploy.v1_10_0.Migrate_1_10_0;
 import org.support.project.knowledge.deploy.v1_10_0.Migrate_1_10_1;
 import org.support.project.knowledge.deploy.v1_10_0.Migrate_1_10_2;
+import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_0;
 import org.support.project.knowledge.deploy.v1_1_0pre1.Migrate_1_1_0pre1;
 import org.support.project.knowledge.deploy.v1_4_0.Migrate_1_4_0;
 import org.support.project.knowledge.deploy.v1_5_0.Migrate_1_5_0;
@@ -44,7 +45,7 @@ public class InitDB {
     private static final Map<String, Migrate> MAP = new LinkedHashMap<>();
 
     private static final Migrate INIT = InitializeSystem.get();
-    public static final String CURRENT = "1.10.2";
+    public static final String CURRENT = "1.11.0";
 
     public InitDB() {
         super();
@@ -74,6 +75,7 @@ public InitDB() {
         MAP.put("1.10.0", Migrate_1_10_0.get());
         MAP.put("1.10.1", Migrate_1_10_1.get());
         MAP.put("1.10.2", Migrate_1_10_2.get());
+        MAP.put("1.11.0", Migrate_1_11_0.get());
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_0.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_0.java
new file mode 100644
index 000000000..34afd71c2
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_0.java
@@ -0,0 +1,21 @@
+package org.support.project.knowledge.deploy.v1_11_0;
+
+import org.support.project.knowledge.deploy.Migrate;
+import org.support.project.ormapping.tool.dao.InitializeDao;
+
+public class Migrate_1_11_0 implements Migrate {
+
+    public static Migrate_1_11_0 get() {
+        return org.support.project.di.Container.getComp(Migrate_1_11_0.class);
+    }
+
+    @Override
+    public boolean doMigrate() throws Exception {
+        InitializeDao initializeDao = InitializeDao.get();
+        String[] sqlpaths = {
+            "/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_0.sql",
+        };
+        initializeDao.initializeDatabase(sqlpaths);
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_0.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_0.sql
new file mode 100644
index 000000000..d4422c850
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_0.sql
@@ -0,0 +1,12 @@
+ALTER TABLE KNOWLEDGES DROP COLUMN IF EXISTS VIEW_COUNT;
+ALTER TABLE KNOWLEDGES ADD COLUMN VIEW_COUNT bigint;
+
+comment on column KNOWLEDGES.VIEW_COUNT is '参照件数';
+
+create index IDX_VIEW_HISTORIES_INSERT_USER
+  on VIEW_HISTORIES(INSERT_USER);
+
+create index IDX_VIEW_HISTORIES_KNOWLEDGE_ID_INSERT_USER
+  on VIEW_HISTORIES(KNOWLEDGE_ID,INSERT_USER);
+
+  
\ No newline at end of file

From b94ead1d9eb55dc21fd9f342243ea63ec9d5da85 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 13 Jul 2017 07:58:47 +0900
Subject: [PATCH 003/138] #795 Add a read or unread label to list of popular /
 stock / history

---
 .../project/knowledge/control/open/KnowledgeControl.java    | 6 ++++--
 .../project/knowledge/entity/gen/GenKnowledgesEntity.java   | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index dc42d50d9..18230dc1d 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -490,7 +490,7 @@ public Boundary list() throws Exception {
     }
 
     /**
-     * 閲覧履歴の表示
+     * イベント一覧
      * 
      * @return
      * @throws InvalidParamException
@@ -563,6 +563,7 @@ public Boundary show_history() throws InvalidParamException {
         }
         List<KnowledgesEntity> histories = knowledgeLogic.getKnowledges(historyIds, loginedUser);
         List<StockKnowledge> stocks = knowledgeLogic.setStockInfo(histories, loginedUser);
+        KnowledgeLogic.get().setViewed(stocks, getLoginedUser());
         setAttribute("histories", stocks);
         LOG.trace("履歴取得完了");
 
@@ -587,6 +588,7 @@ public Boundary show_popularity() throws InvalidParamException {
 
         List<KnowledgesEntity> list = knowledgeLogic.getPopularityKnowledges(loginedUser, 0, 20);
         List<StockKnowledge> stocks = knowledgeLogic.setStockInfo(list, loginedUser);
+        KnowledgeLogic.get().setViewed(stocks, getLoginedUser());
         setAttribute("popularities", stocks);
         LOG.trace("取得完了");
         // ナレッジの公開先の情報を取得
@@ -625,7 +627,7 @@ public Boundary stocks() throws InvalidParamException {
         KnowledgeLogic knowledgeLogic = KnowledgeLogic.get();
         List<KnowledgesEntity> list = knowledgeLogic.getStocks(loginedUser, offset * PAGE_LIMIT, PAGE_LIMIT, stockid);
         List<StockKnowledge> stocks = knowledgeLogic.setStockInfo(list, loginedUser);
-//        setAttribute("stocks", list);
+        KnowledgeLogic.get().setViewed(stocks, getLoginedUser());
         setAttribute("popularities", stocks);
         LOG.trace("取得完了");
         
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
index 381eefd72..4ddbd2667 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
@@ -62,11 +62,11 @@ public GenKnowledgesEntity(Long knowledgeId) {
     /** タグ名称一覧 */
     private String tagNames;
     /** いいね件数 */
-    private Long likeCount;
+    private Long likeCount = new Long(0);
     /** コメント件数 */
-    private Integer commentCount;
+    private Integer commentCount = 0;
     /** 参照件数 */
-    private Long viewCount;
+    private Long viewCount = new Long(0);
     /** テンプレートの種類ID */
     private Integer typeId;
     /** 通知ステータス */

From 06a4a16f5dab385760a586881522b6aa96aad6ce Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 13 Jul 2017 08:20:22 +0900
Subject: [PATCH 004/138] #795 Add set view count to migrate sql

---
 .../project/knowledge/deploy/v1_11_0/migrate_v1_11_0.sql | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_0.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_0.sql
index d4422c850..ec7c35aba 100644
--- a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_0.sql
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_0.sql
@@ -3,10 +3,17 @@ ALTER TABLE KNOWLEDGES ADD COLUMN VIEW_COUNT bigint;
 
 comment on column KNOWLEDGES.VIEW_COUNT is '参照件数';
 
+drop index if exists IDX_VIEW_HISTORIES_INSERT_USER;
 create index IDX_VIEW_HISTORIES_INSERT_USER
   on VIEW_HISTORIES(INSERT_USER);
 
+drop index if exists IDX_VIEW_HISTORIES_KNOWLEDGE_ID_INSERT_USER;
 create index IDX_VIEW_HISTORIES_KNOWLEDGE_ID_INSERT_USER
   on VIEW_HISTORIES(KNOWLEDGE_ID,INSERT_USER);
 
-  
\ No newline at end of file
+UPDATE KNOWLEDGES  
+    SET VIEW_COUNT = (
+        SELECT COUNT(*) FROM VIEW_HISTORIES
+        WHERE VIEW_HISTORIES.KNOWLEDGE_ID = KNOWLEDGES.KNOWLEDGE_ID
+        GROUP BY VIEW_HISTORIES.KNOWLEDGE_ID
+    );

From 92ffc4ec3316d9b8d31834972ea59418797e8da7 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sat, 22 Jul 2017 11:44:05 +0900
Subject: [PATCH 005/138] #806 Make group members' batch registration available
 for non-administrators

---
 gulpfile.js                                        |  1 +
 .../knowledge/control/protect/GroupControl.java    | 14 ++++++--------
 .../WEB-INF/views/protect/group/view_group.jsp     | 12 +++++-------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 28e36ec58..12a580126 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -14,6 +14,7 @@ gulp.task('min', function() {
     .pipe(replace('href="<%= request.getContextPath() %>/css', 'href="/css'))
     .pipe(replace('src="<%= request.getContextPath() %>/bower', 'src="/bower'))
     .pipe(replace('src="<%= request.getContextPath() %>/js', 'src="/js'))
+    .pipe(replace('<%= request.getContextPath() %>/EasyWizard', '/EasyWizard'))
     .pipe(usemin({
         css: [rev],
         htmlmin: [ function () {return minifyHtml({ empty: true });} ],
diff --git a/src/main/java/org/support/project/knowledge/control/protect/GroupControl.java b/src/main/java/org/support/project/knowledge/control/protect/GroupControl.java
index 18ca6139e..1708e5625 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/GroupControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/GroupControl.java
@@ -534,13 +534,17 @@ public Boundary extractEmail() {
     
     /**
      * メールアドレスの一覧から、グループのユーザを一括登録
-     * （メールアドレスの存在チェックができてしまうので、いったん管理者だけの機能にする）
      * @return
      */
     @Post(subscribeToken = "knowledge")
-    @Auth(roles = "admin")
     public Boundary addUsersOnEmail() {
         Integer groupId = getParam("group", Integer.class);
+        GroupsEntity group = GroupLogic.get().getEditAbleGroup(groupId, getLoginedUser());
+        if (group == null) {
+            // 編集可能なグループが存在しない
+            return sendError(HttpStatus.SC_403_FORBIDDEN, "");
+        }
+        
         String emails = getParam("emails");
         String[] mails = emails.split("\n");
         MessageResult result = new MessageResult(MessageStatus.Success, HttpStatus.SC_200_OK, "", "");
@@ -571,10 +575,4 @@ public Boundary addUsersOnEmail() {
         return send(result);
     }
     
-    
-    
-    
-    
-    
-    
 }
diff --git a/src/main/webapp/WEB-INF/views/protect/group/view_group.jsp b/src/main/webapp/WEB-INF/views/protect/group/view_group.jsp
index d7931d708..ce289cf0e 100644
--- a/src/main/webapp/WEB-INF/views/protect/group/view_group.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/group/view_group.jsp
@@ -13,12 +13,12 @@
 
 <c:param name="PARAM_HEAD">
 <!-- build:css(src/main/webapp) css/page-protect-group.css -->
-<link rel="stylesheet" href="EasyWizard/easyWizard.css" />
+<link rel="stylesheet" href="<%= request.getContextPath() %>/EasyWizard/easyWizard.css" />
 <!-- endbuild -->
 </c:param>
 <c:param name="PARAM_SCRIPTS">
 <!-- build:js(src/main/webapp) js/page-protect-group.js -->
-<script type="text/javascript" src="EasyWizard/easyWizard.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/EasyWizard/easyWizard.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/js/group.js"></script>
 <!-- endbuild -->
 <script>
@@ -109,11 +109,9 @@ var _CONFIRM_DELETE = '<%= jspUtil.label("knowledge.group.view.label.confirm.del
     <a id="groupselect" class="btn btn-info" data-toggle="modal" href="#groupSelectModal">
         <i class="fa fa-th-list"></i>&nbsp;<%= jspUtil.label("knowledge.group.label.add.user") %>
     </a>
-    <% if (jspUtil.isAdmin()) { %>
-        <button type="button" class="btn btn-warning" data-toggle="modal" data-target="#wizardModal">
-            <i class="fa fa-list-alt" aria-hidden="true"></i> <%= jspUtil.label("knowledge.group.add.members") %>
-        </button>
-    <% } %>
+    <button type="button" class="btn btn-warning" data-toggle="modal" data-target="#wizardModal">
+        <i class="fa fa-list-alt" aria-hidden="true"></i> <%= jspUtil.label("knowledge.group.add.members") %>
+    </button>
 <% } %>
 <p>
 

From 92dba94d22f93b0ef396945958c2debdc618d6eb Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 26 Jul 2017 07:27:25 +0900
Subject: [PATCH 006/138] Change version label

---
 pom.xml                                      | 4 +++-
 src/main/resources/appresource.properties    | 2 +-
 src/main/resources/appresource_ja.properties | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b38d7c14..11036df6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.support-project</groupId>
     <artifactId>knowledge</artifactId>
-    <version>1.10.0</version>
+    <version>1.11.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>knowledge</name>
@@ -259,6 +259,7 @@
                             <arguments>install</arguments>
                         </configuration>
                     </execution>
+                    <!-- 
                     <execution>
                         <id>gulp</id>
                         <phase>prepare-package</phase>
@@ -269,6 +270,7 @@
                             <arguments>default</arguments>
                         </configuration>
                     </execution>
+                    -->
                 </executions>
             </plugin>
         </plugins>
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 1e73cae7d..51ebf3096 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -59,7 +59,7 @@ message.allready.started=Already started.
 message.confirm.delete=Are you sure you want to delete?
 
 # Common Label
-label.version=v1.10.0
+label.version=v1.11.0 dev
 label.login=Sign in
 label.previous = Previous
 label.next=Next
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index b47a976ae..4b831c4d8 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -59,7 +59,7 @@ message.allready.started=すでに開始済です
 message.confirm.delete=本当に削除しますか?
 
 # Common Label
-label.version=v1.10.0
+label.version=v1.11.0 dev
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ

From 034bdcb60b7dd544fdedb3e6a31a0887ca3841e0 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 27 Jul 2017 00:27:47 +0900
Subject: [PATCH 007/138] Fix pom.xml

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 11036df6f..ec375efaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,6 @@
                             <arguments>install</arguments>
                         </configuration>
                     </execution>
-                    <!-- 
                     <execution>
                         <id>gulp</id>
                         <phase>prepare-package</phase>
@@ -270,7 +269,6 @@
                             <arguments>default</arguments>
                         </configuration>
                     </execution>
-                    -->
                 </executions>
             </plugin>
         </plugins>

From f50074a83b6add938fad4d338d3280526f6c20f3 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 19 Jul 2017 23:08:29 +0900
Subject: [PATCH 008/138] #349 Add notification list for user

---
 .../project/knowledge/control/Control.java    |   8 ++
 .../control/protect/NotificationControl.java  |  38 +++++++
 .../project/knowledge/logic/MailLogic.java    |  17 +--
 .../knowledge/logic/NotificationLogic.java    | 101 ++++++++++++++++++
 .../project/knowledge/logic/NotifyLogic.java  |   8 ++
 .../vo/notification/KnowledgeUpdate.java      |  43 ++++++++
 src/main/resources/appresource.properties     |   1 +
 src/main/resources/appresource_ja.properties  |   3 +
 .../views/commons/layout/commonNavbar.jsp     |   8 ++
 .../views/protect/notification/list.jsp       |  76 +++++++++++++
 10 files changed, 295 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
 create mode 100644 src/main/java/org/support/project/knowledge/vo/notification/KnowledgeUpdate.java
 create mode 100644 src/main/webapp/WEB-INF/views/protect/notification/list.jsp

diff --git a/src/main/java/org/support/project/knowledge/control/Control.java b/src/main/java/org/support/project/knowledge/control/Control.java
index 6d7a6f147..d40b1f81f 100644
--- a/src/main/java/org/support/project/knowledge/control/Control.java
+++ b/src/main/java/org/support/project/knowledge/control/Control.java
@@ -19,6 +19,7 @@
 import org.support.project.knowledge.entity.NotifyConfigsEntity;
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.common.HttpUtil;
+import org.support.project.web.logic.NotificationLogic;
 import org.support.project.web.logic.SanitizingLogic;
 
 @DI(instance = Instance.Prototype)
@@ -30,6 +31,7 @@ public abstract class Control extends org.support.project.web.control.Control {
     public static final String MSG_SUCCESS = "NOTIFY_MSG_SUCCESS";
     public static final String MSG_WARN = "NOTIFY_MSG_WARN";
     public static final String MSG_ERROR = "NOTIFY_MSG_ERROR";
+    public static final String NOTIFY_UNREAD_COUNT = "NOTIFY_UNREAD_COUNT";
 
     private List<String> infos = null;
     private List<String> successes = null;
@@ -48,6 +50,12 @@ public void setRequest(HttpServletRequest request) {
         request.setAttribute(MSG_SUCCESS, successes);
         request.setAttribute(MSG_WARN, warns);
         request.setAttribute(MSG_ERROR, errors);
+        
+        // 通知の件数を取得
+        if (getLoginedUser() != null) {
+            int count = NotificationLogic.get().countUnRead(getLoginUserId());
+            request.setAttribute(NOTIFY_UNREAD_COUNT, count);
+        }
     }
 
     protected String getResource(String key) {
diff --git a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
new file mode 100644
index 000000000..13b75aa53
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
@@ -0,0 +1,38 @@
+package org.support.project.knowledge.control.protect;
+
+import java.util.List;
+
+import org.support.project.knowledge.control.Control;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.web.boundary.Boundary;
+import org.support.project.web.control.service.Get;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.exception.InvalidParamException;
+
+public class NotificationControl extends Control {
+
+    @Get
+    public Boundary list() throws InvalidParamException {
+        int offset = getPathInteger(0);
+        List<NotificationsEntity> notifications = NotificationLogic.get().getNotification(getLoginUserId(), offset);
+        
+        for (NotificationsEntity notificationsEntity : notifications) {
+            NotificationLogic.get().convNotification(notificationsEntity, getLoginedUser(), NotificationLogic.TARGET.list);
+        }
+        
+        setAttribute("notifications", notifications);
+        
+        int previous = offset - 1;
+        if (previous < 0) {
+            previous = 0;
+        }
+        setAttribute("offset", offset);
+        setAttribute("previous", previous);
+        setAttribute("next", offset + 1);
+        
+        return forward("list.jsp");
+    }
+
+    
+    
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/MailLogic.java b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
index d9e6b3f48..e602e4f98 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
@@ -80,14 +80,17 @@
 import org.support.project.web.dao.MailConfigsDao;
 import org.support.project.web.dao.MailsDao;
 import org.support.project.web.dao.SystemConfigsDao;
+import org.support.project.web.dao.UserNotificationsDao;
 import org.support.project.web.dao.UsersDao;
 import org.support.project.web.entity.ConfirmMailChangesEntity;
 import org.support.project.web.entity.GroupsEntity;
 import org.support.project.web.entity.MailConfigsEntity;
 import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.NotificationsEntity;
 import org.support.project.web.entity.PasswordResetsEntity;
 import org.support.project.web.entity.ProvisionalRegistrationsEntity;
 import org.support.project.web.entity.SystemConfigsEntity;
+import org.support.project.web.entity.UserNotificationsEntity;
 import org.support.project.web.entity.UsersEntity;
 
 import net.arnx.jsonic.JSON;
@@ -1037,14 +1040,6 @@ private void notifyPublicKnowledgeUpdate(NotifyQueuesEntity notifyQueuesEntity,
      */
     private void notifyKnowledgeUpdateToUsers(NotifyQueuesEntity notifyQueuesEntity, KnowledgesEntity knowledge, List<UsersEntity> users)
             throws Exception {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            LOG.info("mail config is not exists.");
-            return;
-        }
-        
         StringBuilder content = new StringBuilder();
         // テンプレートの種類をセット
         TemplateMastersEntity templateMaster = TemplateMastersDao.get().selectWithItems(knowledge.getTypeId());
@@ -1066,7 +1061,10 @@ private void notifyKnowledgeUpdateToUsers(NotifyQueuesEntity notifyQueuesEntity,
         }
         content.append(knowledge.getContent());
         
+        NotificationsEntity notification = NotificationLogic.get().insertNotificationOnKnowledgeUpdate(knowledge);
+        
         for (UsersEntity usersEntity : users) {
+            NotificationLogic.get().insertUserNotification(notification, usersEntity);
             if (!StringUtils.isEmailAddress(usersEntity.getMailAddress())) {
                 // 送信先のメールアドレスが不正なのでこのユーザにはメール送信しない
                 LOG.warn("mail targget [" + usersEntity.getMailAddress() + "] is wrong.");
@@ -1082,10 +1080,13 @@ private void notifyKnowledgeUpdateToUsers(NotifyQueuesEntity notifyQueuesEntity,
             } else {
                 template = load(locale, MailLogic.NOTIFY_UPDATE_KNOWLEDGE);
             }
+            // メール送信
             insertNotifyKnowledgeUpdateMailQue(knowledge, usersEntity, template, content.toString());
         }
     }
 
+
+
     /**
      * 記事の追加・更新のWebhookの登録を行う
      * @param comment
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
new file mode 100644
index 000000000..a7042f49e
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -0,0 +1,101 @@
+package org.support.project.knowledge.logic;
+
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.vo.notification.KnowledgeUpdate;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.UserNotificationsDao;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UserNotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+import net.arnx.jsonic.JSON;
+
+public class NotificationLogic extends org.support.project.web.logic.NotificationLogic {
+    public static enum TARGET {
+        list, detail
+    }
+    
+    /**
+     * Get instance
+     * @return instance
+     */
+    public static NotificationLogic get() {
+        return Container.getComp(NotificationLogic.class);
+    }
+    
+    /**
+     * ユーザに通知をセット
+     * @param notification
+     * @param usersEntity
+     */
+    public void insertUserNotification(NotificationsEntity notification, UsersEntity usersEntity) {
+        UserNotificationsEntity userNotification = new UserNotificationsEntity(notification.getNo(), usersEntity.getUserId());
+        userNotification.setStatus(NotificationLogic.STATUS_UNREAD);
+        UserNotificationsDao.get().insert(userNotification);
+    }
+    
+    /**
+     * Knowledgeの登録/更新時の通知情報を作成
+     * @param knowledge
+     * @return
+     */
+    public NotificationsEntity insertNotificationOnKnowledgeUpdate(KnowledgesEntity knowledge) {
+        // 通知情報を作成
+        NotificationsEntity notification = new NotificationsEntity();
+        if (knowledge.getNotifyStatus() == null || knowledge.getNotifyStatus().intValue() == 0) {
+            notification.setTitle(MailLogic.NOTIFY_INSERT_KNOWLEDGE);
+        } else {
+            notification.setTitle(MailLogic.NOTIFY_UPDATE_KNOWLEDGE);
+        }
+        KnowledgeUpdate update = new KnowledgeUpdate();
+        update.setKnowledgeId(knowledge.getKnowledgeId());
+        update.setKnowledgeTitle(knowledge.getTitle());
+        update.setUpdateUser(knowledge.getUpdateUserName());
+        notification.setContent(JSON.encode(update));
+        notification = NotificationsDao.get().insert(notification);
+        return notification;
+    }
+    
+
+    /**
+     * ユーザへの通知を意味のある形へ変換
+     * @param notificationsEntity
+     * @param loginedUser 
+     */
+    public void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target) {
+        String category = notificationsEntity.getTitle();
+        if (MailLogic.NOTIFY_INSERT_KNOWLEDGE.equals(category) || MailLogic.NOTIFY_UPDATE_KNOWLEDGE.equals(category)) {
+            KnowledgeUpdate update = JSON.decode(notificationsEntity.getContent(), KnowledgeUpdate.class);
+            MailLocaleTemplatesEntity template = MailLogic.get().load(loginedUser.getLocale(), MailLogic.NOTIFY_INSERT_KNOWLEDGE);
+            
+            String title = template.getTitle();
+            title = title.replace("{KnowledgeId}", String.valueOf(update.getKnowledgeId()));
+            title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(update.getKnowledgeTitle(), 80));
+            notificationsEntity.setTitle(title);
+            
+            if (target == TARGET.detail) {
+                String contents = template.getContent();
+                contents = contents.replace("{KnowledgeId}", String.valueOf(update.getKnowledgeId()));
+                contents = contents.replace("{KnowledgeTitle}", update.getKnowledgeTitle());
+                contents = contents.replace("{User}", update.getUpdateUser());
+                contents = contents.replace("{URL}", NotifyLogic.get().makeURL(update.getKnowledgeId()));
+                KnowledgesEntity entity = KnowledgeLogic.get().select(update.getKnowledgeId(), loginedUser);
+                if (entity != null) {
+                    contents = contents.replace("{Contents}", entity.getContent());
+                } else {
+                    contents = contents.replace("{Contents}", "");
+                }
+                notificationsEntity.setContent(contents);
+            }
+        }
+        
+    }
+    
+
+    
+    
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java b/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
index ee1990d82..92a6801e3 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
@@ -8,6 +8,7 @@
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.NumberUtils;
+import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -23,16 +24,21 @@
 import org.support.project.knowledge.entity.KnowledgeUsersEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.LikesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
 import org.support.project.knowledge.entity.NotifyConfigsEntity;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.vo.Notify;
+import org.support.project.knowledge.vo.notification.KnowledgeUpdate;
 import org.support.project.knowledge.websocket.NotifyAction;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.bean.MessageResult;
 import org.support.project.web.dao.SystemConfigsDao;
 import org.support.project.web.entity.GroupsEntity;
+import org.support.project.web.entity.NotificationsEntity;
 import org.support.project.web.entity.SystemConfigsEntity;
 import org.support.project.web.entity.UsersEntity;
+
+import net.arnx.jsonic.JSON;
 /**
  * 通知を処理するロジック
  * @author Koda
@@ -328,5 +334,7 @@ protected boolean contains(List<UsersEntity> users, UsersEntity groupUser) {
         return false;
     }
     
+    
+    
 
 }
diff --git a/src/main/java/org/support/project/knowledge/vo/notification/KnowledgeUpdate.java b/src/main/java/org/support/project/knowledge/vo/notification/KnowledgeUpdate.java
new file mode 100644
index 000000000..8e44a3dc4
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/vo/notification/KnowledgeUpdate.java
@@ -0,0 +1,43 @@
+package org.support.project.knowledge.vo.notification;
+
+public class KnowledgeUpdate {
+    private long KnowledgeId;
+    private String KnowledgeTitle;
+    private String updateUser;
+    /**
+     * @return the knowledgeId
+     */
+    public long getKnowledgeId() {
+        return KnowledgeId;
+    }
+    /**
+     * @param knowledgeId the knowledgeId to set
+     */
+    public void setKnowledgeId(long knowledgeId) {
+        KnowledgeId = knowledgeId;
+    }
+    /**
+     * @return the knowledgeTitle
+     */
+    public String getKnowledgeTitle() {
+        return KnowledgeTitle;
+    }
+    /**
+     * @param knowledgeTitle the knowledgeTitle to set
+     */
+    public void setKnowledgeTitle(String knowledgeTitle) {
+        KnowledgeTitle = knowledgeTitle;
+    }
+    /**
+     * @return the updateUser
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+    /**
+     * @param updateUser the updateUser to set
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+}
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 51ebf3096..e3227786a 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -830,3 +830,4 @@ knowledge.token.label.update=Update expiration date
 knowledge.token.label.delete=Delete Token
 knowledge.token.msg.copy=Copied
 
+knowledge.notification.title=Notifications
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index 4b831c4d8..f0f0fb781 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -829,3 +829,6 @@ knowledge.token.label.create=Tokenを生成する
 knowledge.token.label.update=有効期限を更新する
 knowledge.token.label.delete=Tokenを削除する
 knowledge.token.msg.copy=コピーしました
+
+knowledge.notification.title=通知
+
diff --git a/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp b/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp
index 4895daee3..4e5d755c9 100644
--- a/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp
+++ b/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp
@@ -1,3 +1,4 @@
+<%@page import="org.support.project.knowledge.control.Control"%>
 <%@page import="org.support.project.knowledge.entity.ServiceConfigsEntity"%>
 <%@page pageEncoding="UTF-8" isELIgnored="false" session="false" errorPage="/WEB-INF/views/commons/errors/jsp_error.jsp"%>
 
@@ -131,6 +132,7 @@
                     <div class="btn-group">
                         <a href="#" class="btn btn-success" id="navMenuButtonLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <img src="<%= request.getContextPath()%>/open.account/icon/<%= jspUtil.id() %>" alt="icon" width="15" height="15"/>
+                            <span class="badge"><%= jspUtil.out(Control.NOTIFY_UNREAD_COUNT) %></span>
                         </a>
                         <a href="#" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="caret"></span>
@@ -142,6 +144,12 @@
                                 </a>
                             </li>
                             <li class="divider"></li>
+                            <li >
+                                <a href="<%= request.getContextPath() %>/protect.notification/list" >
+                                    <i class="fa fa-bullhorn"></i>&nbsp;<%= jspUtil.label("knowledge.notification.title") %>
+                                </a>
+                            </li>
+                            <li class="divider"></li>
                             <li >
                                 <a href="<%= request.getContextPath() %>/open.knowledge/search" >
                                     <i class="fa fa-search"></i>&nbsp;<%= jspUtil.label("knowledge.navbar.search") %>
diff --git a/src/main/webapp/WEB-INF/views/protect/notification/list.jsp b/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
new file mode 100644
index 000000000..dfc650240
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
@@ -0,0 +1,76 @@
+<%@page pageEncoding="UTF-8" isELIgnored="false" session="false" errorPage="/WEB-INF/views/commons/errors/jsp_error.jsp"%>
+<%@page import="org.support.project.web.util.JspUtil"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<% JspUtil jspUtil = new JspUtil(request, pageContext); %>
+
+
+<c:import url="/WEB-INF/views/commons/layout/layoutMain.jsp">
+
+<c:param name="PARAM_HEAD">
+</c:param>
+
+<c:param name="PARAM_SCRIPTS">
+</c:param>
+
+
+<c:param name="PARAM_CONTENT">
+<h4 class="title"><%= jspUtil.label("knowledge.notification.title") %></h4>
+
+<nav>
+    <ul class="pager">
+        <li class="previous">
+            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("previous") %>">
+                <span aria-hidden="true">&larr;</span><%= jspUtil.label("label.previous") %>
+            </a>
+        </li>
+        <li class="next">
+            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("next") %>">
+                <%= jspUtil.label("label.next") %> <span aria-hidden="true">&rarr;</span>
+            </a>
+        </li>
+    </ul>
+</nav>
+
+
+<c:if test="${empty notifications}">
+    <div class="col-sm-12">
+    empty
+    </div>
+</c:if>
+
+<div class="list-group">
+    <c:forEach var="notification" items="${notifications}">
+        <a class="list-group-item " 
+            href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %>" >
+            <%= jspUtil.out("notification.title") %>
+        </a>
+        
+    </c:forEach>
+</div>
+
+
+
+
+
+<nav>
+    <ul class="pager">
+        <li class="previous">
+            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("previous") %>">
+                <span aria-hidden="true">&larr;</span><%= jspUtil.label("label.previous") %>
+            </a>
+        </li>
+        <li class="next">
+            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("next") %>">
+                <%= jspUtil.label("label.next") %> <span aria-hidden="true">&rarr;</span>
+            </a>
+        </li>
+    </ul>
+</nav>
+
+</c:param>
+
+</c:import>
+

From 95bc448b354c8474b5c991ec042ad0f82a114c4c Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 20 Jul 2017 00:04:55 +0900
Subject: [PATCH 009/138] #349 Add notification detail page

---
 .../control/protect/NotificationControl.java  | 12 +++++++
 .../knowledge/logic/NotificationLogic.java    | 16 +++++++++
 .../views/commons/layout/commonNavbar.jsp     | 14 ++++++--
 .../views/protect/notification/list.jsp       | 19 ++++++++---
 .../views/protect/notification/view.jsp       | 33 +++++++++++++++++++
 src/main/webapp/css/common.css                |  4 +--
 6 files changed, 88 insertions(+), 10 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/views/protect/notification/view.jsp

diff --git a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
index 13b75aa53..a23edf3ea 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
@@ -5,6 +5,7 @@
 import org.support.project.knowledge.control.Control;
 import org.support.project.knowledge.logic.NotificationLogic;
 import org.support.project.web.boundary.Boundary;
+import org.support.project.web.common.HttpStatus;
 import org.support.project.web.control.service.Get;
 import org.support.project.web.entity.NotificationsEntity;
 import org.support.project.web.exception.InvalidParamException;
@@ -33,6 +34,17 @@ public Boundary list() throws InvalidParamException {
         return forward("list.jsp");
     }
 
+    @Get
+    public Boundary view() throws InvalidParamException {
+        long no = getPathLong(new Long(-1));
+        NotificationsEntity notification = NotificationLogic.get().load(no, getLoginedUser());
+        if (notification == null) {
+            sendError(HttpStatus.SC_403_FORBIDDEN, "FORBIDDEN");
+        }
+        NotificationLogic.get().setStatus(getLoginUserId(), no, NotificationLogic.STATUS_READED);
+        setAttributeOnProperty(notification);
+        return forward("view.jsp");
+    }
     
     
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
index a7042f49e..1164f64f0 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -95,6 +95,22 @@ public void convNotification(NotificationsEntity notificationsEntity, LoginedUse
         
     }
     
+    /**
+     * 通知の読み込み
+     * @param no
+     * @param loginedUser
+     * @return
+     */
+    public NotificationsEntity load(long no, LoginedUser loginedUser) {
+        UserNotificationsEntity userNotification = UserNotificationsDao.get().selectOnKey(no, loginedUser.getUserId());
+        if (userNotification == null) {
+            return null;
+        }
+        NotificationsEntity notification = NotificationsDao.get().selectOnKey(no);
+        convNotification(notification, loginedUser, TARGET.detail);
+        return notification;
+    }
+    
 
     
     
diff --git a/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp b/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp
index 4e5d755c9..1ad46ab11 100644
--- a/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp
+++ b/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp
@@ -100,12 +100,15 @@
                 <% if (!jspUtil.logined()) { %>
                 <li class="navButton navMenuButton">
                     <div class="btn-group">
-                        <a href="#" class="btn btn-default" id="navMenuButtonLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <a href="#" class="btn btn-default dropdown-toggle" id="navMenuButtonLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <img src="<%= request.getContextPath()%>/open.account/icon/<%= jspUtil.id() %>" alt="icon" width="15" height="15"/>
+                            <span class="caret"></span>
                         </a>
+                        <!-- 
                         <a href="#" class="btn btn-default dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="caret"></span>
                         </a>
+                        -->
                         <ul class="dropdown-menu" role="menu">
                             <li >
                                 <a href="<%= request.getContextPath() %>/open.knowledge/list" >
@@ -130,13 +133,18 @@
                 <% } else { %>
                 <li class="navButton navLoginedMenuButton">
                     <div class="btn-group">
-                        <a href="#" class="btn btn-success" id="navMenuButtonLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <a href="#" class="btn btn-success dropdown-toggle" id="navMenuButtonLink" data-toggle="dropdown">
                             <img src="<%= request.getContextPath()%>/open.account/icon/<%= jspUtil.id() %>" alt="icon" width="15" height="15"/>
-                            <span class="badge"><%= jspUtil.out(Control.NOTIFY_UNREAD_COUNT) %></span>
+                            <small>
+                            <span class="badge badge-pill"><%= jspUtil.out(Control.NOTIFY_UNREAD_COUNT) %></span>
+                            </small>
+                            <span class="caret"></span>
                         </a>
+                        <!--
                         <a href="#" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="caret"></span>
                         </a>
+                        -->
                         <ul class="dropdown-menu" role="menu">
                             <li >
                                 <a href="<%= request.getContextPath() %>/open.knowledge/list" >
diff --git a/src/main/webapp/WEB-INF/views/protect/notification/list.jsp b/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
index dfc650240..833a5172e 100644
--- a/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
@@ -10,6 +10,7 @@
 <c:import url="/WEB-INF/views/commons/layout/layoutMain.jsp">
 
 <c:param name="PARAM_HEAD">
+<link rel="stylesheet" href="<%= request.getContextPath() %>/css/knowledge-list.css" />
 </c:param>
 
 <c:param name="PARAM_SCRIPTS">
@@ -43,11 +44,19 @@
 
 <div class="list-group">
     <c:forEach var="notification" items="${notifications}">
-        <a class="list-group-item " 
-            href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %>" >
-            <%= jspUtil.out("notification.title") %>
-        </a>
-        
+        <c:if test="${notification.status == 0}">
+            <a class="list-group-item unread" 
+                href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %>" >
+                [<%= jspUtil.label("label.unread") %>]
+                <%= jspUtil.out("notification.title") %>
+            </a>
+        </c:if>
+        <c:if test="${notification.status != 0}">
+            <a class="list-group-item " 
+                href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %>" >
+                <%= jspUtil.out("notification.title") %>
+            </a>
+        </c:if>
     </c:forEach>
 </div>
 
diff --git a/src/main/webapp/WEB-INF/views/protect/notification/view.jsp b/src/main/webapp/WEB-INF/views/protect/notification/view.jsp
new file mode 100644
index 000000000..5a08bea81
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/protect/notification/view.jsp
@@ -0,0 +1,33 @@
+<%@page pageEncoding="UTF-8" isELIgnored="false" session="false" errorPage="/WEB-INF/views/commons/errors/jsp_error.jsp"%>
+<%@page import="org.support.project.web.util.JspUtil"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<% JspUtil jspUtil = new JspUtil(request, pageContext); %>
+
+
+<c:import url="/WEB-INF/views/commons/layout/layoutMain.jsp">
+
+<c:param name="PARAM_HEAD">
+</c:param>
+
+<c:param name="PARAM_SCRIPTS">
+</c:param>
+
+
+<c:param name="PARAM_CONTENT">
+<h4 class="title"><%= jspUtil.out("title") %></h4>
+
+<pre>
+<%= jspUtil.out("content") %>
+</pre>
+
+<a href="<%= request.getContextPath() %>/protect.notification/list" class="btn btn-success" role="button">
+<i class="fa fa-list-ul"></i>&nbsp;<%= jspUtil.label("label.backlist") %>
+</a>
+
+</c:param>
+
+</c:import>
+
diff --git a/src/main/webapp/css/common.css b/src/main/webapp/css/common.css
index aaff34611..6255a1d12 100644
--- a/src/main/webapp/css/common.css
+++ b/src/main/webapp/css/common.css
@@ -116,11 +116,11 @@ body {
     .nav, .nav .navButton, .nav .navButton .btn-group {
         width:100%;
     }
-    .nav .navButton .btn-group #navAddButtonLink, .nav .navButton .btn-group #navMenuButtonLink {
+    .nav .navButton .btn-group #navAddButtonLink {
         width:calc(100% - 30px);
         text-align: left;
     }
-    .nav .navButton .btn-group #navListButtonLink {
+    .nav .navButton .btn-group #navListButtonLink, .nav .navButton .btn-group #navMenuButtonLink {
         width:100%;
         text-align: left;
     }

From 390137c272121cd65b56c9d5c58b22dfc3b03fdb Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 20 Jul 2017 23:39:32 +0900
Subject: [PATCH 010/138] #349 Add notification feature on added comments or
 likes

---
 .../project/knowledge/bat/NotifyMailBat.java  |  10 +-
 .../control/protect/NotificationControl.java  |   5 +-
 .../project/knowledge/logic/MailLogic.java    | 517 ------------------
 .../knowledge/logic/NotificationLogic.java    |  96 +---
 .../project/knowledge/logic/NotifyLogic.java  |   6 -
 .../notification/AbstractNotification.java    |  31 ++
 .../CommentInsertNotification.java            | 260 +++++++++
 .../KnowledgeUpdateNotification.java          | 355 ++++++++++++
 .../notification/LikeInsertNotification.java  | 208 +++++++
 .../logic/notification/Notification.java      |  26 +
 .../vo/notification/CommentInsert.java        |  35 ++
 .../vo/notification/KnowledgeUpdate.java      |  14 +-
 .../knowledge/vo/notification/LikeInsert.java |  21 +
 13 files changed, 979 insertions(+), 605 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/Notification.java
 create mode 100644 src/main/java/org/support/project/knowledge/vo/notification/CommentInsert.java
 create mode 100644 src/main/java/org/support/project/knowledge/vo/notification/LikeInsert.java

diff --git a/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java b/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java
index 81780c874..d8a0f4b56 100644
--- a/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java
+++ b/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java
@@ -9,7 +9,9 @@
 import org.support.project.knowledge.dao.NotifyQueuesDao;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.logic.MailEventLogic;
-import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.notification.CommentInsertNotification;
+import org.support.project.knowledge.logic.notification.KnowledgeUpdateNotification;
+import org.support.project.knowledge.logic.notification.LikeInsertNotification;
 import org.support.project.knowledge.vo.Notify;
 
 /**
@@ -52,11 +54,11 @@ private void start() throws Exception {
         for (NotifyQueuesEntity notifyQueuesEntity : notifyQueuesEntities) {
             if (notifyQueuesEntity.getType() == Notify.TYPE_KNOWLEDGE_INSERT 
                     || notifyQueuesEntity.getType() == Notify.TYPE_KNOWLEDGE_UPDATE) {
-                MailLogic.get().notifyKnowledgeUpdate(notifyQueuesEntity);
+                KnowledgeUpdateNotification.get().notify(notifyQueuesEntity);
             } else if (notifyQueuesEntity.getType() == Notify.TYPE_KNOWLEDGE_COMMENT) {
-                MailLogic.get().notifyCommentInsert(notifyQueuesEntity);
+                CommentInsertNotification.get().notify(notifyQueuesEntity);
             } else if (notifyQueuesEntity.getType() == Notify.TYPE_KNOWLEDGE_LIKE) {
-                MailLogic.get().notifyLikeInsert(notifyQueuesEntity);
+                LikeInsertNotification.get().notify(notifyQueuesEntity);
             }
             // 通知のキューから削除
             //notifyQueuesDao.delete(notifyQueuesEntity);
diff --git a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
index a23edf3ea..2022640da 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
@@ -15,11 +15,8 @@ public class NotificationControl extends Control {
     @Get
     public Boundary list() throws InvalidParamException {
         int offset = getPathInteger(0);
-        List<NotificationsEntity> notifications = NotificationLogic.get().getNotification(getLoginUserId(), offset);
+        List<NotificationsEntity> notifications = NotificationLogic.get().getNotification(getLoginedUser(), offset);
         
-        for (NotificationsEntity notificationsEntity : notifications) {
-            NotificationLogic.get().convNotification(notificationsEntity, getLoginedUser(), NotificationLogic.TARGET.list);
-        }
         
         setAttribute("notifications", notifications);
         
diff --git a/src/main/java/org/support/project/knowledge/logic/MailLogic.java b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
index e602e4f98..6fa1cf64c 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
@@ -7,12 +7,9 @@
 import java.security.NoSuchAlgorithmException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
 
@@ -29,7 +26,6 @@
 
 import org.support.project.aop.Aspect;
 import org.support.project.common.config.ConfigLoader;
-import org.support.project.common.config.INT_FLAG;
 import org.support.project.common.config.LocaleConfigLoader;
 import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
@@ -42,59 +38,32 @@
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-import org.support.project.knowledge.bat.WebhookBat;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.MailConfig;
-import org.support.project.knowledge.config.NotifyType;
 import org.support.project.knowledge.config.SystemConfig;
-import org.support.project.knowledge.dao.CommentsDao;
-import org.support.project.knowledge.dao.ExUsersDao;
-import org.support.project.knowledge.dao.KnowledgeItemValuesDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
-import org.support.project.knowledge.dao.LikesDao;
 import org.support.project.knowledge.dao.MailLocaleTemplatesDao;
 import org.support.project.knowledge.dao.MailTemplatesDao;
-import org.support.project.knowledge.dao.NotifyConfigsDao;
-import org.support.project.knowledge.dao.TargetsDao;
-import org.support.project.knowledge.dao.TemplateMastersDao;
-import org.support.project.knowledge.dao.WebhookConfigsDao;
-import org.support.project.knowledge.dao.WebhooksDao;
-import org.support.project.knowledge.entity.CommentsEntity;
-import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
-import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
 import org.support.project.knowledge.entity.MailTemplatesEntity;
-import org.support.project.knowledge.entity.NotifyConfigsEntity;
-import org.support.project.knowledge.entity.NotifyQueuesEntity;
-import org.support.project.knowledge.entity.TemplateItemsEntity;
-import org.support.project.knowledge.entity.TemplateMastersEntity;
-import org.support.project.knowledge.entity.WebhookConfigsEntity;
-import org.support.project.knowledge.entity.WebhooksEntity;
 import org.support.project.knowledge.parser.Parser;
 import org.support.project.knowledge.parser.ParserFactory;
-import org.support.project.knowledge.vo.GroupUser;
 import org.support.project.knowledge.vo.ParseResult;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.config.WebConfig;
 import org.support.project.web.dao.MailConfigsDao;
 import org.support.project.web.dao.MailsDao;
 import org.support.project.web.dao.SystemConfigsDao;
-import org.support.project.web.dao.UserNotificationsDao;
 import org.support.project.web.dao.UsersDao;
 import org.support.project.web.entity.ConfirmMailChangesEntity;
-import org.support.project.web.entity.GroupsEntity;
 import org.support.project.web.entity.MailConfigsEntity;
 import org.support.project.web.entity.MailsEntity;
-import org.support.project.web.entity.NotificationsEntity;
 import org.support.project.web.entity.PasswordResetsEntity;
 import org.support.project.web.entity.ProvisionalRegistrationsEntity;
 import org.support.project.web.entity.SystemConfigsEntity;
-import org.support.project.web.entity.UserNotificationsEntity;
 import org.support.project.web.entity.UsersEntity;
 
-import net.arnx.jsonic.JSON;
-
 @DI(instance = Instance.Singleton)
 public class MailLogic {
     public static final String TEST_MAIL = "test_mail";
@@ -151,11 +120,6 @@ private static DateFormat getDayFormat() {
         return new SimpleDateFormat("yyyyMMddHHmmss");
     }
     
-    /** knowledge id what is sended */
-    private List<Long> sendedCommentKnowledgeIds = new ArrayList<>();
-    /** like id what is sended */
-    private List<Long> sendedLikeKnowledgeIds = new ArrayList<>();
-    
     
     public static MailLogic get() {
         return Container.getComp(MailLogic.class);
@@ -689,488 +653,7 @@ public String getMailContent(String content) throws Exception {
         }
         return content;
     }
-
-    
-
-    
-    /**
-     * イイネが押された
-     * @param notifyQueuesEntity
-     * @throws Exception 
-     */
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void notifyLikeInsert(NotifyQueuesEntity notifyQueuesEntity) throws Exception {
-        LikesDao likesDao = LikesDao.get();
-        LikesEntity like = likesDao.selectOnKey(notifyQueuesEntity.getId());
-        if (null == like) {
-            LOG.warn("Like record not found. id: " + notifyQueuesEntity.getId());
-            return;
-        }
-
-        KnowledgesDao knowledgesDao = KnowledgesDao.get();
-        KnowledgesEntity knowledge = knowledgesDao.selectOnKey(like.getKnowledgeId());
-        if (null == knowledge) {
-            LOG.warn("Knowledge record not found. id: " + notifyQueuesEntity.getId());
-            return;
-        }
-        
-        if (sendedLikeKnowledgeIds.contains(knowledge.getKnowledgeId())) {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Knowledge [" + knowledge.getKnowledgeId() + "] ");
-            }
-            return;
-        } else {
-            sendedLikeKnowledgeIds.add(knowledge.getKnowledgeId());
-        }
-
-        UsersDao usersDao = UsersDao.get();
-        UsersEntity likeUser = usersDao.selectOnKey(like.getInsertUser());
-        
-        // 登録者に通知
-        UsersEntity user = usersDao.selectOnKey(knowledge.getInsertUser());
-        if (user != null) {
-            NotifyConfigsDao notifyConfigsDao = NotifyConfigsDao.get();
-            NotifyConfigsEntity notifyConfigsEntity = notifyConfigsDao.selectOnKey(user.getUserId());
-            if (notifyConfigsEntity != null && INT_FLAG.flagCheck(notifyConfigsEntity.getMyItemLike())) {
-                // 登録者でかつイイネが登録した場合に通知が欲しい
-                Locale locale = user.getLocale();
-                MailLocaleTemplatesEntity template = load(locale, MailLogic.NOTIFY_INSERT_LIKE_MYITEM);
-                sendLikeMail(like, knowledge, likeUser, user, template);
-            }
-        }
-    }
-    
-    /**
-     * イイネが押されたメールを送る
-     * @param like
-     * @param knowledge
-     * @param likeUser
-     * @param user
-     * @param template
-     * @throws Exception 
-     */
-    private void sendLikeMail(LikesEntity like, KnowledgesEntity knowledge, UsersEntity likeUser, UsersEntity user, MailLocaleTemplatesEntity template)
-            throws Exception {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            LOG.info("mail config is not exists.");
-            return;
-        }
-        if (!StringUtils.isEmailAddress(user.getMailAddress())) {
-            // 送信先のメールアドレスが不正なので、送信処理は終了
-            LOG.warn("mail targget [" + user.getMailAddress() + "] is wrong.");
-            return;
-        }
-
-        MailsEntity mailsEntity = new MailsEntity();
-        String mailId = idGenu("Notify");
-        mailsEntity.setMailId(mailId);
-        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
-        mailsEntity.setToAddress(user.getMailAddress());
-        mailsEntity.setToName(user.getUserName());
-        
-        String title = template.getTitle();
-        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
-        mailsEntity.setTitle(title);
-        String contents = template.getContent();
-        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
-        contents = contents.replace("{Contents}", getContent(knowledge.getContent()));
-        if (likeUser != null) {
-            contents = contents.replace("{LikeInsertUser}", likeUser.getUserName());
-        } else {
-            contents = contents.replace("{LikeInsertUser}", "");
-        }
-        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
-        
-        mailsEntity.setContent(contents);
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("News email has been registered. [type] Like added. [knowledge]" + knowledge.getKnowledgeId().toString()
-                    + " [target] " + user.getMailAddress());
-        }
-        MailsDao.get().insert(mailsEntity);
-    }
-
-    /**
-     * ナレッジにコメントが登録された場合の通知
-     * @param notifyQueuesEntity
-     * @throws Exception 
-     */
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void notifyCommentInsert(NotifyQueuesEntity notifyQueuesEntity) throws Exception {
-        CommentsDao commentsDao = CommentsDao.get();
-        CommentsEntity comment = commentsDao.selectOnKey(notifyQueuesEntity.getId());
-        if (null == comment) {
-            LOG.warn("Comment record not found. id: " + notifyQueuesEntity.getId());
-            return;
-        }
-
-        KnowledgesDao knowledgesDao = KnowledgesDao.get();
-        KnowledgesEntity knowledge = knowledgesDao.selectOnKey(comment.getKnowledgeId());
-        if (null == knowledge) {
-            LOG.warn("Knowledge record not found. id: " + notifyQueuesEntity.getId());
-            return;
-        }
-
-        if (sendedCommentKnowledgeIds.contains(knowledge.getKnowledgeId())) {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Knowledge [" + knowledge.getKnowledgeId() + "] ");
-            }
-            return;
-        } else {
-            sendedCommentKnowledgeIds.add(knowledge.getKnowledgeId());
-        }
-        
-        sendCommentWebhook(comment, knowledge);
-
-        UsersDao usersDao = UsersDao.get();
-        UsersEntity commentUser = usersDao.selectOnKey(comment.getInsertUser());
-        
-        // 登録者に通知
-        UsersEntity user = NotifyCommentLogic.get().getInsertUserOnComment(NotifyType.Mail, comment, knowledge);
-        if (user != null) {
-            Locale locale = user.getLocale();
-            MailLocaleTemplatesEntity template = this.load(locale, MailLogic.NOTIFY_INSERT_COMMENT_MYITEM);
-            sendCommentMail(comment, knowledge, commentUser, user, template);
-        }
-        // 宛先のナレッジにコメント追加で通知が欲しいユーザに通知
-        List<UsersEntity> users = NotifyCommentLogic.get().getTargetUsersOnComment(NotifyType.Mail, comment, knowledge);
-        for (UsersEntity target : users) {
-            // 宛先にメール送信
-            Locale locale = target.getLocale();
-            MailLocaleTemplatesEntity template = load(locale, MailLogic.NOTIFY_INSERT_COMMENT);
-            sendCommentMail(comment, knowledge, commentUser, target, template);
-        }
-    }
-
-    /**
-     * コメント追加のWebhookの登録を行う
-     * @param comment
-     * @param knowledge
-     */
-    private void sendCommentWebhook(CommentsEntity comment, KnowledgesEntity knowledge) {
-        WebhookConfigsDao webhookConfigsDao = WebhookConfigsDao.get();
-        List<WebhookConfigsEntity> webhookConfigsEntities = webhookConfigsDao.selectOnHook(WebhookConfigsEntity.HOOK_COMMENTS);
-
-        if (0 == webhookConfigsEntities.size()) {
-            return;
-        }
-
-        WebhookLogic webhookLogic = WebhookLogic.get();
-        Map<String, Object> commentData = webhookLogic.getCommentData(comment, knowledge);
-
-        WebhooksEntity webhooksEntity = new WebhooksEntity();
-        String webhookId = idGenu("Notify");
-        webhooksEntity.setWebhookId(webhookId);
-        webhooksEntity.setStatus(WebhookBat.WEBHOOK_STATUS_UNSENT);
-        webhooksEntity.setHook(WebhookConfigsEntity.HOOK_COMMENTS);
-        webhooksEntity.setContent(JSON.encode(commentData));
-
-        WebhooksDao.get().insert(webhooksEntity);
-    }
     
-    /**
-     * コメントが追加されたメールを通知する
-     * @param comment コメントの情報
-     * @param knowledge ナレッジの情報
-     * @param commentUser コメントを登録したユーザの情報
-     * @param user メールの送信先
-     * @throws Exception 
-     */
-    private void sendCommentMail(CommentsEntity comment, KnowledgesEntity knowledge, UsersEntity commentUser, UsersEntity user, MailLocaleTemplatesEntity template)
-            throws Exception {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            LOG.info("mail config is not exists.");
-            return;
-        }
-        if (!StringUtils.isEmailAddress(user.getMailAddress())) {
-            // 送信先のメールアドレスが不正なので、送信処理は終了
-            LOG.warn("mail targget [" + user.getMailAddress() + "] is wrong.");
-            return;
-        }
-
-        MailsEntity mailsEntity = new MailsEntity();
-        String mailId = idGenu("Notify");
-        mailsEntity.setMailId(mailId);
-        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
-        mailsEntity.setToAddress(user.getMailAddress());
-        mailsEntity.setToName(user.getUserName());
-        
-        String title = template.getTitle();
-        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
-        mailsEntity.setTitle(title);
-        String contents = template.getContent();
-        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
-        contents = contents.replace("{Contents}", getContent(knowledge.getContent()));
-        if (commentUser != null) {
-            contents = contents.replace("{CommentInsertUser}", commentUser.getUserName());
-        } else {
-            contents = contents.replace("{CommentInsertUser}", "");
-        }
-        contents = contents.replace("{CommentContents}", getContent(comment.getComment()));
-        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
-
-        mailsEntity.setContent(contents);
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("News email has been registered. [type] comment added. [knowledge]" + knowledge.getKnowledgeId().toString()
-                    + " [target] " + user.getMailAddress());
-        }
-        MailsDao.get().insert(mailsEntity);
-    }
-
-
-    
-    /**
-     * ナレッジを登録・更新した際にメール通知を送信する
-     * @param notifyQueuesEntity
-     * @throws Exception 
-     */
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void notifyKnowledgeUpdate(NotifyQueuesEntity notifyQueuesEntity) throws Exception {
-        // ナレッジが登録/更新された
-        KnowledgesDao knowledgesDao = KnowledgesDao.get();
-        KnowledgesEntity knowledge = knowledgesDao.selectOnKeyWithUserName(notifyQueuesEntity.getId());
-        if (null == knowledge) {
-            LOG.warn("Knowledge record not found. id: " + notifyQueuesEntity.getId());
-            return;
-        }
-        
-        // Webhook通知
-        sendKnowledgeWebhook(knowledge, notifyQueuesEntity.getType());
-        // 「非公開」のナレッジは、メール通知対象外
-        if (knowledge.getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PUBLIC) {
-            notifyPublicKnowledgeUpdate(notifyQueuesEntity, knowledge);
-            updateNotifyStatus(knowledge);
-        } else if (knowledge.getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PROTECT) {
-            notifyProtectKnowledgeUpdate(notifyQueuesEntity, knowledge);
-            updateNotifyStatus(knowledge);
-        }
-    }
-    
-    /**
-     * 通知を送ったもののステータスを更新
-     * @param knowledge
-     */
-    private void updateNotifyStatus(KnowledgesEntity knowledge) {
-        if (knowledge.getNotifyStatus() == null || knowledge.getNotifyStatus().intValue() == 0) {
-            knowledge.setNotifyStatus(INT_FLAG.ON.getValue()); // 通知済へ
-            KnowledgesDao.get().physicalUpdate(knowledge); // 更新日時などは更新しない
-        }
-    }
-
-    /**
-     * 「保護」のナレッジを登録・更新した際にメール通知を送信する
-     * @param notifyQueuesEntity
-     * @param knowledge
-     * @throws Exception 
-     */
-    private void notifyProtectKnowledgeUpdate(NotifyQueuesEntity notifyQueuesEntity, KnowledgesEntity knowledge) throws Exception {
-        List<UsersEntity> users = new ArrayList<>();
-        // 宛先の一覧取得
-        TargetsDao targetsDao = TargetsDao.get();
-        List<UsersEntity> targetUsers = targetsDao.selectUsersOnKnowledgeId(knowledge.getKnowledgeId());
-        users.addAll(targetUsers);
-        
-        //グループの一覧
-        List<GroupsEntity> targetGroups = targetsDao.selectGroupsOnKnowledgeId(knowledge.getKnowledgeId());
-        for (GroupsEntity groupsEntity : targetGroups) {
-            List<GroupUser> groupUsers = ExUsersDao.get().selectGroupUser(groupsEntity.getGroupId(), 0, Integer.MAX_VALUE);
-            for (GroupUser groupUser : groupUsers) {
-                if (!contains(users, groupUser)) {
-                    users.add(groupUser);
-                }
-            }
-        }
-
-        Iterator<UsersEntity> iterator = users.iterator();
-        while (iterator.hasNext()) {
-            UsersEntity usersEntity = (UsersEntity) iterator.next();
-            // 自分宛てのナレッジ登録／更新で通知するかどうかの判定
-            NotifyConfigsDao notifyConfigsDao = NotifyConfigsDao.get();
-            NotifyConfigsEntity notifyConfigsEntity = notifyConfigsDao.selectOnKey(usersEntity.getUserId());
-            if (notifyConfigsEntity == null) {
-                iterator.remove();
-            } else if (!INT_FLAG.flagCheck(notifyConfigsEntity.getToItemSave())) {
-                iterator.remove();
-            }
-        }
-        notifyKnowledgeUpdateToUsers(notifyQueuesEntity, knowledge, users);
-    }
-    /**
-     * 既に指定のユーザが追加されているのか確認
-     * @param users
-     * @param groupUser
-     * @return
-     */
-    private boolean contains(List<UsersEntity> users, UsersEntity groupUser) {
-        for (UsersEntity usersEntity : users) {
-            if (usersEntity.equalsOnKey(groupUser)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 「公開」のナレッジを登録・更新した際にメール通知を送信する
-     * @param notifyQueuesEntity
-     * @param knowledge
-     * @throws Exception 
-     */
-    private void notifyPublicKnowledgeUpdate(NotifyQueuesEntity notifyQueuesEntity, KnowledgesEntity knowledge) throws Exception {
-        //ナレッジ登録ONでかつ、公開区分「公開」を除外しないユーザに通知
-        List<UsersEntity> users = ExUsersDao.get().selectNotifyPublicUsers();
-        notifyKnowledgeUpdateToUsers(notifyQueuesEntity, knowledge, users);
-    }
-    
-    /**
-     * 指定のユーザ一覧に、ナレッジを登録・更新した際にメール通知を送信する
-     * @param notifyQueuesEntity
-     * @param knowledge
-     * @param users
-     * @throws Exception 
-     */
-    private void notifyKnowledgeUpdateToUsers(NotifyQueuesEntity notifyQueuesEntity, KnowledgesEntity knowledge, List<UsersEntity> users)
-            throws Exception {
-        StringBuilder content = new StringBuilder();
-        // テンプレートの種類をセット
-        TemplateMastersEntity templateMaster = TemplateMastersDao.get().selectWithItems(knowledge.getTypeId());
-        content.append("Type: ").append(templateMaster.getTypeName()).append("\n");
-        // テンプレートの拡張項目の情報もメールにセットする
-        List<KnowledgeItemValuesEntity> values = KnowledgeItemValuesDao.get().selectOnKnowledgeId(knowledge.getKnowledgeId());
-        List<TemplateItemsEntity> items = templateMaster.getItems();
-        for (KnowledgeItemValuesEntity val : values) {
-            for (TemplateItemsEntity item : items) {
-                if (val.getItemNo().equals(item.getItemNo())) {
-                    item.setItemValue(val.getItemValue());
-                    content.append(item.getItemName()).append(": ").append(item.getItemValue()).append("\n");
-                    break;
-                }
-            }
-        }
-        if (values.size() > 0) {
-            content.append("\n");
-        }
-        content.append(knowledge.getContent());
-        
-        NotificationsEntity notification = NotificationLogic.get().insertNotificationOnKnowledgeUpdate(knowledge);
-        
-        for (UsersEntity usersEntity : users) {
-            NotificationLogic.get().insertUserNotification(notification, usersEntity);
-            if (!StringUtils.isEmailAddress(usersEntity.getMailAddress())) {
-                // 送信先のメールアドレスが不正なのでこのユーザにはメール送信しない
-                LOG.warn("mail targget [" + usersEntity.getMailAddress() + "] is wrong.");
-                continue;
-            }
-            if (LOG.isTraceEnabled()) {
-                LOG.trace("[Notify] " + usersEntity.getMailAddress());
-            }
-            Locale locale = usersEntity.getLocale();
-            MailLocaleTemplatesEntity template;
-            if (knowledge.getNotifyStatus() == null || knowledge.getNotifyStatus().intValue() == 0) {
-                template = load(locale, MailLogic.NOTIFY_INSERT_KNOWLEDGE);
-            } else {
-                template = load(locale, MailLogic.NOTIFY_UPDATE_KNOWLEDGE);
-            }
-            // メール送信
-            insertNotifyKnowledgeUpdateMailQue(knowledge, usersEntity, template, content.toString());
-        }
-    }
-
-
-
-    /**
-     * 記事の追加・更新のWebhookの登録を行う
-     * @param comment
-     * @param knowledge
-     */
-    private void sendKnowledgeWebhook(KnowledgesEntity knowledge, int type) {
-        WebhookConfigsDao webhookConfigsDao = WebhookConfigsDao.get();
-        List<WebhookConfigsEntity> webhookConfigsEntities = webhookConfigsDao.selectOnHook(WebhookConfigsEntity.HOOK_KNOWLEDGES);
-
-        if (0 == webhookConfigsEntities.size()) {
-            return;
-        }
-
-        WebhookLogic webhookLogic = WebhookLogic.get();
-        Map<String, Object> knowledgeData = webhookLogic.getKnowledgeData(knowledge, type);
-
-        WebhooksEntity webhooksEntity = new WebhooksEntity();
-        String webhookId = idGenu("Notify");
-        webhooksEntity.setWebhookId(webhookId);
-        webhooksEntity.setStatus(WebhookBat.WEBHOOK_STATUS_UNSENT);
-        webhooksEntity.setHook(WebhookConfigsEntity.HOOK_KNOWLEDGES);
-        webhooksEntity.setContent(JSON.encode(knowledgeData));
-
-        WebhooksDao.get().insert(webhooksEntity);
-    }
-    
-    /**
-     * メール送信のキュー情報を登録する
-     * @param knowledge
-     * @param usersEntity
-     * @param content 
-     * @param config
-     * @throws Exception 
-     */
-    private void insertNotifyKnowledgeUpdateMailQue(KnowledgesEntity knowledge, UsersEntity usersEntity, MailLocaleTemplatesEntity template, String content) throws Exception {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            LOG.info("mail config is not exists.");
-            return;
-        }
-        if (!StringUtils.isEmailAddress(usersEntity.getMailAddress())) {
-            // 送信先のメールアドレスが不正なので、送信処理は終了
-            LOG.warn("mail targget [" + usersEntity.getMailAddress() + "] is wrong.");
-            return;
-        }
-
-        MailsEntity mailsEntity = new MailsEntity();
-        String mailId = idGenu("Notify");
-        mailsEntity.setMailId(mailId);
-        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
-        mailsEntity.setToAddress(usersEntity.getMailAddress());
-        mailsEntity.setToName(usersEntity.getUserName());
-        String title = template.getTitle();
-        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
-        mailsEntity.setTitle(title);
-        String contents = template.getContent();
-        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
-        contents = contents.replace("{User}", knowledge.getUpdateUserName());
-        
-        // コンテンツがHTMLであった場合、テキストを取得する
-        contents = contents.replace("{Contents}", getContent(content));
-        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
-        mailsEntity.setContent(contents);
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("News email has been registered. [type] knowledge update. [knowledge]" + knowledge.getKnowledgeId().toString()
-                    + " [target] " + usersEntity.getMailAddress());
-        }
-        MailsDao.get().insert(mailsEntity);
-    }
-    
-    /**
-     * メールにセットする本文の取得
-     * @param content
-     * @return
-     * @throws Exception 
-     */
-    private String getContent(String content) throws Exception {
-        return MailLogic.get().getMailContent(content);
-    }
-
     /**
      * メール送信のIDを生成
      * @param string
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
index 1164f64f0..fb606368d 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -1,10 +1,13 @@
 package org.support.project.knowledge.logic;
 
-import org.support.project.common.util.StringUtils;
+import java.util.List;
+
 import org.support.project.di.Container;
-import org.support.project.knowledge.entity.KnowledgesEntity;
-import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
-import org.support.project.knowledge.vo.notification.KnowledgeUpdate;
+import org.support.project.knowledge.logic.notification.CommentInsertNotification;
+import org.support.project.knowledge.logic.notification.KnowledgeUpdateNotification;
+import org.support.project.knowledge.logic.notification.LikeInsertNotification;
+import org.support.project.knowledge.logic.notification.Notification;
+import org.support.project.knowledge.logic.notification.Notification.TARGET;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.dao.NotificationsDao;
 import org.support.project.web.dao.UserNotificationsDao;
@@ -12,13 +15,7 @@
 import org.support.project.web.entity.UserNotificationsEntity;
 import org.support.project.web.entity.UsersEntity;
 
-import net.arnx.jsonic.JSON;
-
 public class NotificationLogic extends org.support.project.web.logic.NotificationLogic {
-    public static enum TARGET {
-        list, detail
-    }
-    
     /**
      * Get instance
      * @return instance
@@ -37,64 +34,29 @@ public void insertUserNotification(NotificationsEntity notification, UsersEntity
         userNotification.setStatus(NotificationLogic.STATUS_UNREAD);
         UserNotificationsDao.get().insert(userNotification);
     }
-    
-    /**
-     * Knowledgeの登録/更新時の通知情報を作成
-     * @param knowledge
-     * @return
-     */
-    public NotificationsEntity insertNotificationOnKnowledgeUpdate(KnowledgesEntity knowledge) {
-        // 通知情報を作成
-        NotificationsEntity notification = new NotificationsEntity();
-        if (knowledge.getNotifyStatus() == null || knowledge.getNotifyStatus().intValue() == 0) {
-            notification.setTitle(MailLogic.NOTIFY_INSERT_KNOWLEDGE);
-        } else {
-            notification.setTitle(MailLogic.NOTIFY_UPDATE_KNOWLEDGE);
+
+    public Notification getNotification(String category) {
+        if (MailLogic.NOTIFY_INSERT_KNOWLEDGE.equals(category) || MailLogic.NOTIFY_UPDATE_KNOWLEDGE.equals(category)) {
+            return KnowledgeUpdateNotification.get();
+        } else if (MailLogic.NOTIFY_INSERT_COMMENT_MYITEM.equals(category) || MailLogic.NOTIFY_INSERT_COMMENT.equals(category)) {
+            return CommentInsertNotification.get();
+        } else if (MailLogic.NOTIFY_INSERT_LIKE_MYITEM.equals(category)) {
+            return LikeInsertNotification.get();
         }
-        KnowledgeUpdate update = new KnowledgeUpdate();
-        update.setKnowledgeId(knowledge.getKnowledgeId());
-        update.setKnowledgeTitle(knowledge.getTitle());
-        update.setUpdateUser(knowledge.getUpdateUserName());
-        notification.setContent(JSON.encode(update));
-        notification = NotificationsDao.get().insert(notification);
-        return notification;
+        return null;
     }
     
-
-    /**
-     * ユーザへの通知を意味のある形へ変換
-     * @param notificationsEntity
-     * @param loginedUser 
-     */
-    public void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target) {
-        String category = notificationsEntity.getTitle();
-        if (MailLogic.NOTIFY_INSERT_KNOWLEDGE.equals(category) || MailLogic.NOTIFY_UPDATE_KNOWLEDGE.equals(category)) {
-            KnowledgeUpdate update = JSON.decode(notificationsEntity.getContent(), KnowledgeUpdate.class);
-            MailLocaleTemplatesEntity template = MailLogic.get().load(loginedUser.getLocale(), MailLogic.NOTIFY_INSERT_KNOWLEDGE);
-            
-            String title = template.getTitle();
-            title = title.replace("{KnowledgeId}", String.valueOf(update.getKnowledgeId()));
-            title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(update.getKnowledgeTitle(), 80));
-            notificationsEntity.setTitle(title);
-            
-            if (target == TARGET.detail) {
-                String contents = template.getContent();
-                contents = contents.replace("{KnowledgeId}", String.valueOf(update.getKnowledgeId()));
-                contents = contents.replace("{KnowledgeTitle}", update.getKnowledgeTitle());
-                contents = contents.replace("{User}", update.getUpdateUser());
-                contents = contents.replace("{URL}", NotifyLogic.get().makeURL(update.getKnowledgeId()));
-                KnowledgesEntity entity = KnowledgeLogic.get().select(update.getKnowledgeId(), loginedUser);
-                if (entity != null) {
-                    contents = contents.replace("{Contents}", entity.getContent());
-                } else {
-                    contents = contents.replace("{Contents}", "");
-                }
-                notificationsEntity.setContent(contents);
-            }
+    
+    public List<NotificationsEntity> getNotification(LoginedUser loginedUser, int offset) {
+        List<NotificationsEntity> notifications = super.getNotification(loginedUser.getUserId(), offset);
+        for (NotificationsEntity notificationsEntity : notifications) {
+            Notification notification = getNotification(notificationsEntity.getTitle());
+            notification.convNotification(notificationsEntity, loginedUser, Notification.TARGET.list);
         }
-        
+        return notifications;
     }
     
+    
     /**
      * 通知の読み込み
      * @param no
@@ -106,12 +68,10 @@ public NotificationsEntity load(long no, LoginedUser loginedUser) {
         if (userNotification == null) {
             return null;
         }
-        NotificationsEntity notification = NotificationsDao.get().selectOnKey(no);
-        convNotification(notification, loginedUser, TARGET.detail);
-        return notification;
+        NotificationsEntity notificationsEntity = NotificationsDao.get().selectOnKey(no);
+        Notification notification = getNotification(notificationsEntity.getTitle());
+        notification.convNotification(notificationsEntity, loginedUser, TARGET.detail);
+        return notificationsEntity;
     }
     
-
-    
-    
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java b/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
index 92a6801e3..330b32376 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
@@ -8,7 +8,6 @@
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.NumberUtils;
-import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -24,21 +23,16 @@
 import org.support.project.knowledge.entity.KnowledgeUsersEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.LikesEntity;
-import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
 import org.support.project.knowledge.entity.NotifyConfigsEntity;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.vo.Notify;
-import org.support.project.knowledge.vo.notification.KnowledgeUpdate;
 import org.support.project.knowledge.websocket.NotifyAction;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.bean.MessageResult;
 import org.support.project.web.dao.SystemConfigsDao;
 import org.support.project.web.entity.GroupsEntity;
-import org.support.project.web.entity.NotificationsEntity;
 import org.support.project.web.entity.SystemConfigsEntity;
 import org.support.project.web.entity.UsersEntity;
-
-import net.arnx.jsonic.JSON;
 /**
  * 通知を処理するロジック
  * @author Koda
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java
new file mode 100644
index 000000000..2ddd9f2d8
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java
@@ -0,0 +1,31 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+public abstract class AbstractNotification implements Notification {
+    
+    /** date format */
+    private static DateFormat getDayFormat() {
+        return new SimpleDateFormat("yyyyMMddHHmmss");
+    }
+    /**
+     * メール送信のIDを生成
+     * @param string
+     * @return
+     */
+    protected String idGen(String label) {
+        StringBuilder builder = new StringBuilder();
+        builder.append(label);
+        builder.append("-");
+        builder.append(getDayFormat().format(new Date()));
+        builder.append("-");
+        builder.append(UUID.randomUUID().toString());
+        return builder.toString();
+    }
+    
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
new file mode 100644
index 000000000..01df3cff9
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
@@ -0,0 +1,260 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.support.project.aop.Aspect;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.bat.WebhookBat;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.NotifyType;
+import org.support.project.knowledge.dao.CommentsDao;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.WebhookConfigsDao;
+import org.support.project.knowledge.dao.WebhooksDao;
+import org.support.project.knowledge.entity.CommentsEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.entity.WebhookConfigsEntity;
+import org.support.project.knowledge.entity.WebhooksEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.knowledge.logic.NotifyCommentLogic;
+import org.support.project.knowledge.logic.NotifyLogic;
+import org.support.project.knowledge.logic.WebhookLogic;
+import org.support.project.knowledge.vo.notification.CommentInsert;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+import net.arnx.jsonic.JSON;
+
+/**
+ * ナレッジにコメントが登録された場合の通知
+ * @author koda
+ */
+@DI(instance = Instance.Singleton)
+public class CommentInsertNotification extends AbstractNotification {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(CommentInsertNotification.class);
+    /** インスタンス取得 */
+    public static CommentInsertNotification get() {
+        return Container.getComp(CommentInsertNotification.class);
+    }
+
+    /** knowledge id what is sended */
+    private List<Long> sendedCommentKnowledgeIds = new ArrayList<>();
+    
+    @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void notify(NotifyQueuesEntity notifyQueue) throws Exception {
+        CommentsDao commentsDao = CommentsDao.get();
+        CommentsEntity comment = commentsDao.selectOnKey(notifyQueue.getId());
+        if (null == comment) {
+            LOG.warn("Comment record not found. id: " + notifyQueue.getId());
+            return;
+        }
+
+        KnowledgesDao knowledgesDao = KnowledgesDao.get();
+        KnowledgesEntity knowledge = knowledgesDao.selectOnKey(comment.getKnowledgeId());
+        if (null == knowledge) {
+            LOG.warn("Knowledge record not found. id: " + notifyQueue.getId());
+            return;
+        }
+
+        if (sendedCommentKnowledgeIds.contains(knowledge.getKnowledgeId())) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Knowledge [" + knowledge.getKnowledgeId() + "] ");
+            }
+            return;
+        } else {
+            sendedCommentKnowledgeIds.add(knowledge.getKnowledgeId());
+        }
+        
+        sendCommentWebhook(comment, knowledge);
+
+        UsersDao usersDao = UsersDao.get();
+        UsersEntity commentUser = usersDao.selectOnKey(comment.getInsertUser());
+        
+        // 登録者に通知
+        UsersEntity user = NotifyCommentLogic.get().getInsertUserOnComment(NotifyType.Mail, comment, knowledge);
+        if (user != null) {
+            // 画面での通知の情報を登録
+            NotificationsEntity notification = insertNotificationOnComentInsert(knowledge, comment, commentUser,
+                    MailLogic.NOTIFY_INSERT_COMMENT_MYITEM);
+            // 通知とユーザの紐付け
+            NotificationLogic.get().insertUserNotification(notification, user);
+            
+            Locale locale = user.getLocale();
+            MailLocaleTemplatesEntity template = MailLogic.get().load(locale, MailLogic.NOTIFY_INSERT_COMMENT_MYITEM);
+            sendCommentMail(comment, knowledge, commentUser, user, template);
+        }
+        // 宛先のナレッジにコメント追加で通知が欲しいユーザに通知
+        NotificationsEntity notification = insertNotificationOnComentInsert(knowledge, comment, commentUser,
+                MailLogic.NOTIFY_INSERT_COMMENT);
+        List<UsersEntity> users = NotifyCommentLogic.get().getTargetUsersOnComment(NotifyType.Mail, comment, knowledge);
+        for (UsersEntity target : users) {
+            // 通知とユーザの紐付け
+            NotificationLogic.get().insertUserNotification(notification, target);
+            
+            // 宛先にメール送信
+            Locale locale = target.getLocale();
+            MailLocaleTemplatesEntity template = MailLogic.get().load(locale, MailLogic.NOTIFY_INSERT_COMMENT);
+            sendCommentMail(comment, knowledge, commentUser, target, template);
+        }
+    }
+    
+    /**
+     * 画面での通知の情報を登録
+     * @param knowledge
+     * @param comment
+     * @param commentUser
+     * @param notifyInsertCommentMyitem 
+     * @return
+     */
+    private NotificationsEntity insertNotificationOnComentInsert(KnowledgesEntity knowledge, CommentsEntity comment, UsersEntity commentUser,
+            String template) {
+        // 通知情報を作成
+        NotificationsEntity notification = new NotificationsEntity();
+        notification.setTitle(template);
+        
+        CommentInsert info = new CommentInsert();
+        info.setKnowledgeId(knowledge.getKnowledgeId());
+        info.setKnowledgeTitle(knowledge.getTitle());
+        info.setUpdateUser(knowledge.getUpdateUserName());
+        
+        info.setCommentContents(comment.getComment());
+        info.setCommentInsertUser(commentUser.getUserName());
+        
+        notification.setContent(JSON.encode(info));
+        notification = NotificationsDao.get().insert(notification);
+        return notification;
+    }
+
+
+    /**
+     * コメントが追加されたメールを通知する
+     * @param comment コメントの情報
+     * @param knowledge ナレッジの情報
+     * @param commentUser コメントを登録したユーザの情報
+     * @param user メールの送信先
+     * @throws Exception 
+     */
+    private void sendCommentMail(CommentsEntity comment, KnowledgesEntity knowledge, UsersEntity commentUser, UsersEntity user, MailLocaleTemplatesEntity template)
+            throws Exception {
+        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
+        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
+        if (mailConfigsEntity == null) {
+            // メールの設定が登録されていなければ、送信処理は終了
+            LOG.info("mail config is not exists.");
+            return;
+        }
+        if (!StringUtils.isEmailAddress(user.getMailAddress())) {
+            // 送信先のメールアドレスが不正なので、送信処理は終了
+            LOG.warn("mail targget [" + user.getMailAddress() + "] is wrong.");
+            return;
+        }
+
+        MailsEntity mailsEntity = new MailsEntity();
+        String mailId = idGen("Notify");
+        mailsEntity.setMailId(mailId);
+        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
+        mailsEntity.setToAddress(user.getMailAddress());
+        mailsEntity.setToName(user.getUserName());
+        
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
+        mailsEntity.setTitle(title);
+        String contents = template.getContent();
+        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
+        contents = contents.replace("{Contents}", MailLogic.get().getMailContent(knowledge.getContent()));
+        if (commentUser != null) {
+            contents = contents.replace("{CommentInsertUser}", commentUser.getUserName());
+        } else {
+            contents = contents.replace("{CommentInsertUser}", "");
+        }
+        contents = contents.replace("{CommentContents}", MailLogic.get().getMailContent(comment.getComment()));
+        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
+
+        mailsEntity.setContent(contents);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("News email has been registered. [type] comment added. [knowledge]" + knowledge.getKnowledgeId().toString()
+                    + " [target] " + user.getMailAddress());
+        }
+        MailsDao.get().insert(mailsEntity);
+    }
+    
+    /**
+     * コメント追加のWebhookの登録を行う
+     * @param comment
+     * @param knowledge
+     */
+    private void sendCommentWebhook(CommentsEntity comment, KnowledgesEntity knowledge) {
+        WebhookConfigsDao webhookConfigsDao = WebhookConfigsDao.get();
+        List<WebhookConfigsEntity> webhookConfigsEntities = webhookConfigsDao.selectOnHook(WebhookConfigsEntity.HOOK_COMMENTS);
+
+        if (0 == webhookConfigsEntities.size()) {
+            return;
+        }
+
+        WebhookLogic webhookLogic = WebhookLogic.get();
+        Map<String, Object> commentData = webhookLogic.getCommentData(comment, knowledge);
+
+        WebhooksEntity webhooksEntity = new WebhooksEntity();
+        String webhookId = idGen("Notify");
+        webhooksEntity.setWebhookId(webhookId);
+        webhooksEntity.setStatus(WebhookBat.WEBHOOK_STATUS_UNSENT);
+        webhooksEntity.setHook(WebhookConfigsEntity.HOOK_COMMENTS);
+        webhooksEntity.setContent(JSON.encode(commentData));
+
+        WebhooksDao.get().insert(webhooksEntity);
+    }
+    
+
+    @Override
+    public void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target) {
+        CommentInsert update = JSON.decode(notificationsEntity.getContent(), CommentInsert.class);
+        MailLocaleTemplatesEntity template = MailLogic.get().load(loginedUser.getLocale(), notificationsEntity.getTitle());
+        
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", String.valueOf(update.getKnowledgeId()));
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(update.getKnowledgeTitle(), 80));
+        notificationsEntity.setTitle(title);
+        
+        if (target == TARGET.detail) {
+            String contents = template.getContent();
+            contents = contents.replace("{KnowledgeId}", String.valueOf(update.getKnowledgeId()));
+            contents = contents.replace("{KnowledgeTitle}", update.getKnowledgeTitle());
+            contents = contents.replace("{User}", update.getUpdateUser());
+            contents = contents.replace("{URL}", NotifyLogic.get().makeURL(update.getKnowledgeId()));
+            KnowledgesEntity entity = KnowledgeLogic.get().select(update.getKnowledgeId(), loginedUser);
+            if (entity != null) {
+                contents = contents.replace("{Contents}", entity.getContent());
+            } else {
+                contents = contents.replace("{Contents}", "");
+            }
+            contents = contents.replace("{CommentInsertUser}", update.getCommentInsertUser());
+            contents = contents.replace("{CommentContents}", update.getCommentContents());
+            
+            notificationsEntity.setContent(contents);
+        }
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
new file mode 100644
index 000000000..dbbc53579
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
@@ -0,0 +1,355 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.support.project.aop.Aspect;
+import org.support.project.common.config.INT_FLAG;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.bat.WebhookBat;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.dao.ExUsersDao;
+import org.support.project.knowledge.dao.KnowledgeItemValuesDao;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.NotifyConfigsDao;
+import org.support.project.knowledge.dao.TargetsDao;
+import org.support.project.knowledge.dao.TemplateMastersDao;
+import org.support.project.knowledge.dao.WebhookConfigsDao;
+import org.support.project.knowledge.dao.WebhooksDao;
+import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.entity.NotifyConfigsEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.entity.TemplateItemsEntity;
+import org.support.project.knowledge.entity.TemplateMastersEntity;
+import org.support.project.knowledge.entity.WebhookConfigsEntity;
+import org.support.project.knowledge.entity.WebhooksEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.knowledge.logic.NotifyLogic;
+import org.support.project.knowledge.logic.WebhookLogic;
+import org.support.project.knowledge.vo.GroupUser;
+import org.support.project.knowledge.vo.notification.KnowledgeUpdate;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.entity.GroupsEntity;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+import net.arnx.jsonic.JSON;
+
+/**
+ * ナレッジを登録・更新した際の通知処理
+ * @author koda
+ */
+@DI(instance = Instance.Singleton)
+public class KnowledgeUpdateNotification extends AbstractNotification {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(KnowledgeUpdateNotification.class);
+    /** インスタンス取得 */
+    public static KnowledgeUpdateNotification get() {
+        return Container.getComp(KnowledgeUpdateNotification.class);
+    }
+    
+    @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void notify(NotifyQueuesEntity notifyQueue) throws Exception {
+        // ナレッジが登録/更新された
+        KnowledgesDao knowledgesDao = KnowledgesDao.get();
+        KnowledgesEntity knowledge = knowledgesDao.selectOnKeyWithUserName(notifyQueue.getId());
+        if (null == knowledge) {
+            LOG.warn("Knowledge record not found. id: " + notifyQueue.getId());
+            return;
+        }
+        
+        // Webhook通知
+        sendKnowledgeWebhook(knowledge, notifyQueue.getType());
+        // 「非公開」のナレッジは、メール通知対象外
+        if (knowledge.getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PUBLIC) {
+            notifyPublicKnowledgeUpdate(notifyQueue, knowledge);
+            updateNotifyStatus(knowledge);
+        } else if (knowledge.getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PROTECT) {
+            notifyProtectKnowledgeUpdate(notifyQueue, knowledge);
+            updateNotifyStatus(knowledge);
+        }
+        
+    }
+    /**
+     * 「公開」のナレッジを登録・更新した際にメール通知を送信する
+     * @param notifyQueuesEntity
+     * @param knowledge
+     * @throws Exception 
+     */
+    private void notifyPublicKnowledgeUpdate(NotifyQueuesEntity notifyQueuesEntity, KnowledgesEntity knowledge) throws Exception {
+        //ナレッジ登録ONでかつ、公開区分「公開」を除外しないユーザに通知
+        List<UsersEntity> users = ExUsersDao.get().selectNotifyPublicUsers();
+        notifyKnowledgeUpdateToUsers(notifyQueuesEntity, knowledge, users);
+    }
+    /**
+     * 「保護」のナレッジを登録・更新した際にメール通知を送信する
+     * @param notifyQueuesEntity
+     * @param knowledge
+     * @throws Exception 
+     */
+    private void notifyProtectKnowledgeUpdate(NotifyQueuesEntity notifyQueuesEntity, KnowledgesEntity knowledge) throws Exception {
+        List<UsersEntity> users = new ArrayList<>();
+        // 宛先の一覧取得
+        TargetsDao targetsDao = TargetsDao.get();
+        List<UsersEntity> targetUsers = targetsDao.selectUsersOnKnowledgeId(knowledge.getKnowledgeId());
+        users.addAll(targetUsers);
+        
+        //グループの一覧
+        List<GroupsEntity> targetGroups = targetsDao.selectGroupsOnKnowledgeId(knowledge.getKnowledgeId());
+        for (GroupsEntity groupsEntity : targetGroups) {
+            List<GroupUser> groupUsers = ExUsersDao.get().selectGroupUser(groupsEntity.getGroupId(), 0, Integer.MAX_VALUE);
+            for (GroupUser groupUser : groupUsers) {
+                if (!contains(users, groupUser)) {
+                    users.add(groupUser);
+                }
+            }
+        }
+
+        Iterator<UsersEntity> iterator = users.iterator();
+        while (iterator.hasNext()) {
+            UsersEntity usersEntity = (UsersEntity) iterator.next();
+            // 自分宛てのナレッジ登録／更新で通知するかどうかの判定
+            NotifyConfigsDao notifyConfigsDao = NotifyConfigsDao.get();
+            NotifyConfigsEntity notifyConfigsEntity = notifyConfigsDao.selectOnKey(usersEntity.getUserId());
+            if (notifyConfigsEntity == null) {
+                iterator.remove();
+            } else if (!INT_FLAG.flagCheck(notifyConfigsEntity.getToItemSave())) {
+                iterator.remove();
+            }
+        }
+        notifyKnowledgeUpdateToUsers(notifyQueuesEntity, knowledge, users);
+    }
+    
+    /**
+     * 指定のユーザ一覧に、ナレッジを登録・更新した際にメール通知を送信する
+     * @param notifyQueuesEntity
+     * @param knowledge
+     * @param users
+     * @throws Exception 
+     */
+    private void notifyKnowledgeUpdateToUsers(NotifyQueuesEntity notifyQueuesEntity, KnowledgesEntity knowledge, List<UsersEntity> users)
+            throws Exception {
+        StringBuilder content = new StringBuilder();
+        // テンプレートの種類をセット
+        TemplateMastersEntity templateMaster = TemplateMastersDao.get().selectWithItems(knowledge.getTypeId());
+        content.append("Type: ").append(templateMaster.getTypeName()).append("\n");
+        // テンプレートの拡張項目の情報もメールにセットする
+        List<KnowledgeItemValuesEntity> values = KnowledgeItemValuesDao.get().selectOnKnowledgeId(knowledge.getKnowledgeId());
+        List<TemplateItemsEntity> items = templateMaster.getItems();
+        for (KnowledgeItemValuesEntity val : values) {
+            for (TemplateItemsEntity item : items) {
+                if (val.getItemNo().equals(item.getItemNo())) {
+                    item.setItemValue(val.getItemValue());
+                    content.append(item.getItemName()).append(": ").append(item.getItemValue()).append("\n");
+                    break;
+                }
+            }
+        }
+        if (values.size() > 0) {
+            content.append("\n");
+        }
+        content.append(knowledge.getContent());
+        
+        // 画面での通知の情報を登録
+        NotificationsEntity notification = insertNotificationOnKnowledgeUpdate(knowledge);
+        
+        for (UsersEntity usersEntity : users) {
+            // 通知とユーザの紐付け
+            NotificationLogic.get().insertUserNotification(notification, usersEntity);
+            
+            if (!StringUtils.isEmailAddress(usersEntity.getMailAddress())) {
+                // 送信先のメールアドレスが不正なのでこのユーザにはメール送信しない
+                LOG.warn("mail targget [" + usersEntity.getMailAddress() + "] is wrong.");
+                continue;
+            }
+            if (LOG.isTraceEnabled()) {
+                LOG.trace("[Notify] " + usersEntity.getMailAddress());
+            }
+            Locale locale = usersEntity.getLocale();
+            MailLocaleTemplatesEntity template;
+            if (knowledge.getNotifyStatus() == null || knowledge.getNotifyStatus().intValue() == 0) {
+                template = MailLogic.get().load(locale, MailLogic.NOTIFY_INSERT_KNOWLEDGE);
+            } else {
+                template = MailLogic.get().load(locale, MailLogic.NOTIFY_UPDATE_KNOWLEDGE);
+            }
+            // メール送信
+            insertNotifyKnowledgeUpdateMailQue(knowledge, usersEntity, template, content.toString());
+        }
+    }
+
+    /**
+     * メール送信のキュー情報を登録する
+     * @param knowledge
+     * @param usersEntity
+     * @param content 
+     * @param config
+     * @throws Exception 
+     */
+    private void insertNotifyKnowledgeUpdateMailQue(KnowledgesEntity knowledge, UsersEntity usersEntity, MailLocaleTemplatesEntity template, String content) throws Exception {
+        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
+        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
+        if (mailConfigsEntity == null) {
+            // メールの設定が登録されていなければ、送信処理は終了
+            LOG.info("mail config is not exists.");
+            return;
+        }
+        if (!StringUtils.isEmailAddress(usersEntity.getMailAddress())) {
+            // 送信先のメールアドレスが不正なので、送信処理は終了
+            LOG.warn("mail targget [" + usersEntity.getMailAddress() + "] is wrong.");
+            return;
+        }
+
+        MailsEntity mailsEntity = new MailsEntity();
+        String mailId = idGen("Notify");
+        mailsEntity.setMailId(mailId);
+        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
+        mailsEntity.setToAddress(usersEntity.getMailAddress());
+        mailsEntity.setToName(usersEntity.getUserName());
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
+        mailsEntity.setTitle(title);
+        String contents = template.getContent();
+        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
+        contents = contents.replace("{User}", knowledge.getUpdateUserName());
+        
+        // コンテンツがHTMLであった場合、テキストを取得する
+        contents = contents.replace("{Contents}", MailLogic.get().getMailContent(content));
+        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
+        mailsEntity.setContent(contents);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("News email has been registered. [type] knowledge update. [knowledge]" + knowledge.getKnowledgeId().toString()
+                    + " [target] " + usersEntity.getMailAddress());
+        }
+        MailsDao.get().insert(mailsEntity);
+    }
+    
+    /**
+     * 記事の追加・更新のWebhookの登録を行う
+     * @param comment
+     * @param knowledge
+     */
+    private void sendKnowledgeWebhook(KnowledgesEntity knowledge, int type) {
+        WebhookConfigsDao webhookConfigsDao = WebhookConfigsDao.get();
+        List<WebhookConfigsEntity> webhookConfigsEntities = webhookConfigsDao.selectOnHook(WebhookConfigsEntity.HOOK_KNOWLEDGES);
+
+        if (0 == webhookConfigsEntities.size()) {
+            return;
+        }
+
+        WebhookLogic webhookLogic = WebhookLogic.get();
+        Map<String, Object> knowledgeData = webhookLogic.getKnowledgeData(knowledge, type);
+
+        WebhooksEntity webhooksEntity = new WebhooksEntity();
+        String webhookId = idGen("Notify");
+        webhooksEntity.setWebhookId(webhookId);
+        webhooksEntity.setStatus(WebhookBat.WEBHOOK_STATUS_UNSENT);
+        webhooksEntity.setHook(WebhookConfigsEntity.HOOK_KNOWLEDGES);
+        webhooksEntity.setContent(JSON.encode(knowledgeData));
+
+        WebhooksDao.get().insert(webhooksEntity);
+    }    
+    
+    /**
+     * 既に指定のユーザが追加されているのか確認
+     * @param users
+     * @param groupUser
+     * @return
+     */
+    private boolean contains(List<UsersEntity> users, UsersEntity groupUser) {
+        for (UsersEntity usersEntity : users) {
+            if (usersEntity.equalsOnKey(groupUser)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * 通知を送ったもののステータスを更新
+     * @param knowledge
+     */
+    private void updateNotifyStatus(KnowledgesEntity knowledge) {
+        if (knowledge.getNotifyStatus() == null || knowledge.getNotifyStatus().intValue() == 0) {
+            knowledge.setNotifyStatus(INT_FLAG.ON.getValue()); // 通知済へ
+            KnowledgesDao.get().physicalUpdate(knowledge); // 更新日時などは更新しない
+        }
+    }
+    
+    
+    /**
+     * Knowledgeの登録/更新時の通知情報を作成
+     * @param knowledge
+     * @return
+     */
+    private NotificationsEntity insertNotificationOnKnowledgeUpdate(KnowledgesEntity knowledge) {
+        // 通知情報を作成
+        NotificationsEntity notification = new NotificationsEntity();
+        if (knowledge.getNotifyStatus() == null || knowledge.getNotifyStatus().intValue() == 0) {
+            notification.setTitle(MailLogic.NOTIFY_INSERT_KNOWLEDGE);
+        } else {
+            notification.setTitle(MailLogic.NOTIFY_UPDATE_KNOWLEDGE);
+        }
+        KnowledgeUpdate update = new KnowledgeUpdate();
+        update.setKnowledgeId(knowledge.getKnowledgeId());
+        update.setKnowledgeTitle(knowledge.getTitle());
+        update.setUpdateUser(knowledge.getUpdateUserName());
+        notification.setContent(JSON.encode(update));
+        notification = NotificationsDao.get().insert(notification);
+        return notification;
+    }
+    
+    /**
+     * ユーザへの通知を意味のある形へ変換
+     * @param notificationsEntity
+     * @param loginedUser 
+     */
+    public void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target) {
+        String category = notificationsEntity.getTitle();
+        if (MailLogic.NOTIFY_INSERT_KNOWLEDGE.equals(category) || MailLogic.NOTIFY_UPDATE_KNOWLEDGE.equals(category)) {
+            KnowledgeUpdate update = JSON.decode(notificationsEntity.getContent(), KnowledgeUpdate.class);
+            MailLocaleTemplatesEntity template = MailLogic.get().load(loginedUser.getLocale(), MailLogic.NOTIFY_INSERT_KNOWLEDGE);
+            
+            String title = template.getTitle();
+            title = title.replace("{KnowledgeId}", String.valueOf(update.getKnowledgeId()));
+            title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(update.getKnowledgeTitle(), 80));
+            notificationsEntity.setTitle(title);
+            
+            if (target == TARGET.detail) {
+                String contents = template.getContent();
+                contents = contents.replace("{KnowledgeId}", String.valueOf(update.getKnowledgeId()));
+                contents = contents.replace("{KnowledgeTitle}", update.getKnowledgeTitle());
+                contents = contents.replace("{User}", update.getUpdateUser());
+                contents = contents.replace("{URL}", NotifyLogic.get().makeURL(update.getKnowledgeId()));
+                KnowledgesEntity entity = KnowledgeLogic.get().select(update.getKnowledgeId(), loginedUser);
+                if (entity != null) {
+                    contents = contents.replace("{Contents}", entity.getContent());
+                } else {
+                    contents = contents.replace("{Contents}", "");
+                }
+                notificationsEntity.setContent(contents);
+            }
+        }
+    }
+    
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
new file mode 100644
index 000000000..e2870c0e9
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
@@ -0,0 +1,208 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.support.project.aop.Aspect;
+import org.support.project.common.config.INT_FLAG;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.LikesDao;
+import org.support.project.knowledge.dao.NotifyConfigsDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.entity.NotifyConfigsEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.knowledge.logic.NotifyLogic;
+import org.support.project.knowledge.vo.notification.LikeInsert;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+import net.arnx.jsonic.JSON;
+
+/**
+ * イイネが押されたことを通知
+ * @author koda
+ */
+@DI(instance = Instance.Singleton)
+public class LikeInsertNotification extends AbstractNotification {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(LikeInsertNotification.class);
+    /** インスタンス取得 */
+    public static LikeInsertNotification get() {
+        return Container.getComp(LikeInsertNotification.class);
+    }
+
+    /** like id what is sended */
+    private List<Long> sendedLikeKnowledgeIds = new ArrayList<>();
+    
+    @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void notify(NotifyQueuesEntity notifyQueue) throws Exception {
+        LikesDao likesDao = LikesDao.get();
+        LikesEntity like = likesDao.selectOnKey(notifyQueue.getId());
+        if (null == like) {
+            LOG.warn("Like record not found. id: " + notifyQueue.getId());
+            return;
+        }
+
+        KnowledgesDao knowledgesDao = KnowledgesDao.get();
+        KnowledgesEntity knowledge = knowledgesDao.selectOnKey(like.getKnowledgeId());
+        if (null == knowledge) {
+            LOG.warn("Knowledge record not found. id: " + notifyQueue.getId());
+            return;
+        }
+        
+        if (sendedLikeKnowledgeIds.contains(knowledge.getKnowledgeId())) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Knowledge [" + knowledge.getKnowledgeId() + "] ");
+            }
+            return;
+        } else {
+            sendedLikeKnowledgeIds.add(knowledge.getKnowledgeId());
+        }
+
+        UsersDao usersDao = UsersDao.get();
+        UsersEntity likeUser = usersDao.selectOnKey(like.getInsertUser());
+        
+        // 登録者に通知
+        UsersEntity user = usersDao.selectOnKey(knowledge.getInsertUser());
+        if (user != null) {
+            NotifyConfigsDao notifyConfigsDao = NotifyConfigsDao.get();
+            NotifyConfigsEntity notifyConfigsEntity = notifyConfigsDao.selectOnKey(user.getUserId());
+            // 登録者でかつイイネが登録した場合に通知が欲しい
+            if (notifyConfigsEntity != null && INT_FLAG.flagCheck(notifyConfigsEntity.getMyItemLike())) {
+                // 通知情報生成
+                NotificationsEntity notification = insertNotificationOnLikeMyItem(knowledge, like, likeUser);
+                // 通知とユーザの紐付け
+                NotificationLogic.get().insertUserNotification(notification, user);
+                
+                // メール送信
+                Locale locale = user.getLocale();
+                MailLocaleTemplatesEntity template = MailLogic.get().load(locale, MailLogic.NOTIFY_INSERT_LIKE_MYITEM);
+                sendLikeMail(like, knowledge, likeUser, user, template);
+            }
+        }
+    }
+    
+    private NotificationsEntity insertNotificationOnLikeMyItem(KnowledgesEntity knowledge, LikesEntity like, UsersEntity likeUser) {
+        // 通知情報を作成
+        NotificationsEntity notification = new NotificationsEntity();
+        notification.setTitle(MailLogic.NOTIFY_INSERT_LIKE_MYITEM);
+        
+        LikeInsert info = new LikeInsert();
+        info.setKnowledgeId(knowledge.getKnowledgeId());
+        info.setKnowledgeTitle(knowledge.getTitle());
+        info.setUpdateUser(knowledge.getUpdateUserName());
+        
+        info.setLikeInsertUser(likeUser.getUserName());
+        
+        notification.setContent(JSON.encode(info));
+        notification = NotificationsDao.get().insert(notification);
+        return notification;
+
+    }
+
+    /**
+     * イイネが押されたメールを送る
+     * @param like
+     * @param knowledge
+     * @param likeUser
+     * @param user
+     * @param template
+     * @throws Exception 
+     */
+    private void sendLikeMail(LikesEntity like, KnowledgesEntity knowledge, UsersEntity likeUser, UsersEntity user, MailLocaleTemplatesEntity template)
+            throws Exception {
+        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
+        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
+        if (mailConfigsEntity == null) {
+            // メールの設定が登録されていなければ、送信処理は終了
+            LOG.info("mail config is not exists.");
+            return;
+        }
+        if (!StringUtils.isEmailAddress(user.getMailAddress())) {
+            // 送信先のメールアドレスが不正なので、送信処理は終了
+            LOG.warn("mail targget [" + user.getMailAddress() + "] is wrong.");
+            return;
+        }
+
+        MailsEntity mailsEntity = new MailsEntity();
+        String mailId = idGen("Notify");
+        mailsEntity.setMailId(mailId);
+        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
+        mailsEntity.setToAddress(user.getMailAddress());
+        mailsEntity.setToName(user.getUserName());
+        
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
+        mailsEntity.setTitle(title);
+        String contents = template.getContent();
+        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
+        contents = contents.replace("{Contents}", MailLogic.get().getMailContent(knowledge.getContent()));
+        if (likeUser != null) {
+            contents = contents.replace("{LikeInsertUser}", likeUser.getUserName());
+        } else {
+            contents = contents.replace("{LikeInsertUser}", "");
+        }
+        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
+        
+        mailsEntity.setContent(contents);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("News email has been registered. [type] Like added. [knowledge]" + knowledge.getKnowledgeId().toString()
+                    + " [target] " + user.getMailAddress());
+        }
+        MailsDao.get().insert(mailsEntity);
+    }
+    
+
+    @Override
+    public void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target) {
+        LikeInsert info = JSON.decode(notificationsEntity.getContent(), LikeInsert.class);
+        MailLocaleTemplatesEntity template = MailLogic.get().load(loginedUser.getLocale(), notificationsEntity.getTitle());
+        
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", String.valueOf(info.getKnowledgeId()));
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(info.getKnowledgeTitle(), 80));
+        notificationsEntity.setTitle(title);
+        
+        if (target == TARGET.detail) {
+            String contents = template.getContent();
+            contents = contents.replace("{KnowledgeId}", String.valueOf(info.getKnowledgeId()));
+            contents = contents.replace("{KnowledgeTitle}", info.getKnowledgeTitle());
+            contents = contents.replace("{User}", info.getUpdateUser());
+            contents = contents.replace("{URL}", NotifyLogic.get().makeURL(info.getKnowledgeId()));
+            KnowledgesEntity entity = KnowledgeLogic.get().select(info.getKnowledgeId(), loginedUser);
+            if (entity != null) {
+                contents = contents.replace("{Contents}", entity.getContent());
+            } else {
+                contents = contents.replace("{Contents}", "");
+            }
+            contents = contents.replace("{LikeInsertUser}", info.getLikeInsertUser());
+            notificationsEntity.setContent(contents);
+        }
+        
+
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/Notification.java b/src/main/java/org/support/project/knowledge/logic/notification/Notification.java
new file mode 100644
index 000000000..3ea13d714
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/Notification.java
@@ -0,0 +1,26 @@
+package org.support.project.knowledge.logic.notification;
+
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.entity.NotificationsEntity;
+
+public interface Notification {
+    enum TARGET {
+        list, detail
+    }
+    
+    /**
+     * 通知キューに入っている、通知を処理する
+     * @param notifyQueue
+     */
+    void notify(NotifyQueuesEntity notifyQueue) throws Exception;
+    
+    
+    /**
+     * 画面での通知情報を、表示する形式に変換する
+     * @param notificationsEntity
+     * @param loginedUser
+     * @param target
+     */
+    void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target);
+}
diff --git a/src/main/java/org/support/project/knowledge/vo/notification/CommentInsert.java b/src/main/java/org/support/project/knowledge/vo/notification/CommentInsert.java
new file mode 100644
index 000000000..c09f5b106
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/vo/notification/CommentInsert.java
@@ -0,0 +1,35 @@
+package org.support.project.knowledge.vo.notification;
+
+public class CommentInsert extends KnowledgeUpdate {
+    
+    private String commentInsertUser;
+    private String commentContents;
+    
+    /**
+     * @return the commentInsertUser
+     */
+    public String getCommentInsertUser() {
+        if (commentInsertUser == null) return "";
+        return commentInsertUser;
+    }
+    /**
+     * @param commentInsertUser the commentInsertUser to set
+     */
+    public void setCommentInsertUser(String commentInsertUser) {
+        this.commentInsertUser = commentInsertUser;
+    }
+    /**
+     * @return the commentContents
+     */
+    public String getCommentContents() {
+        if (commentContents == null) return "";
+        return commentContents;
+    }
+    /**
+     * @param commentContents the commentContents to set
+     */
+    public void setCommentContents(String commentContents) {
+        this.commentContents = commentContents;
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/vo/notification/KnowledgeUpdate.java b/src/main/java/org/support/project/knowledge/vo/notification/KnowledgeUpdate.java
index 8e44a3dc4..068daeeab 100644
--- a/src/main/java/org/support/project/knowledge/vo/notification/KnowledgeUpdate.java
+++ b/src/main/java/org/support/project/knowledge/vo/notification/KnowledgeUpdate.java
@@ -1,37 +1,39 @@
 package org.support.project.knowledge.vo.notification;
 
 public class KnowledgeUpdate {
-    private long KnowledgeId;
-    private String KnowledgeTitle;
+    private long knowledgeId;
+    private String knowledgeTitle;
     private String updateUser;
     /**
      * @return the knowledgeId
      */
     public long getKnowledgeId() {
-        return KnowledgeId;
+        return knowledgeId;
     }
     /**
      * @param knowledgeId the knowledgeId to set
      */
     public void setKnowledgeId(long knowledgeId) {
-        KnowledgeId = knowledgeId;
+        this.knowledgeId = knowledgeId;
     }
     /**
      * @return the knowledgeTitle
      */
     public String getKnowledgeTitle() {
-        return KnowledgeTitle;
+        if (knowledgeTitle == null) return "";
+        return knowledgeTitle;
     }
     /**
      * @param knowledgeTitle the knowledgeTitle to set
      */
     public void setKnowledgeTitle(String knowledgeTitle) {
-        KnowledgeTitle = knowledgeTitle;
+        this.knowledgeTitle = knowledgeTitle;
     }
     /**
      * @return the updateUser
      */
     public String getUpdateUser() {
+        if (updateUser == null) return "";
         return updateUser;
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/vo/notification/LikeInsert.java b/src/main/java/org/support/project/knowledge/vo/notification/LikeInsert.java
new file mode 100644
index 000000000..1653a60f4
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/vo/notification/LikeInsert.java
@@ -0,0 +1,21 @@
+package org.support.project.knowledge.vo.notification;
+
+public class LikeInsert extends KnowledgeUpdate {
+    private String likeInsertUser;
+
+    /**
+     * @return the likeInsertUser
+     */
+    public String getLikeInsertUser() {
+        if (likeInsertUser == null) return "";
+        return likeInsertUser;
+    }
+
+    /**
+     * @param likeInsertUser the likeInsertUser to set
+     */
+    public void setLikeInsertUser(String likeInsertUser) {
+        this.likeInsertUser = likeInsertUser;
+    }
+
+}

From d9496836bbac2fb03b6b2c37a904de99c5dce937 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 28 Jul 2017 20:39:23 +0900
Subject: [PATCH 011/138] #349 Add notification feature for event information

---
 .../knowledge/logic/MailEventLogic.java       | 210 +-------------
 .../knowledge/logic/NotificationLogic.java    |  13 +-
 .../AbstractEventNotification.java            | 265 ++++++++++++++++++
 .../notification/AbstractNotification.java    |   6 +-
 .../AbstractQueueNotification.java            |   6 +
 .../CommentInsertNotification.java            |   2 +-
 .../logic/notification/EventNotification.java |  22 ++
 .../notification/EventNotificationByDate.java |  50 ++++
 .../EventNotificationByMinute.java            |  45 +++
 .../notification/EventNotificationByWeek.java |  43 +++
 .../KnowledgeUpdateNotification.java          |   2 +-
 .../notification/LikeInsertNotification.java  |   2 +-
 .../logic/notification/Notification.java      |   8 -
 .../logic/notification/QueueNotification.java |  15 +
 .../vo/notification/EventInformation.java     |  21 ++
 15 files changed, 493 insertions(+), 217 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/AbstractEventNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/AbstractQueueNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/EventNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByDate.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByMinute.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByWeek.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/vo/notification/EventInformation.java

diff --git a/src/main/java/org/support/project/knowledge/logic/MailEventLogic.java b/src/main/java/org/support/project/knowledge/logic/MailEventLogic.java
index d7c3b8366..70ee9ea1e 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailEventLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailEventLogic.java
@@ -1,43 +1,35 @@
 package org.support.project.knowledge.logic;
 
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.TimeZone;
 
 import org.support.project.aop.Aspect;
-import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.dao.EventsDao;
 import org.support.project.knowledge.dao.KnowledgeItemValuesDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
-import org.support.project.knowledge.dao.ParticipantsDao;
-import org.support.project.knowledge.dao.StockKnowledgesDao;
 import org.support.project.knowledge.entity.EventsEntity;
 import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
-import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
-import org.support.project.knowledge.entity.ParticipantsEntity;
-import org.support.project.knowledge.entity.StockKnowledgesEntity;
+import org.support.project.knowledge.logic.notification.EventNotificationByDate;
+import org.support.project.knowledge.logic.notification.EventNotificationByMinute;
+import org.support.project.knowledge.logic.notification.EventNotificationByWeek;
 import org.support.project.web.bean.LoginedUser;
-import org.support.project.web.dao.MailConfigsDao;
-import org.support.project.web.dao.MailsDao;
-import org.support.project.web.dao.UsersDao;
-import org.support.project.web.entity.MailConfigsEntity;
-import org.support.project.web.entity.MailsEntity;
-import org.support.project.web.entity.UsersEntity;
 
 @DI(instance = Instance.Singleton)
 public class MailEventLogic extends MailLogic {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(MailEventLogic.class);
     
+    public static MailEventLogic get() {
+        return Container.getComp(MailEventLogic.class);
+    }
     
     public static final int NOTIFY_STATUS_NOT_SEND = 0;
     /** 今週のイベント通知(日曜に通知) */
@@ -49,25 +41,11 @@ public class MailEventLogic extends MailLogic {
     /** ステータス：ストック中 */
     public static final int STATUS_STOCKED = 100;
     
-    
-    public static MailEventLogic get() {
-        return Container.getComp(MailEventLogic.class);
-    }
-    
-    
     /**
      * 登録されているイベントの開催通知
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void notifyEvents() {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            LOG.info("mail config is not exists.");
-            return;
-        }
-        
         // 登録されているイベントを一週間分取得
         // タイムゾーンを考慮して取得するため、少し範囲広めで取得する。
         // GMT で先週の土曜〜次週の月曜
@@ -104,179 +82,11 @@ public void notifyEvents() {
                 continue;
             }
             List<KnowledgeItemValuesEntity> values = KnowledgeItemValuesDao.get().selectOnKnowledgeId(event.getKnowledgeId());
-            notifyMin(event, knowledge, values, now, mailConfigsEntity);
-            notifyDate(event, knowledge, values, now, mailConfigsEntity);
-            notifyWeek(event, knowledge, values, now, mailConfigsEntity);
-        }
-
-    }
-
-    private void notifyMin(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values,
-            Calendar now, MailConfigsEntity mailConfigsEntity) {
-        int timing = NOTIFY_STATUS_BEFORE_MIN;
-        if (event.getNotifyStatus() >= timing) {
-            // 既に通知済
-            return;
-        }
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("開始までの時間: " + (event.getStartDateTime().getTime() - now.getTimeInMillis()));
-        }
-        // 30分を切った？
-        if (event.getStartDateTime().getTime() <= now.getTimeInMillis() ||
-                event.getStartDateTime().getTime() - now.getTimeInMillis() > (1000 * 60 * 30)) {
-            return;
-        }
-        LOG.info("イベントのメール通知 [ID] " + knowledge.getKnowledgeId() + " [Timing] 30分前");
-        sendNotify(event, knowledge, values, timing);
-    }
-
-    private void notifyDate(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values,
-            Calendar now, MailConfigsEntity mailConfigsEntity) {
-        int timing = NOTIFY_STATUS_BEFORE_DATE;
-        if (event.getNotifyStatus() >= timing) {
-            // 既に通知済
-            return;
-        }
-        // 今日？
-        TimeZone timezone = TimeZone.getTimeZone(event.getTimeZone());
-        Calendar today = Calendar.getInstance(timezone);
-        today.setTimeInMillis(now.getTimeInMillis());
-        
-        Calendar eventDay = Calendar.getInstance(timezone);
-        eventDay.setTimeInMillis(event.getStartDateTime().getTime());
-        if (today.get(Calendar.YEAR) != eventDay.get(Calendar.YEAR) ||
-                today.get(Calendar.MONTH) != eventDay.get(Calendar.MONTH) ||
-                today.get(Calendar.DATE) != eventDay.get(Calendar.DATE)) {
-            // イベント当日以外は通知しない
-            return;
-        }
-        LOG.info("イベントのメール通知 [ID] " + knowledge.getKnowledgeId() + " [Timing] 本日開催");
-        sendNotify(event, knowledge, values, timing);
-    }
-
-    private void notifyWeek(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values,
-            Calendar now, MailConfigsEntity mailConfigsEntity) {
-        int timing = NOTIFY_STATUS_BEFORE_WEEK;
-        if (event.getNotifyStatus() >= timing) {
-            // 既に通知済
-            return;
-        }
-        //日曜日？（イベントのタイムゾーンで）
-        TimeZone timezone = TimeZone.getTimeZone(event.getTimeZone());
-        Calendar today = Calendar.getInstance(timezone);
-        today.setTimeInMillis(now.getTimeInMillis());
-        if (today.get(Calendar.DAY_OF_WEEK) != Calendar.SUNDAY) {
-            // 日曜日でない場合は通知しない
-            return;
-        }
-        LOG.info("イベントのメール通知 [ID] " + knowledge.getKnowledgeId() + " [Timing] 今週開催");
-        sendNotify(event, knowledge, values, timing);
-    }
-
-
-    private void sendNotify(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values, int timing) {
-        List<Integer> userIds = new ArrayList<>();
-        // 参加者に通知
-        List<ParticipantsEntity> participants = ParticipantsDao.get().selectOnKnowledgeId(event.getKnowledgeId());
-        for (ParticipantsEntity participant : participants) {
-            if (!userIds.contains(participant.getUserId())) {
-                UsersEntity user = UsersDao.get().selectOnKey(participant.getUserId());
-                if (user != null) {
-                    this.sendNotifyEvent(event, knowledge, values, user, participant.getStatus(), timing);
-                    userIds.add(participant.getUserId());
-                }
-            }
-        }
-        // ストックに入れているユーザに通知
-        List<StockKnowledgesEntity> stocks = StockKnowledgesDao.get().selectOnKnowledgeId(event.getKnowledgeId());
-        for (StockKnowledgesEntity stockKnowledgesEntity : stocks) {
-            if (!userIds.contains(stockKnowledgesEntity.getInsertUser())) {
-                UsersEntity user = UsersDao.get().selectOnKey(stockKnowledgesEntity.getInsertUser());
-                if (user != null) {
-                    this.sendNotifyEvent(event, knowledge, values, user, STATUS_STOCKED, timing);
-                    userIds.add(stockKnowledgesEntity.getInsertUser());
-                }
-            }
-        }
-        event.setNotifyStatus(timing);
-        EventsDao.get().save(event);
-    }
-
-
-    private void sendNotifyEvent(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values, 
-            UsersEntity user, int status, int timing) {
-        if (!StringUtils.isEmailAddress(user.getMailAddress())) {
-            // 送信先のメールアドレスが不正なので、送信処理は終了
-            LOG.warn("mail targget [" + user.getMailAddress() + "] is wrong.");
-            return;
-        }
-        MailLocaleTemplatesEntity template = load(user.getLocale(), MailLogic.NOTIFY_EVENT);
-        
-        String date = "";
-        String start = "";
-        String end = "";
-        String place = "";
-        for (KnowledgeItemValuesEntity item : values) {
-            if (item.getItemNo() == EventsLogic.ITEM_NO_DATE) {
-                date = item.getItemValue();
-            } else if (item.getItemNo() == EventsLogic.ITEM_NO_START) {
-                start = item.getItemValue();
-            } else if (item.getItemNo() == EventsLogic.ITEM_NO_END) {
-                end = item.getItemValue();
-            } else if (item.getItemNo() == EventsLogic.ITEM_NO_PLACE) {
-                place = item.getItemValue();
-            }
-        }
-        Resources resources = Resources.getInstance(user.getLocale());
-        String statusLabel = "";
-        if (status == EventsLogic.STATUS_PARTICIPATION) {
-            statusLabel = resources.getResource("knowledge.event.label.status.participation");
-        } else if (status == EventsLogic.STATUS_WAIT_CANSEL) {
-            statusLabel = resources.getResource("knowledge.event.label.status.wait.cansel");
-        } else if (status == STATUS_STOCKED) {
-            statusLabel = resources.getResource("knowledge.event.label.status.stocked");
-        }
-        String timingLabel = "";
-        if (timing ==  NOTIFY_STATUS_BEFORE_WEEK) {
-            timingLabel = resources.getResource("knowledge.event.label.timing.week");
-        } else if (timing == NOTIFY_STATUS_BEFORE_DATE) {
-            timingLabel = resources.getResource("knowledge.event.label.timing.tody");
-        } else if (timing == NOTIFY_STATUS_BEFORE_MIN) {
-            timingLabel = resources.getResource("knowledge.event.label.timing.soon");
+            
+            EventNotificationByMinute.get().notify(event, knowledge, values, now);
+            EventNotificationByDate.get().notify(event, knowledge, values, now);
+            EventNotificationByWeek.get().notify(event, knowledge, values, now);
         }
-        
-        MailsEntity mailsEntity = new MailsEntity();
-        String mailId = idGenu("Notify");
-        mailsEntity.setMailId(mailId);
-        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
-        mailsEntity.setToAddress(user.getMailAddress());
-        mailsEntity.setToName(user.getUserName());
-        
-        String title = template.getTitle();
-        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
-        title = title.replace("{Date}", date);
-        title = title.replace("{Start}", start);
-        title = title.replace("{End}", end);
-        title = title.replace("{Place}", place);
-        mailsEntity.setTitle(title);
-        
-        String contents = template.getContent();
-        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        contents = contents.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
-        contents = contents.replace("{Date}", date);
-        contents = contents.replace("{Start}", start);
-        contents = contents.replace("{End}", end);
-        contents = contents.replace("{Place}", place);
-        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
-        contents = contents.replace("{Status}", statusLabel);
-        contents = contents.replace("{Timing}", timingLabel);
-        contents = contents.replace("{UserName}", user.getUserName());
-        mailsEntity.setContent(contents);
-        MailsDao.get().insert(mailsEntity);
     }
-    
-
-
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
index fb606368d..4eec79dd6 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -1,9 +1,11 @@
 package org.support.project.knowledge.logic;
 
+import java.util.Iterator;
 import java.util.List;
 
 import org.support.project.di.Container;
 import org.support.project.knowledge.logic.notification.CommentInsertNotification;
+import org.support.project.knowledge.logic.notification.EventNotificationByWeek;
 import org.support.project.knowledge.logic.notification.KnowledgeUpdateNotification;
 import org.support.project.knowledge.logic.notification.LikeInsertNotification;
 import org.support.project.knowledge.logic.notification.Notification;
@@ -42,6 +44,8 @@ public Notification getNotification(String category) {
             return CommentInsertNotification.get();
         } else if (MailLogic.NOTIFY_INSERT_LIKE_MYITEM.equals(category)) {
             return LikeInsertNotification.get();
+        } else if (MailLogic.NOTIFY_EVENT.equals(category)) {
+            return EventNotificationByWeek.get();
         }
         return null;
     }
@@ -49,9 +53,14 @@ public Notification getNotification(String category) {
     
     public List<NotificationsEntity> getNotification(LoginedUser loginedUser, int offset) {
         List<NotificationsEntity> notifications = super.getNotification(loginedUser.getUserId(), offset);
-        for (NotificationsEntity notificationsEntity : notifications) {
+        for (Iterator<NotificationsEntity> iterator = notifications.iterator(); iterator.hasNext();) {
+            NotificationsEntity notificationsEntity = (NotificationsEntity) iterator.next();
             Notification notification = getNotification(notificationsEntity.getTitle());
-            notification.convNotification(notificationsEntity, loginedUser, Notification.TARGET.list);
+            if (notification == null) {
+                iterator.remove();
+            } else {
+                notification.convNotification(notificationsEntity, loginedUser, Notification.TARGET.list);
+            }
         }
         return notifications;
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/AbstractEventNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/AbstractEventNotification.java
new file mode 100644
index 000000000..4bc0f435b
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/AbstractEventNotification.java
@@ -0,0 +1,265 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.support.project.common.config.Resources;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.knowledge.dao.EventsDao;
+import org.support.project.knowledge.dao.KnowledgeItemValuesDao;
+import org.support.project.knowledge.dao.ParticipantsDao;
+import org.support.project.knowledge.dao.StockKnowledgesDao;
+import org.support.project.knowledge.entity.EventsEntity;
+import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.entity.ParticipantsEntity;
+import org.support.project.knowledge.entity.StockKnowledgesEntity;
+import org.support.project.knowledge.logic.EventsLogic;
+import org.support.project.knowledge.logic.MailEventLogic;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.knowledge.logic.NotifyLogic;
+import org.support.project.knowledge.vo.notification.EventInformation;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+import net.arnx.jsonic.JSON;
+
+public abstract class AbstractEventNotification extends AbstractNotification implements EventNotification {
+    public static final String TEMPLATE_EVENT_SOON = "knowledge.event.label.timing.soon";
+    public static final String TEMPLATE_EVENT_TODAY = "knowledge.event.label.timing.tody";
+    public static final String TEMPLATE_EVENT_WEEK = "knowledge.event.label.timing.week";
+
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(AbstractEventNotification.class);
+    
+    protected static final int NOTIFY_STATUS_NOT_SEND = MailEventLogic.NOTIFY_STATUS_NOT_SEND;
+    /** 今週のイベント通知(日曜に通知) */
+    protected static final int NOTIFY_STATUS_BEFORE_WEEK = MailEventLogic.NOTIFY_STATUS_BEFORE_WEEK;
+    /** 本日のイベント通知 */
+    protected static final int NOTIFY_STATUS_BEFORE_DATE = MailEventLogic.NOTIFY_STATUS_BEFORE_DATE;
+    /** 30分前のイベント通知 */
+    protected static final int NOTIFY_STATUS_BEFORE_MIN = MailEventLogic.NOTIFY_STATUS_BEFORE_MIN;
+    /** ステータス：ストック中 */
+    protected static final int STATUS_STOCKED = MailEventLogic.STATUS_STOCKED;
+    
+    protected void sendNotify(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values, int timing) {
+        // 画面での通知の情報を登録
+        NotificationsEntity notification = insertNotification(event, knowledge, values, timing);
+        
+        List<Integer> userIds = new ArrayList<>();
+        // 参加者に通知
+        List<ParticipantsEntity> participants = ParticipantsDao.get().selectOnKnowledgeId(event.getKnowledgeId());
+        for (ParticipantsEntity participant : participants) {
+            if (!userIds.contains(participant.getUserId())) {
+                UsersEntity user = UsersDao.get().selectOnKey(participant.getUserId());
+                if (user != null) {
+                    // 通知とユーザの紐付け
+                    NotificationLogic.get().insertUserNotification(notification, user);
+
+                    this.sendNotifyEvent(event, knowledge, values, user, participant.getStatus(), timing);
+                    userIds.add(participant.getUserId());
+                }
+            }
+        }
+        // ストックに入れているユーザに通知
+        List<StockKnowledgesEntity> stocks = StockKnowledgesDao.get().selectOnKnowledgeId(event.getKnowledgeId());
+        for (StockKnowledgesEntity stockKnowledgesEntity : stocks) {
+            if (!userIds.contains(stockKnowledgesEntity.getInsertUser())) {
+                UsersEntity user = UsersDao.get().selectOnKey(stockKnowledgesEntity.getInsertUser());
+                if (user != null) {
+                    // 通知とユーザの紐付け
+                    NotificationLogic.get().insertUserNotification(notification, user);
+                    
+                    this.sendNotifyEvent(event, knowledge, values, user, STATUS_STOCKED, timing);
+                    userIds.add(stockKnowledgesEntity.getInsertUser());
+                }
+            }
+        }
+        event.setNotifyStatus(timing);
+        EventsDao.get().save(event);
+    }
+
+
+    private NotificationsEntity insertNotification(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values,
+            int timing) {
+        // 通知情報を作成
+        NotificationsEntity notification = new NotificationsEntity();
+        // フォーマットのテンプレート
+        notification.setTitle(MailLogic.NOTIFY_EVENT);
+        EventInformation info = new EventInformation();
+        info.setKnowledgeId(knowledge.getKnowledgeId());
+        info.setKnowledgeTitle(knowledge.getTitle());
+        info.setUpdateUser(knowledge.getUpdateUserName());
+        info.setTiming(timing);
+        notification.setContent(JSON.encode(info));
+        notification = NotificationsDao.get().insert(notification);
+        return notification;
+    }
+
+
+    private void sendNotifyEvent(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values, 
+            UsersEntity user, int status, int timing) {
+        if (!StringUtils.isEmailAddress(user.getMailAddress())) {
+            // 送信先のメールアドレスが不正なので、送信処理は終了
+            LOG.warn("mail targget [" + user.getMailAddress() + "] is wrong.");
+            return;
+        }
+        MailLocaleTemplatesEntity template = MailLogic.get().load(user.getLocale(), MailLogic.NOTIFY_EVENT);
+        
+        String date = "";
+        String start = "";
+        String end = "";
+        String place = "";
+        for (KnowledgeItemValuesEntity item : values) {
+            if (item.getItemNo() == EventsLogic.ITEM_NO_DATE) {
+                date = item.getItemValue();
+            } else if (item.getItemNo() == EventsLogic.ITEM_NO_START) {
+                start = item.getItemValue();
+            } else if (item.getItemNo() == EventsLogic.ITEM_NO_END) {
+                end = item.getItemValue();
+            } else if (item.getItemNo() == EventsLogic.ITEM_NO_PLACE) {
+                place = item.getItemValue();
+            }
+        }
+        Resources resources = Resources.getInstance(user.getLocale());
+        String statusLabel = "";
+        if (status == EventsLogic.STATUS_PARTICIPATION) {
+            statusLabel = resources.getResource("knowledge.event.label.status.participation");
+        } else if (status == EventsLogic.STATUS_WAIT_CANSEL) {
+            statusLabel = resources.getResource("knowledge.event.label.status.wait.cansel");
+        } else if (status == STATUS_STOCKED) {
+            statusLabel = resources.getResource("knowledge.event.label.status.stocked");
+        }
+        String timingLabel = "";
+        if (timing ==  NOTIFY_STATUS_BEFORE_WEEK) {
+            timingLabel = resources.getResource(TEMPLATE_EVENT_WEEK);
+        } else if (timing == NOTIFY_STATUS_BEFORE_DATE) {
+            timingLabel = resources.getResource(TEMPLATE_EVENT_TODAY);
+        } else if (timing == NOTIFY_STATUS_BEFORE_MIN) {
+            timingLabel = resources.getResource(TEMPLATE_EVENT_SOON);
+        }
+        
+        MailsEntity mailsEntity = new MailsEntity();
+        String mailId = idGen("Notify");
+        mailsEntity.setMailId(mailId);
+        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
+        mailsEntity.setToAddress(user.getMailAddress());
+        mailsEntity.setToName(user.getUserName());
+        
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
+        title = title.replace("{Date}", date);
+        title = title.replace("{Start}", start);
+        title = title.replace("{End}", end);
+        title = title.replace("{Place}", place);
+        mailsEntity.setTitle(title);
+        
+        String contents = template.getContent();
+        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        contents = contents.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
+        contents = contents.replace("{Date}", date);
+        contents = contents.replace("{Start}", start);
+        contents = contents.replace("{End}", end);
+        contents = contents.replace("{Place}", place);
+        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
+        contents = contents.replace("{Status}", statusLabel);
+        contents = contents.replace("{Timing}", timingLabel);
+        contents = contents.replace("{UserName}", user.getUserName());
+        mailsEntity.setContent(contents);
+        MailsDao.get().insert(mailsEntity);
+    }
+    
+    
+    
+    @Override
+    public void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target) {
+        String category = notificationsEntity.getTitle();
+        EventInformation knowledge = JSON.decode(notificationsEntity.getContent(), EventInformation.class);
+        MailLocaleTemplatesEntity template = MailLogic.get().load(loginedUser.getLocale(), category);
+        
+        List<KnowledgeItemValuesEntity> values = KnowledgeItemValuesDao.get().selectOnKnowledgeId(knowledge.getKnowledgeId());
+        String date = "";
+        String start = "";
+        String end = "";
+        String place = "";
+        for (KnowledgeItemValuesEntity item : values) {
+            if (item.getItemNo() == EventsLogic.ITEM_NO_DATE) {
+                date = item.getItemValue();
+            } else if (item.getItemNo() == EventsLogic.ITEM_NO_START) {
+                start = item.getItemValue();
+            } else if (item.getItemNo() == EventsLogic.ITEM_NO_END) {
+                end = item.getItemValue();
+            } else if (item.getItemNo() == EventsLogic.ITEM_NO_PLACE) {
+                place = item.getItemValue();
+            }
+        }
+
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", String.valueOf(knowledge.getKnowledgeId()));
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getKnowledgeTitle(), 80));
+        title = title.replace("{Date}", date);
+        title = title.replace("{Start}", start);
+        title = title.replace("{End}", end);
+        title = title.replace("{Place}", place);
+        notificationsEntity.setTitle(title);
+        
+        if (target == TARGET.detail) {
+            EventsEntity event = EventsDao.get().selectOnKey(knowledge.getKnowledgeId());
+            if (event == null) {
+                return;
+            }
+            int status = -1;
+            ParticipantsEntity participant = ParticipantsDao.get().selectOnKey(knowledge.getKnowledgeId(), loginedUser.getUserId());
+            if (participant != null) {
+                status = participant.getStatus();
+            } else {
+                // 予約が入っていないということは、ストックしたもの
+                status = STATUS_STOCKED;
+            }
+            
+            Resources resources = Resources.getInstance(loginedUser.getLocale());
+            String statusLabel = "";
+            if (status == EventsLogic.STATUS_PARTICIPATION) {
+                statusLabel = resources.getResource("knowledge.event.label.status.participation");
+            } else if (status == EventsLogic.STATUS_WAIT_CANSEL) {
+                statusLabel = resources.getResource("knowledge.event.label.status.wait.cansel");
+            } else if (status == STATUS_STOCKED) {
+                statusLabel = resources.getResource("knowledge.event.label.status.stocked");
+            }
+            
+            String timingLabel = "";
+            int timing = knowledge.getTiming();
+            if (timing ==  NOTIFY_STATUS_BEFORE_WEEK) {
+                timingLabel = resources.getResource(TEMPLATE_EVENT_WEEK);
+            } else if (timing == NOTIFY_STATUS_BEFORE_DATE) {
+                timingLabel = resources.getResource(TEMPLATE_EVENT_TODAY);
+            } else if (timing == NOTIFY_STATUS_BEFORE_MIN) {
+                timingLabel = resources.getResource(TEMPLATE_EVENT_SOON);
+            }
+
+            
+            String contents = template.getContent();
+            contents = contents.replace("{KnowledgeId}", String.valueOf(knowledge.getKnowledgeId()));
+            contents = contents.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getKnowledgeTitle(), 80));
+            contents = contents.replace("{Date}", date);
+            contents = contents.replace("{Start}", start);
+            contents = contents.replace("{End}", end);
+            contents = contents.replace("{Place}", place);
+            contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
+            contents = contents.replace("{Status}", statusLabel);
+            contents = contents.replace("{Timing}", timingLabel);
+            contents = contents.replace("{UserName}", loginedUser.getLoginUser().getUserName());
+            notificationsEntity.setContent(contents);
+        }
+    }
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java
index 2ddd9f2d8..34065bb75 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java
@@ -5,12 +5,12 @@
 import java.util.Date;
 import java.util.UUID;
 
-public abstract class AbstractNotification implements Notification {
-    
+public abstract class AbstractNotification {
     /** date format */
     private static DateFormat getDayFormat() {
         return new SimpleDateFormat("yyyyMMddHHmmss");
     }
+
     /**
      * メール送信のIDを生成
      * @param string
@@ -25,7 +25,5 @@ protected String idGen(String label) {
         builder.append(UUID.randomUUID().toString());
         return builder.toString();
     }
-    
-
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/AbstractQueueNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/AbstractQueueNotification.java
new file mode 100644
index 000000000..8968ed849
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/AbstractQueueNotification.java
@@ -0,0 +1,6 @@
+package org.support.project.knowledge.logic.notification;
+
+public abstract class AbstractQueueNotification extends AbstractNotification implements QueueNotification {
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
index 01df3cff9..91eaebf00 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
@@ -49,7 +49,7 @@
  * @author koda
  */
 @DI(instance = Instance.Singleton)
-public class CommentInsertNotification extends AbstractNotification {
+public class CommentInsertNotification extends AbstractQueueNotification {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(CommentInsertNotification.class);
     /** インスタンス取得 */
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/EventNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/EventNotification.java
new file mode 100644
index 000000000..99dc0f8e4
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/EventNotification.java
@@ -0,0 +1,22 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.Calendar;
+import java.util.List;
+
+import org.support.project.knowledge.entity.EventsEntity;
+import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+
+public interface EventNotification extends Notification {
+    
+    /**
+     * イベントの開催通知
+     * @param event
+     * @param knowledge
+     * @param values
+     * @param now
+     */
+    void notify(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values,
+            Calendar now);
+    
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByDate.java b/src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByDate.java
new file mode 100644
index 000000000..5d4dc2c90
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByDate.java
@@ -0,0 +1,50 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.Calendar;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.entity.EventsEntity;
+import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+
+@DI(instance = Instance.Singleton)
+public class EventNotificationByDate extends AbstractEventNotification {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(EventNotificationByDate.class);
+    /** インスタンス取得 */
+    public static EventNotificationByDate get() {
+        return Container.getComp(EventNotificationByDate.class);
+    }
+
+    @Override
+    public void notify(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values, Calendar now) {
+        int timing = NOTIFY_STATUS_BEFORE_DATE;
+        if (event.getNotifyStatus() >= timing) {
+            // 既に通知済
+            return;
+        }
+        // 今日？
+        TimeZone timezone = TimeZone.getTimeZone(event.getTimeZone());
+        Calendar today = Calendar.getInstance(timezone);
+        today.setTimeInMillis(now.getTimeInMillis());
+        
+        Calendar eventDay = Calendar.getInstance(timezone);
+        eventDay.setTimeInMillis(event.getStartDateTime().getTime());
+        if (today.get(Calendar.YEAR) != eventDay.get(Calendar.YEAR) ||
+                today.get(Calendar.MONTH) != eventDay.get(Calendar.MONTH) ||
+                today.get(Calendar.DATE) != eventDay.get(Calendar.DATE)) {
+            // イベント当日以外は通知しない
+            return;
+        }
+        LOG.info("イベントのメール通知 [ID] " + knowledge.getKnowledgeId() + " [Timing] 本日開催");
+        sendNotify(event, knowledge, values, timing);
+    }
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByMinute.java b/src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByMinute.java
new file mode 100644
index 000000000..b83d16f32
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByMinute.java
@@ -0,0 +1,45 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.Calendar;
+import java.util.List;
+
+import org.support.project.aop.Aspect;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.entity.EventsEntity;
+import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+
+@DI(instance = Instance.Singleton)
+public class EventNotificationByMinute extends AbstractEventNotification {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(EventNotificationByMinute.class);
+    /** インスタンス取得 */
+    public static EventNotificationByMinute get() {
+        return Container.getComp(EventNotificationByMinute.class);
+    }
+    
+    @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void notify(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values, Calendar now) {
+        int timing = NOTIFY_STATUS_BEFORE_MIN;
+        if (event.getNotifyStatus() >= timing) {
+            // 既に通知済
+            return;
+        }
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("開始までの時間: " + (event.getStartDateTime().getTime() - now.getTimeInMillis()));
+        }
+        // 30分を切った？
+        if (event.getStartDateTime().getTime() <= now.getTimeInMillis() ||
+                event.getStartDateTime().getTime() - now.getTimeInMillis() > (1000 * 60 * 30)) {
+            return;
+        }
+        LOG.info("イベントのメール通知 [ID] " + knowledge.getKnowledgeId() + " [Timing] 30分前");
+        sendNotify(event, knowledge, values, timing);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByWeek.java b/src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByWeek.java
new file mode 100644
index 000000000..38e1104ff
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/EventNotificationByWeek.java
@@ -0,0 +1,43 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.Calendar;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.entity.EventsEntity;
+import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+
+@DI(instance = Instance.Singleton)
+public class EventNotificationByWeek extends AbstractEventNotification {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(EventNotificationByWeek.class);
+    /** インスタンス取得 */
+    public static EventNotificationByWeek get() {
+        return Container.getComp(EventNotificationByWeek.class);
+    }
+    @Override
+    public void notify(EventsEntity event, KnowledgesEntity knowledge, List<KnowledgeItemValuesEntity> values, Calendar now) {
+        int timing = NOTIFY_STATUS_BEFORE_WEEK;
+        if (event.getNotifyStatus() >= timing) {
+            // 既に通知済
+            return;
+        }
+        //日曜日？（イベントのタイムゾーンで）
+        TimeZone timezone = TimeZone.getTimeZone(event.getTimeZone());
+        Calendar today = Calendar.getInstance(timezone);
+        today.setTimeInMillis(now.getTimeInMillis());
+        if (today.get(Calendar.DAY_OF_WEEK) != Calendar.SUNDAY) {
+            // 日曜日でない場合は通知しない
+            return;
+        }
+        LOG.info("イベントのメール通知 [ID] " + knowledge.getKnowledgeId() + " [Timing] 今週開催");
+        sendNotify(event, knowledge, values, timing);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
index dbbc53579..76d0cff15 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
@@ -57,7 +57,7 @@
  * @author koda
  */
 @DI(instance = Instance.Singleton)
-public class KnowledgeUpdateNotification extends AbstractNotification {
+public class KnowledgeUpdateNotification extends AbstractQueueNotification {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(KnowledgeUpdateNotification.class);
     /** インスタンス取得 */
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
index e2870c0e9..4887a7fca 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
@@ -43,7 +43,7 @@
  * @author koda
  */
 @DI(instance = Instance.Singleton)
-public class LikeInsertNotification extends AbstractNotification {
+public class LikeInsertNotification extends AbstractQueueNotification {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(LikeInsertNotification.class);
     /** インスタンス取得 */
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/Notification.java b/src/main/java/org/support/project/knowledge/logic/notification/Notification.java
index 3ea13d714..2c1990ad8 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/Notification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/Notification.java
@@ -1,6 +1,5 @@
 package org.support.project.knowledge.logic.notification;
 
-import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.entity.NotificationsEntity;
 
@@ -9,13 +8,6 @@ enum TARGET {
         list, detail
     }
     
-    /**
-     * 通知キューに入っている、通知を処理する
-     * @param notifyQueue
-     */
-    void notify(NotifyQueuesEntity notifyQueue) throws Exception;
-    
-    
     /**
      * 画面での通知情報を、表示する形式に変換する
      * @param notificationsEntity
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
new file mode 100644
index 000000000..d7b13e945
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
@@ -0,0 +1,15 @@
+package org.support.project.knowledge.logic.notification;
+
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+
+public interface QueueNotification extends Notification {
+
+    /**
+     * 通知キューに入っている、通知を処理する
+     * @param notifyQueue
+     */
+    void notify(NotifyQueuesEntity notifyQueue) throws Exception;
+    
+    
+
+}
diff --git a/src/main/java/org/support/project/knowledge/vo/notification/EventInformation.java b/src/main/java/org/support/project/knowledge/vo/notification/EventInformation.java
new file mode 100644
index 000000000..ccc97be6b
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/vo/notification/EventInformation.java
@@ -0,0 +1,21 @@
+package org.support.project.knowledge.vo.notification;
+
+public class EventInformation extends KnowledgeUpdate {
+
+    private int timing;
+
+    /**
+     * @return the timing
+     */
+    public int getTiming() {
+        return timing;
+    }
+
+    /**
+     * @param timing the timing to set
+     */
+    public void setTiming(int timing) {
+        this.timing = timing;
+    }
+    
+}

From 09053304c61b9b0869815421a4f3e1cf09e322a4 Mon Sep 17 00:00:00 2001
From: Monota <monota.oss@gmail.com>
Date: Sun, 6 Aug 2017 17:59:50 +0900
Subject: [PATCH 012/138] fix drop target of images.

---
 src/main/webapp/js/common.js                    | 7 +++++++
 src/main/webapp/js/knowledge-attachfile.js      | 1 +
 src/main/webapp/js/knowledge-view-attachfile.js | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/js/common.js b/src/main/webapp/js/common.js
index cea88b6a5..971dbbf55 100644
--- a/src/main/webapp/js/common.js
+++ b/src/main/webapp/js/common.js
@@ -61,6 +61,13 @@ $(document).ready(function() {
     };
     accessInterval();
 });
+
+// ファイルをドロップしたときのブラウザデフォルトの動作を抑止する。
+$(document).on('drop dragover', function (e) {
+    e.stopPropagation();
+    e.preventDefault();
+});
+
 function logging(str, level) {
 //    console.log(str);
     if (_LOGGING_NOTIFY_DESKTOP) {
diff --git a/src/main/webapp/js/knowledge-attachfile.js b/src/main/webapp/js/knowledge-attachfile.js
index 9e9cd2080..8ece86311 100644
--- a/src/main/webapp/js/knowledge-attachfile.js
+++ b/src/main/webapp/js/knowledge-attachfile.js
@@ -5,6 +5,7 @@ $(document).ready(function() {
         dataType : 'json',
         autoUpload: true,
         maxFileSize: 5000000, // 5 MB
+        dropZone: '#drop_target',
     }).on('fileuploaddone', function (e, data) {
         //$('#files').show();
         uploadedFiles(data.result.files);
diff --git a/src/main/webapp/js/knowledge-view-attachfile.js b/src/main/webapp/js/knowledge-view-attachfile.js
index 69064e221..494de4a02 100644
--- a/src/main/webapp/js/knowledge-view-attachfile.js
+++ b/src/main/webapp/js/knowledge-view-attachfile.js
@@ -5,6 +5,7 @@ $(document).ready(function() {
         dataType : 'json',
         autoUpload: true,
         maxFileSize: 5000000, // 5 MB
+        dropZone: '#drop_target',
     }).on('fileuploaddone', function (e, data) {
         uploadedFiles(data.result.files);
         setTimeout(function() {
@@ -48,7 +49,6 @@ $(document).ready(function() {
     
 });
 
-
 var uploadedFiles = function(files) {
     console.log(files);
     $.each(files, function(index, file) {

From 1eb876625fda3d59068a3a36624a353a163ebf9b Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 8 Aug 2017 20:01:15 +0900
Subject: [PATCH 013/138] #349 Add notification feature for event information

---
 .../project/knowledge/logic/EventsLogic.java  |   7 +-
 .../project/knowledge/logic/MailLogic.java    | 121 ------------------
 .../knowledge/logic/NotificationLogic.java    |   6 +
 .../AbstractParticipateNotification.java      |  99 ++++++++++++++
 ...ParticipateForParticipantNotification.java |  96 ++++++++++++++
 .../ParticipateForSponsorNotification.java    | 100 +++++++++++++++
 .../notification/ParticipateNotification.java |  12 ++
 .../vo/notification/Participate.java          |  32 +++++
 8 files changed, 349 insertions(+), 124 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/AbstractParticipateNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/ParticipateForParticipantNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/ParticipateForSponsorNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/ParticipateNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/vo/notification/Participate.java

diff --git a/src/main/java/org/support/project/knowledge/logic/EventsLogic.java b/src/main/java/org/support/project/knowledge/logic/EventsLogic.java
index b1880df1d..b1c16d1c5 100644
--- a/src/main/java/org/support/project/knowledge/logic/EventsLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/EventsLogic.java
@@ -22,6 +22,8 @@
 import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.ParticipantsEntity;
+import org.support.project.knowledge.logic.notification.ParticipateForParticipantNotification;
+import org.support.project.knowledge.logic.notification.ParticipateForSponsorNotification;
 import org.support.project.knowledge.vo.Participation;
 import org.support.project.knowledge.vo.Participations;
 import org.support.project.web.bean.LoginedUser;
@@ -154,10 +156,9 @@ public Boolean participation(Long knowledgeId, Integer userId) {
         ParticipantsDao.get().insert(participant);
         
         // 開催者（＝登録者）へメール通知
-        MailLogic.get().notifyAddParticipateForSponsor(knowledgeId, userId, participant.getStatus());
-        
+        ParticipateForSponsorNotification.get().notify(knowledgeId, userId, participant.getStatus());
         // 参加者へメール通知
-        MailLogic.get().notifyAddParticipateForParticipant(knowledgeId, userId, participant.getStatus());
+        ParticipateForParticipantNotification.get().notify(knowledgeId, userId, participant.getStatus());
         
         return participant.getStatus().intValue() == STATUS_PARTICIPATION;
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/MailLogic.java b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
index 6fa1cf64c..a3f082591 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
@@ -756,127 +756,6 @@ public void initialize(String templateId) {
         MailLocaleTemplatesDao.get().save(ja);
     }
     
-    /**
-     * 参加登録があったことを、開催者へ通知
-     * @param knowledgeId
-     * @param userId
-     * @param status
-     */
-    public void notifyAddParticipateForSponsor(Long knowledgeId, Integer userId, Integer status) {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            LOG.info("mail config is not exists.");
-            return;
-        }
-        KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(knowledgeId);
-        if (knowledge == null) {
-            LOG.info("knowledge [" + knowledgeId + "] is not exists.");
-            return;
-        }
-        // 開催者
-        UsersEntity sponsor = UsersDao.get().selectOnKey(knowledge.getInsertUser());
-        // 参加者
-        UsersEntity participant = UsersDao.get().selectOnKey(userId);
-        if (sponsor == null || participant == null) {
-            LOG.warn("sponsor or participant is not exist.");
-            return;
-        }
-        if (!StringUtils.isEmailAddress(sponsor.getMailAddress())) {
-            // 送信先のメールアドレスが不正なので、送信処理は終了
-            LOG.warn("mail targget [" + sponsor.getMailAddress() + "] is wrong.");
-            return;
-        }
-
-        MailsEntity mailsEntity = new MailsEntity();
-        String mailId = idGenu("Notify");
-        mailsEntity.setMailId(mailId);
-        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
-        mailsEntity.setToAddress(sponsor.getMailAddress());
-        mailsEntity.setToName(sponsor.getUserName());
-        
-        MailLocaleTemplatesEntity template = load(sponsor.getLocale(), NOTIFY_ADD_PARTICIPATE);
-        String title = template.getTitle();
-        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
-        mailsEntity.setTitle(title);
-        String contents = template.getContent();
-        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
-        StringBuilder builder = new StringBuilder();
-        Resources resources = Resources.getInstance(sponsor.getLocale());
-        builder.append(participant.getUserName());
-        if (status == EventsLogic.STATUS_PARTICIPATION) {
-            builder.append("[").append(resources.getResource("knowledge.view.label.status.participation")).append("]");
-        } else {
-            builder.append("[").append(resources.getResource("knowledge.view.label.status.wait.cansel")).append("]");
-        }
-        contents = contents.replace("{Participant}", builder.toString());
-        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
-
-        mailsEntity.setContent(contents);
-        MailsDao.get().insert(mailsEntity);
-    }
-    /**
-     * 参加登録したことを、参加者へ通知
-     * @param knowledgeId
-     * @param userId
-     * @param status
-     */
-    public void notifyAddParticipateForParticipant(Long knowledgeId, Integer userId, Integer status) {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            LOG.info("mail config is not exists.");
-            return;
-        }
-        KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(knowledgeId);
-        if (knowledge == null) {
-            LOG.info("knowledge [" + knowledgeId + "] is not exists.");
-            return;
-        }
-        // 参加者
-        UsersEntity participant = UsersDao.get().selectOnKey(userId);
-        if (participant == null) {
-            LOG.warn("sponsor or participant is not exist.");
-            return;
-        }
-        if (!StringUtils.isEmailAddress(participant.getMailAddress())) {
-            // 送信先のメールアドレスが不正なので、送信処理は終了
-            LOG.warn("mail targget [" + participant.getMailAddress() + "] is wrong.");
-            return;
-        }
-
-        MailsEntity mailsEntity = new MailsEntity();
-        String mailId = idGenu("Notify");
-        mailsEntity.setMailId(mailId);
-        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
-        mailsEntity.setToAddress(participant.getMailAddress());
-        mailsEntity.setToName(participant.getUserName());
-        
-        MailLocaleTemplatesEntity template = load(participant.getLocale(), NOTIFY_REGISTRATION_EVENT);
-        String title = template.getTitle();
-        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
-        mailsEntity.setTitle(title);
-        String contents = template.getContent();
-        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
-        StringBuilder builder = new StringBuilder();
-        Resources resources = Resources.getInstance(participant.getLocale());
-        if (status == EventsLogic.STATUS_PARTICIPATION) {
-            builder.append(resources.getResource("knowledge.view.label.status.participation"));
-        } else {
-            builder.append(resources.getResource("knowledge.view.label.status.wait.cansel"));
-        }
-        contents = contents.replace("{Status}", builder.toString());
-        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
-
-        mailsEntity.setContent(contents);
-        MailsDao.get().insert(mailsEntity);
-    }
     /**
      * 参加キャンセルがあったことを、開催者へ通知
      * @param knowledgeId
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
index 4eec79dd6..357ff9540 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -10,6 +10,8 @@
 import org.support.project.knowledge.logic.notification.LikeInsertNotification;
 import org.support.project.knowledge.logic.notification.Notification;
 import org.support.project.knowledge.logic.notification.Notification.TARGET;
+import org.support.project.knowledge.logic.notification.ParticipateForParticipantNotification;
+import org.support.project.knowledge.logic.notification.ParticipateForSponsorNotification;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.dao.NotificationsDao;
 import org.support.project.web.dao.UserNotificationsDao;
@@ -46,6 +48,10 @@ public Notification getNotification(String category) {
             return LikeInsertNotification.get();
         } else if (MailLogic.NOTIFY_EVENT.equals(category)) {
             return EventNotificationByWeek.get();
+        } else if (MailLogic.NOTIFY_REGISTRATION_EVENT.equals(category)) {
+            return ParticipateForParticipantNotification.get();
+        } else if (MailLogic.NOTIFY_ADD_PARTICIPATE.equals(category)) {
+            return ParticipateForSponsorNotification.get();
         }
         return null;
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/AbstractParticipateNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/AbstractParticipateNotification.java
new file mode 100644
index 000000000..d6e372c38
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/AbstractParticipateNotification.java
@@ -0,0 +1,99 @@
+package org.support.project.knowledge.logic.notification;
+
+import org.support.project.common.config.Resources;
+import org.support.project.common.util.StringUtils;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.logic.EventsLogic;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.knowledge.logic.NotifyLogic;
+import org.support.project.knowledge.vo.notification.Participate;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.UserNotificationsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UserNotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+import net.arnx.jsonic.JSON;
+
+public abstract class AbstractParticipateNotification extends AbstractNotification implements ParticipateNotification {
+
+    
+    protected void insertNotification(KnowledgesEntity knowledge, Integer participant, Integer status, String template) {
+        NotificationsEntity notification = new NotificationsEntity();
+        notification.setTitle(template);
+        
+        Participate info = new Participate();
+        info.setKnowledgeId(knowledge.getKnowledgeId());
+        info.setKnowledgeTitle(knowledge.getTitle());
+        info.setUpdateUser(knowledge.getUpdateUserName());
+        
+        info.setParticipant(participant);
+        info.setStatus(status);
+        
+        notification.setContent(JSON.encode(info));
+        notification = NotificationsDao.get().insert(notification);
+        
+        if (template.equals(MailLogic.NOTIFY_ADD_PARTICIPATE)) {
+            // 参加登録があったことを、開催者へ通知
+            UserNotificationsEntity userNotification = new UserNotificationsEntity(notification.getNo(), knowledge.getInsertUser());
+            userNotification.setStatus(NotificationLogic.STATUS_UNREAD);
+            UserNotificationsDao.get().insert(userNotification);
+        } else {
+            // 参加登録したことを、参加者へ通知
+            UserNotificationsEntity userNotification = new UserNotificationsEntity(notification.getNo(), participant);
+            userNotification.setStatus(NotificationLogic.STATUS_UNREAD);
+            UserNotificationsDao.get().insert(userNotification);
+        }
+    }
+
+    
+    @Override
+    public void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target) {
+        Participate info = JSON.decode(notificationsEntity.getContent(), Participate.class);
+        String templateString = notificationsEntity.getTitle();
+        MailLocaleTemplatesEntity template = MailLogic.get().load(loginedUser.getLocale(), notificationsEntity.getTitle());
+        
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", String.valueOf(info.getKnowledgeId()));
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(info.getKnowledgeTitle(), 80));
+        notificationsEntity.setTitle(title);
+        
+        if (target == TARGET.detail) {
+            String contents = template.getContent();
+            contents = contents.replace("{KnowledgeId}", String.valueOf(info.getKnowledgeId()));
+            contents = contents.replace("{KnowledgeTitle}", info.getKnowledgeTitle());
+            contents = contents.replace("{URL}", NotifyLogic.get().makeURL(info.getKnowledgeId()));
+            UsersEntity participant = UsersDao.get().selectOnKey(info.getParticipant());
+            if (participant != null) {
+                Resources resources = Resources.getInstance(loginedUser.getLocale());
+                StringBuilder builder = new StringBuilder();
+                int status = info.getStatus();
+                if (MailLogic.NOTIFY_ADD_PARTICIPATE.equals(templateString)) {
+                    // 参加登録があったことを、開催者へ通知
+                    builder.append(participant.getUserName());
+                    if (status == EventsLogic.STATUS_PARTICIPATION) {
+                        builder.append("[").append(resources.getResource("knowledge.view.label.status.participation")).append("]");
+                    } else {
+                        builder.append("[").append(resources.getResource("knowledge.view.label.status.wait.cansel")).append("]");
+                    }
+                    contents = contents.replace("{Participant}", builder.toString());
+                } else {
+                    // 参加登録したことを、参加者へ通知
+                    if (status == EventsLogic.STATUS_PARTICIPATION) {
+                        builder.append(resources.getResource("knowledge.view.label.status.participation"));
+                    } else {
+                        builder.append(resources.getResource("knowledge.view.label.status.wait.cansel"));
+                    }
+                    contents = contents.replace("{Status}", builder.toString());
+                }
+            }
+            notificationsEntity.setContent(contents);
+        }
+    }
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/ParticipateForParticipantNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/ParticipateForParticipantNotification.java
new file mode 100644
index 000000000..95c1ebe1a
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/ParticipateForParticipantNotification.java
@@ -0,0 +1,96 @@
+package org.support.project.knowledge.logic.notification;
+
+import org.support.project.common.config.Resources;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.logic.EventsLogic;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotifyLogic;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+/**
+ * 参加登録したことを、参加者へ通知
+ * @author koda
+ */
+@DI(instance = Instance.Singleton)
+public class ParticipateForParticipantNotification extends AbstractParticipateNotification{
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(ParticipateForParticipantNotification.class);
+    /** インスタンス取得 */
+    public static ParticipateForParticipantNotification get() {
+        return Container.getComp(ParticipateForParticipantNotification.class);
+    }
+
+    @Override
+    public void notify(Long knowledgeId, Integer userId, Integer status) {
+        KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(knowledgeId);
+        if (knowledge == null) {
+            LOG.info("knowledge [" + knowledgeId + "] is not exists.");
+            return;
+        }
+        // 参加者
+        UsersEntity participant = UsersDao.get().selectOnKey(userId);
+        if (participant == null) {
+            LOG.warn("sponsor or participant is not exist.");
+            return;
+        }
+        
+        // 通知情報生成
+        insertNotification(knowledge, userId, status, MailLogic.NOTIFY_REGISTRATION_EVENT);
+        
+        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
+        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
+        if (mailConfigsEntity == null) {
+            // メールの設定が登録されていなければ、送信処理は終了
+            LOG.info("mail config is not exists.");
+            return;
+        }
+        if (!StringUtils.isEmailAddress(participant.getMailAddress())) {
+            // 送信先のメールアドレスが不正なので、送信処理は終了
+            LOG.warn("mail targget [" + participant.getMailAddress() + "] is wrong.");
+            return;
+        }
+
+        MailsEntity mailsEntity = new MailsEntity();
+        String mailId = idGen("Notify");
+        mailsEntity.setMailId(mailId);
+        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
+        mailsEntity.setToAddress(participant.getMailAddress());
+        mailsEntity.setToName(participant.getUserName());
+        
+        MailLocaleTemplatesEntity template = MailLogic.get().load(participant.getLocale(), MailLogic.NOTIFY_REGISTRATION_EVENT);
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
+        mailsEntity.setTitle(title);
+        String contents = template.getContent();
+        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
+        StringBuilder builder = new StringBuilder();
+        Resources resources = Resources.getInstance(participant.getLocale());
+        if (status == EventsLogic.STATUS_PARTICIPATION) {
+            builder.append(resources.getResource("knowledge.view.label.status.participation"));
+        } else {
+            builder.append(resources.getResource("knowledge.view.label.status.wait.cansel"));
+        }
+        contents = contents.replace("{Status}", builder.toString());
+        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
+
+        mailsEntity.setContent(contents);
+        MailsDao.get().insert(mailsEntity);
+    }
+    
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/ParticipateForSponsorNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/ParticipateForSponsorNotification.java
new file mode 100644
index 000000000..0a34951a6
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/ParticipateForSponsorNotification.java
@@ -0,0 +1,100 @@
+package org.support.project.knowledge.logic.notification;
+
+import org.support.project.common.config.Resources;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.logic.EventsLogic;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotifyLogic;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+/**
+ * 参加登録があったことを、開催者へ通知
+ * @author koda
+ */
+@DI(instance = Instance.Singleton)
+public class ParticipateForSponsorNotification extends AbstractParticipateNotification{
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(ParticipateForSponsorNotification.class);
+    /** インスタンス取得 */
+    public static ParticipateForSponsorNotification get() {
+        return Container.getComp(ParticipateForSponsorNotification.class);
+    }
+
+    @Override
+    public void notify(Long knowledgeId, Integer userId, Integer status) {
+        KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(knowledgeId);
+        if (knowledge == null) {
+            LOG.info("knowledge [" + knowledgeId + "] is not exists.");
+            return;
+        }
+        // 開催者
+        UsersEntity sponsor = UsersDao.get().selectOnKey(knowledge.getInsertUser());
+        // 参加者
+        UsersEntity participant = UsersDao.get().selectOnKey(userId);
+        if (sponsor == null || participant == null) {
+            LOG.warn("sponsor or participant is not exist.");
+            return;
+        }
+        
+        // 通知情報生成
+        insertNotification(knowledge, userId, status, MailLogic.NOTIFY_ADD_PARTICIPATE);
+        
+        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
+        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
+        if (mailConfigsEntity == null) {
+            // メールの設定が登録されていなければ、送信処理は終了
+            LOG.info("mail config is not exists.");
+            return;
+        }
+        if (!StringUtils.isEmailAddress(sponsor.getMailAddress())) {
+            // 送信先のメールアドレスが不正なので、送信処理は終了
+            LOG.warn("mail targget [" + sponsor.getMailAddress() + "] is wrong.");
+            return;
+        }
+
+        MailsEntity mailsEntity = new MailsEntity();
+        String mailId = idGen("Notify");
+        mailsEntity.setMailId(mailId);
+        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
+        mailsEntity.setToAddress(sponsor.getMailAddress());
+        mailsEntity.setToName(sponsor.getUserName());
+        
+        MailLocaleTemplatesEntity template = MailLogic.get().load(sponsor.getLocale(), MailLogic.NOTIFY_ADD_PARTICIPATE);
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
+        mailsEntity.setTitle(title);
+        String contents = template.getContent();
+        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
+        StringBuilder builder = new StringBuilder();
+        Resources resources = Resources.getInstance(sponsor.getLocale());
+        builder.append(participant.getUserName());
+        if (status == EventsLogic.STATUS_PARTICIPATION) {
+            builder.append("[").append(resources.getResource("knowledge.view.label.status.participation")).append("]");
+        } else {
+            builder.append("[").append(resources.getResource("knowledge.view.label.status.wait.cansel")).append("]");
+        }
+        contents = contents.replace("{Participant}", builder.toString());
+        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
+
+        mailsEntity.setContent(contents);
+        MailsDao.get().insert(mailsEntity);
+    }
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/ParticipateNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/ParticipateNotification.java
new file mode 100644
index 000000000..2b4996a3e
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/ParticipateNotification.java
@@ -0,0 +1,12 @@
+package org.support.project.knowledge.logic.notification;
+
+public interface ParticipateNotification extends Notification {
+
+    /**
+     * 参加登録通知
+     * @param knowledgeId
+     * @param userId
+     * @param status
+     */
+    void notify(Long knowledgeId, Integer userId, Integer status);
+}
diff --git a/src/main/java/org/support/project/knowledge/vo/notification/Participate.java b/src/main/java/org/support/project/knowledge/vo/notification/Participate.java
new file mode 100644
index 000000000..eef12da91
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/vo/notification/Participate.java
@@ -0,0 +1,32 @@
+package org.support.project.knowledge.vo.notification;
+
+public class Participate extends KnowledgeUpdate {
+    /** 参加者 */
+    private int participant;
+    /** 参加者のステータス */
+    private int status;
+    /**
+     * @return the participant
+     */
+    public int getParticipant() {
+        return participant;
+    }
+    /**
+     * @param participant the participant to set
+     */
+    public void setParticipant(int participant) {
+        this.participant = participant;
+    }
+    /**
+     * @return the status
+     */
+    public int getStatus() {
+        return status;
+    }
+    /**
+     * @param status the status to set
+     */
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}

From 4cd61a444308069bed4aeba9f87f18c51d3af214 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 8 Aug 2017 20:34:45 +0900
Subject: [PATCH 014/138] #349 Add notification feature for event information

---
 .../project/knowledge/logic/EventsLogic.java  |   8 +-
 .../project/knowledge/logic/MailLogic.java    | 112 ------------------
 .../knowledge/logic/NotificationLogic.java    |   6 +
 .../AbstractParticipateNotification.java      |  23 ++--
 ...hangeStatusForParticipantNotification.java |  91 ++++++++++++++
 ...rticipateRemoveForSponsorNotification.java |  90 ++++++++++++++
 6 files changed, 205 insertions(+), 125 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/ParticipateChangeStatusForParticipantNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/ParticipateRemoveForSponsorNotification.java

diff --git a/src/main/java/org/support/project/knowledge/logic/EventsLogic.java b/src/main/java/org/support/project/knowledge/logic/EventsLogic.java
index b1c16d1c5..6a232d4ea 100644
--- a/src/main/java/org/support/project/knowledge/logic/EventsLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/EventsLogic.java
@@ -22,8 +22,10 @@
 import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.ParticipantsEntity;
+import org.support.project.knowledge.logic.notification.ParticipateChangeStatusForParticipantNotification;
 import org.support.project.knowledge.logic.notification.ParticipateForParticipantNotification;
 import org.support.project.knowledge.logic.notification.ParticipateForSponsorNotification;
+import org.support.project.knowledge.logic.notification.ParticipateRemoveForSponsorNotification;
 import org.support.project.knowledge.vo.Participation;
 import org.support.project.knowledge.vo.Participations;
 import org.support.project.web.bean.LoginedUser;
@@ -178,8 +180,8 @@ public void removeParticipation(Long knowledgeId, Integer userId) {
         ParticipantsDao.get().physicalDelete(participant); // 物理的に削除
         
         // 開催者（＝登録者）へメール通知
-        MailLogic.get().notifyRemoveParticipateForSponsor(knowledgeId, userId);
-
+        ParticipateRemoveForSponsorNotification.get().notify(knowledgeId, userId, -1);
+        
         if (participant.getStatus().intValue() == STATUS_PARTICIPATION) {
             List<Participation> participants = ParticipantsDao.get().selectParticipations(knowledgeId);
             for (int i = 0; i < participants.size(); i++) {
@@ -190,7 +192,7 @@ public void removeParticipation(Long knowledgeId, Integer userId) {
                     ParticipantsDao.get().update(entity);
                     
                     // キャンセル待ちが参加登録済になった参加者へメール通知
-                    MailLogic.get().notifyChangeParticipateStatusForParticipant(knowledgeId, p.getUserId());
+                    ParticipateChangeStatusForParticipantNotification.get().notify(knowledgeId, p.getUserId(), STATUS_PARTICIPATION);
                     
                     break; // キャンセル待ちの１件を本登録に変更
                 }
diff --git a/src/main/java/org/support/project/knowledge/logic/MailLogic.java b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
index a3f082591..3061cb798 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
@@ -27,7 +27,6 @@
 import org.support.project.aop.Aspect;
 import org.support.project.common.config.ConfigLoader;
 import org.support.project.common.config.LocaleConfigLoader;
-import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.DateUtils;
@@ -41,10 +40,8 @@
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.MailConfig;
 import org.support.project.knowledge.config.SystemConfig;
-import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.dao.MailLocaleTemplatesDao;
 import org.support.project.knowledge.dao.MailTemplatesDao;
-import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
 import org.support.project.knowledge.entity.MailTemplatesEntity;
 import org.support.project.knowledge.parser.Parser;
@@ -755,113 +752,4 @@ public void initialize(String templateId) {
         ja.setContent(jaConfig.getContents());
         MailLocaleTemplatesDao.get().save(ja);
     }
-    
-    /**
-     * 参加キャンセルがあったことを、開催者へ通知
-     * @param knowledgeId
-     * @param userId
-     */
-    public void notifyRemoveParticipateForSponsor(Long knowledgeId, Integer userId) {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            LOG.info("mail config is not exists.");
-            return;
-        }
-        KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(knowledgeId);
-        if (knowledge == null) {
-            LOG.info("knowledge [" + knowledgeId + "] is not exists.");
-            return;
-        }
-        // 開催者
-        UsersEntity sponsor = UsersDao.get().selectOnKey(knowledge.getInsertUser());
-        // 参加者
-        UsersEntity participant = UsersDao.get().selectOnKey(userId);
-        if (sponsor == null || participant == null) {
-            LOG.warn("sponsor or participant is not exist.");
-            return;
-        }
-        if (!StringUtils.isEmailAddress(sponsor.getMailAddress())) {
-            // 送信先のメールアドレスが不正なので、送信処理は終了
-            LOG.warn("mail targget [" + sponsor.getMailAddress() + "] is wrong.");
-            return;
-        }
-
-        MailsEntity mailsEntity = new MailsEntity();
-        String mailId = idGenu("Notify");
-        mailsEntity.setMailId(mailId);
-        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
-        mailsEntity.setToAddress(sponsor.getMailAddress());
-        mailsEntity.setToName(sponsor.getUserName());
-        
-        MailLocaleTemplatesEntity template = load(sponsor.getLocale(), NOTIFY_REMOVE_PARTICIPATE);
-        String title = template.getTitle();
-        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
-        mailsEntity.setTitle(title);
-        String contents = template.getContent();
-        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
-        contents = contents.replace("{Participant}", participant.getUserName());
-        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
-
-        mailsEntity.setContent(contents);
-        MailsDao.get().insert(mailsEntity);
-    }
-    /**
-     * キャンセル待ちのユーザに、キャンセルがあったため参加になったことを通知
-     * @param knowledgeId
-     * @param userId
-     */
-    public void notifyChangeParticipateStatusForParticipant(Long knowledgeId, Integer userId) {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            LOG.info("mail config is not exists.");
-            return;
-        }
-        KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(knowledgeId);
-        if (knowledge == null) {
-            LOG.info("knowledge [" + knowledgeId + "] is not exists.");
-            return;
-        }
-        // 参加者
-        UsersEntity participant = UsersDao.get().selectOnKey(userId);
-        if (participant == null) {
-            LOG.warn("sponsor or participant is not exist.");
-            return;
-        }
-        if (!StringUtils.isEmailAddress(participant.getMailAddress())) {
-            // 送信先のメールアドレスが不正なので、送信処理は終了
-            LOG.warn("mail targget [" + participant.getMailAddress() + "] is wrong.");
-            return;
-        }
-
-        MailsEntity mailsEntity = new MailsEntity();
-        String mailId = idGenu("Notify");
-        mailsEntity.setMailId(mailId);
-        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
-        mailsEntity.setToAddress(participant.getMailAddress());
-        mailsEntity.setToName(participant.getUserName());
-        
-        MailLocaleTemplatesEntity template = load(participant.getLocale(), NOTIFY_CHANGE_EVENT_STATUS);
-        String title = template.getTitle();
-        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
-        mailsEntity.setTitle(title);
-        String contents = template.getContent();
-        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
-        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
-        StringBuilder builder = new StringBuilder();
-        Resources resources = Resources.getInstance(participant.getLocale());
-        builder.append(resources.getResource("knowledge.view.label.status.participation"));
-        contents = contents.replace("{Status}", builder.toString());
-        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
-
-        mailsEntity.setContent(contents);
-        MailsDao.get().insert(mailsEntity);
-    }
-
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
index 357ff9540..a486cc027 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -10,8 +10,10 @@
 import org.support.project.knowledge.logic.notification.LikeInsertNotification;
 import org.support.project.knowledge.logic.notification.Notification;
 import org.support.project.knowledge.logic.notification.Notification.TARGET;
+import org.support.project.knowledge.logic.notification.ParticipateChangeStatusForParticipantNotification;
 import org.support.project.knowledge.logic.notification.ParticipateForParticipantNotification;
 import org.support.project.knowledge.logic.notification.ParticipateForSponsorNotification;
+import org.support.project.knowledge.logic.notification.ParticipateRemoveForSponsorNotification;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.dao.NotificationsDao;
 import org.support.project.web.dao.UserNotificationsDao;
@@ -52,6 +54,10 @@ public Notification getNotification(String category) {
             return ParticipateForParticipantNotification.get();
         } else if (MailLogic.NOTIFY_ADD_PARTICIPATE.equals(category)) {
             return ParticipateForSponsorNotification.get();
+        } else if (MailLogic.NOTIFY_CHANGE_EVENT_STATUS.equals(category)) {
+            return ParticipateChangeStatusForParticipantNotification.get();
+        } else if (MailLogic.NOTIFY_REMOVE_PARTICIPATE.equals(category)) {
+            return ParticipateRemoveForSponsorNotification.get();
         }
         return null;
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/AbstractParticipateNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/AbstractParticipateNotification.java
index d6e372c38..36e52f272 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/AbstractParticipateNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/AbstractParticipateNotification.java
@@ -37,13 +37,13 @@ protected void insertNotification(KnowledgesEntity knowledge, Integer participan
         notification.setContent(JSON.encode(info));
         notification = NotificationsDao.get().insert(notification);
         
-        if (template.equals(MailLogic.NOTIFY_ADD_PARTICIPATE)) {
-            // 参加登録があったことを、開催者へ通知
+        if (template.equals(MailLogic.NOTIFY_ADD_PARTICIPATE) || template.equals(MailLogic.NOTIFY_REMOVE_PARTICIPATE)) {
+            // 参加登録があったことを、開催者へ通知 / 参加キャンセルを開催者へ通知
             UserNotificationsEntity userNotification = new UserNotificationsEntity(notification.getNo(), knowledge.getInsertUser());
             userNotification.setStatus(NotificationLogic.STATUS_UNREAD);
             UserNotificationsDao.get().insert(userNotification);
         } else {
-            // 参加登録したことを、参加者へ通知
+            // 参加登録したことを、参加者へ通知 / キャンセル待ちのユーザに、参加登録になったことを通知
             UserNotificationsEntity userNotification = new UserNotificationsEntity(notification.getNo(), participant);
             userNotification.setStatus(NotificationLogic.STATUS_UNREAD);
             UserNotificationsDao.get().insert(userNotification);
@@ -72,17 +72,20 @@ public void convNotification(NotificationsEntity notificationsEntity, LoginedUse
                 Resources resources = Resources.getInstance(loginedUser.getLocale());
                 StringBuilder builder = new StringBuilder();
                 int status = info.getStatus();
-                if (MailLogic.NOTIFY_ADD_PARTICIPATE.equals(templateString)) {
-                    // 参加登録があったことを、開催者へ通知
+                if (MailLogic.NOTIFY_ADD_PARTICIPATE.equals(templateString) || MailLogic.NOTIFY_REMOVE_PARTICIPATE.equals(templateString)) {
+                    // 参加登録があったことを、開催者へ通知 || 参加キャンセルを開催者へ通知
                     builder.append(participant.getUserName());
-                    if (status == EventsLogic.STATUS_PARTICIPATION) {
-                        builder.append("[").append(resources.getResource("knowledge.view.label.status.participation")).append("]");
-                    } else {
-                        builder.append("[").append(resources.getResource("knowledge.view.label.status.wait.cansel")).append("]");
+                    if (MailLogic.NOTIFY_ADD_PARTICIPATE.equals(templateString)) {
+                        // 参加登録の場合、ステータスも表示
+                        if (status == EventsLogic.STATUS_PARTICIPATION) {
+                            builder.append("[").append(resources.getResource("knowledge.view.label.status.participation")).append("]");
+                        } else {
+                            builder.append("[").append(resources.getResource("knowledge.view.label.status.wait.cansel")).append("]");
+                        }
                     }
                     contents = contents.replace("{Participant}", builder.toString());
                 } else {
-                    // 参加登録したことを、参加者へ通知
+                    // 参加登録したことを参加者へ通知 // キャンセル待ちの本登録の通知
                     if (status == EventsLogic.STATUS_PARTICIPATION) {
                         builder.append(resources.getResource("knowledge.view.label.status.participation"));
                     } else {
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/ParticipateChangeStatusForParticipantNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/ParticipateChangeStatusForParticipantNotification.java
new file mode 100644
index 000000000..4102f0bcf
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/ParticipateChangeStatusForParticipantNotification.java
@@ -0,0 +1,91 @@
+package org.support.project.knowledge.logic.notification;
+
+import org.support.project.common.config.Resources;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotifyLogic;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+/**
+ * キャンセル待ちのユーザに、キャンセルがあったため参加になったことを通知
+ * @author koda
+ */
+@DI(instance = Instance.Singleton)
+public class ParticipateChangeStatusForParticipantNotification extends AbstractParticipateNotification{
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(ParticipateChangeStatusForParticipantNotification.class);
+    /** インスタンス取得 */
+    public static ParticipateChangeStatusForParticipantNotification get() {
+        return Container.getComp(ParticipateChangeStatusForParticipantNotification.class);
+    }
+    @Override
+    public void notify(Long knowledgeId, Integer userId, Integer status) {
+        KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(knowledgeId);
+        if (knowledge == null) {
+            LOG.info("knowledge [" + knowledgeId + "] is not exists.");
+            return;
+        }
+        // 参加者
+        UsersEntity participant = UsersDao.get().selectOnKey(userId);
+        if (participant == null) {
+            LOG.warn("sponsor or participant is not exist.");
+            return;
+        }
+        
+        // 通知情報生成
+        insertNotification(knowledge, userId, status, MailLogic.NOTIFY_CHANGE_EVENT_STATUS);
+        
+        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
+        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
+        if (mailConfigsEntity == null) {
+            // メールの設定が登録されていなければ、送信処理は終了
+            LOG.info("mail config is not exists.");
+            return;
+        }
+        if (!StringUtils.isEmailAddress(participant.getMailAddress())) {
+            // 送信先のメールアドレスが不正なので、送信処理は終了
+            LOG.warn("mail targget [" + participant.getMailAddress() + "] is wrong.");
+            return;
+        }
+
+        MailsEntity mailsEntity = new MailsEntity();
+        String mailId = idGen("Notify");
+        mailsEntity.setMailId(mailId);
+        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
+        mailsEntity.setToAddress(participant.getMailAddress());
+        mailsEntity.setToName(participant.getUserName());
+        
+        MailLocaleTemplatesEntity template = MailLogic.get().load(participant.getLocale(), MailLogic.NOTIFY_CHANGE_EVENT_STATUS);
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
+        mailsEntity.setTitle(title);
+        String contents = template.getContent();
+        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
+        StringBuilder builder = new StringBuilder();
+        Resources resources = Resources.getInstance(participant.getLocale());
+        builder.append(resources.getResource("knowledge.view.label.status.participation"));
+        contents = contents.replace("{Status}", builder.toString());
+        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
+
+        mailsEntity.setContent(contents);
+        MailsDao.get().insert(mailsEntity);
+    }
+    
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/ParticipateRemoveForSponsorNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/ParticipateRemoveForSponsorNotification.java
new file mode 100644
index 000000000..6f5ca35d9
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/ParticipateRemoveForSponsorNotification.java
@@ -0,0 +1,90 @@
+package org.support.project.knowledge.logic.notification;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotifyLogic;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+/**
+ * 開催者（＝登録者）へ参加キャンセルのメール通知
+ * @author koda
+ */
+@DI(instance = Instance.Singleton)
+public class ParticipateRemoveForSponsorNotification extends AbstractParticipateNotification{
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(ParticipateRemoveForSponsorNotification.class);
+    /** インスタンス取得 */
+    public static ParticipateRemoveForSponsorNotification get() {
+        return Container.getComp(ParticipateRemoveForSponsorNotification.class);
+    }
+    
+    @Override
+    public void notify(Long knowledgeId, Integer userId, Integer status) {
+        KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(knowledgeId);
+        if (knowledge == null) {
+            LOG.info("knowledge [" + knowledgeId + "] is not exists.");
+            return;
+        }
+        // 開催者
+        UsersEntity sponsor = UsersDao.get().selectOnKey(knowledge.getInsertUser());
+        // 参加者
+        UsersEntity participant = UsersDao.get().selectOnKey(userId);
+        if (sponsor == null || participant == null) {
+            LOG.warn("sponsor or participant is not exist.");
+            return;
+        }
+        
+        // 通知情報生成
+        insertNotification(knowledge, userId, status, MailLogic.NOTIFY_REMOVE_PARTICIPATE);
+        
+        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
+        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
+        if (mailConfigsEntity == null) {
+            // メールの設定が登録されていなければ、送信処理は終了
+            LOG.info("mail config is not exists.");
+            return;
+        }
+        if (!StringUtils.isEmailAddress(sponsor.getMailAddress())) {
+            // 送信先のメールアドレスが不正なので、送信処理は終了
+            LOG.warn("mail targget [" + sponsor.getMailAddress() + "] is wrong.");
+            return;
+        }
+
+        MailsEntity mailsEntity = new MailsEntity();
+        String mailId = idGen("Notify");
+        mailsEntity.setMailId(mailId);
+        mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
+        mailsEntity.setToAddress(sponsor.getMailAddress());
+        mailsEntity.setToName(sponsor.getUserName());
+        
+        MailLocaleTemplatesEntity template = MailLogic.get().load(sponsor.getLocale(), MailLogic.NOTIFY_REMOVE_PARTICIPATE);
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(knowledge.getTitle(), 80));
+        mailsEntity.setTitle(title);
+        String contents = template.getContent();
+        contents = contents.replace("{KnowledgeId}", knowledge.getKnowledgeId().toString());
+        contents = contents.replace("{KnowledgeTitle}", knowledge.getTitle());
+        contents = contents.replace("{Participant}", participant.getUserName());
+        contents = contents.replace("{URL}", NotifyLogic.get().makeURL(knowledge.getKnowledgeId()));
+
+        mailsEntity.setContent(contents);
+        MailsDao.get().insert(mailsEntity);
+    }
+
+
+}

From a200f3a87496414d1bc669bea8b85a3e9b27397f Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 8 Aug 2017 22:23:30 +0900
Subject: [PATCH 015/138] #349 Add notification feature for user added

---
 .../control/admin/ConfigControl.java          |   3 +-
 .../knowledge/control/open/SignupControl.java |  15 +-
 .../project/knowledge/logic/MailLogic.java    | 127 +----------------
 .../knowledge/logic/NotificationLogic.java    |   6 +
 .../notification/AbstractNotification.java    |  35 ++---
 .../AcceptCheckUserNotification.java          | 126 +++++++++++++++++
 .../notification/AddUserNotification.java     | 128 ++++++++++++++++++
 7 files changed, 287 insertions(+), 153 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/AcceptCheckUserNotification.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/AddUserNotification.java

diff --git a/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java b/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java
index 8e286a968..5a8dd9d6f 100644
--- a/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java
+++ b/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java
@@ -76,8 +76,7 @@ public Boundary save() {
         String type = getParam("userAddType");
         String notify = getParam("userAddNotify");
         // メール送信の場合、メールの設定が完了しているかチェック
-        if ((type != null && type.equals(SystemConfig.USER_ADD_TYPE_VALUE_MAIL))
-                || (notify != null && notify.equals(SystemConfig.USER_ADD_NOTIFY_ON))) {
+        if (type != null && type.equals(SystemConfig.USER_ADD_TYPE_VALUE_MAIL)) {
             MailConfigsDao mailConfigsDao = MailConfigsDao.get();
             MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
             if (mailConfigsEntity == null) {
diff --git a/src/main/java/org/support/project/knowledge/control/open/SignupControl.java b/src/main/java/org/support/project/knowledge/control/open/SignupControl.java
index 7fb8e8ddf..2e49c9ddc 100644
--- a/src/main/java/org/support/project/knowledge/control/open/SignupControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/SignupControl.java
@@ -16,6 +16,8 @@
 import org.support.project.knowledge.config.SystemConfig;
 import org.support.project.knowledge.control.Control;
 import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.notification.AcceptCheckUserNotification;
+import org.support.project.knowledge.logic.notification.AddUserNotification;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.common.HttpStatus;
@@ -116,8 +118,7 @@ public Boundary save() {
             // 仮登録を行う
             ProvisionalRegistrationsEntity entity = addProvisionalRegistration();
             // 管理者へメール通知
-            MailLogic mailLogic = MailLogic.get();
-            mailLogic.sendNotifyAcceptUser(entity);
+            AcceptCheckUserNotification.get().sendNotifyAcceptUser(entity);
 
             return forward("provisional_registration.jsp");
         }
@@ -154,9 +155,8 @@ private void addUser() {
         user = UserLogic.get().insert(user, roles);
         setAttributeOnProperty(user);
 
-        // 管理者へユーザが追加されたことを通知
-        MailLogic mailLogic = MailLogic.get();
-        mailLogic.sendNotifyAddUser(user);
+        // 管理者にユーザが追加されたことを通知
+        AddUserNotification.get().sendNotifyAddUser(user);
 
         // ログイン処理
         AuthenticationLogic<LoginedUser> logic = Container.getComp(DefaultAuthenticationLogicImpl.class);
@@ -221,9 +221,8 @@ public Boundary activate() {
         UsersEntity user = UserLogic.get().activate(entity);
         // 管理者へユーザが追加されたことを通知
         if (user != null) {
-            MailLogic mailLogic = MailLogic.get();
-            mailLogic.sendNotifyAddUser(user);
-
+            // 管理者にユーザが追加されたことを通知
+            AddUserNotification.get().sendNotifyAddUser(user);
         }
         // ログイン処理
         AuthenticationLogic<LoginedUser> logic = Container.getComp(DefaultAuthenticationLogicImpl.class);
diff --git a/src/main/java/org/support/project/knowledge/logic/MailLogic.java b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
index 3061cb798..5d234c1a8 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
@@ -5,8 +5,6 @@
 import java.io.UnsupportedEncodingException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -48,18 +46,15 @@
 import org.support.project.knowledge.parser.ParserFactory;
 import org.support.project.knowledge.vo.ParseResult;
 import org.support.project.web.bean.LoginedUser;
-import org.support.project.web.config.WebConfig;
 import org.support.project.web.dao.MailConfigsDao;
 import org.support.project.web.dao.MailsDao;
 import org.support.project.web.dao.SystemConfigsDao;
-import org.support.project.web.dao.UsersDao;
 import org.support.project.web.entity.ConfirmMailChangesEntity;
 import org.support.project.web.entity.MailConfigsEntity;
 import org.support.project.web.entity.MailsEntity;
 import org.support.project.web.entity.PasswordResetsEntity;
 import org.support.project.web.entity.ProvisionalRegistrationsEntity;
 import org.support.project.web.entity.SystemConfigsEntity;
-import org.support.project.web.entity.UsersEntity;
 
 @DI(instance = Instance.Singleton)
 public class MailLogic {
@@ -110,13 +105,6 @@ public class MailLogic {
     
     // private static final DateFormat DAY_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
     private static final String MAIL_CONFIG_DIR = "/org/support/project/knowledge/mail/";
-
-    
-    /** date format */
-    private static DateFormat getDayFormat() {
-        return new SimpleDateFormat("yyyyMMddHHmmss");
-    }
-    
     
     public static MailLogic get() {
         return Container.getComp(MailLogic.class);
@@ -328,7 +316,6 @@ private void mailSend(Session session, MailConfigsEntity config, MailsEntity ent
 
     /**
      * メール送信のIDを生成
-     * 
      * @param label 11桁まで
      * @return
      */
@@ -342,7 +329,6 @@ public String idGen(String label) {
         return builder.toString();
     }
 
-
     /**
      * URLを生成
      * 
@@ -448,102 +434,7 @@ public void sendAcceptedAddRequest(ProvisionalRegistrationsEntity entity, String
     }
 
     /**
-     * ユーザ登録通知
-     * 
-     * @param user
-     */
-    public void sendNotifyAddUser(UsersEntity user) {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(org.support.project.knowledge.config.AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            return;
-        }
-
-        LOG.trace("sendNotifyAddUser");
-        SystemConfigsDao configsDao = SystemConfigsDao.get();
-        SystemConfigsEntity configsEntity = configsDao.selectOnKey(SystemConfig.USER_ADD_NOTIFY, AppConfig.get().getSystemName());
-        if (configsEntity != null && SystemConfig.USER_ADD_NOTIFY_ON.equals(configsEntity.getConfigValue())) {
-            // 管理者へのメール通知がONなので、メールを送信する
-            UsersDao usersDao = UsersDao.get();
-            List<UsersEntity> users = usersDao.selectOnRoleKey(WebConfig.ROLE_ADMIN);
-            for (UsersEntity entity : users) {
-                if (!StringUtils.isEmailAddress(entity.getMailAddress())) {
-                    // 送信先のメールアドレスが不正なので、送信処理は終了
-                    LOG.warn("mail targget [" + entity.getMailAddress() + "] is wrong.");
-                    continue;
-                }
-                Locale locale = entity.getLocale();
-                MailLocaleTemplatesEntity mailConfig = load(locale, NOTIFY_ADD_USER);
-
-                String contents = mailConfig.getContent();
-                contents = contents.replace("{UserId}", String.valueOf(user.getUserId()));
-                contents = contents.replace("{UserName}", user.getUserName());
-                contents = contents.replace("{UserMail}", user.getMailAddress());
-                String title = mailConfig.getTitle();
-
-                MailsDao mailsDao = MailsDao.get();
-                MailsEntity mailsEntity = new MailsEntity();
-                String mailId = idGen("Notify");
-                mailsEntity.setMailId(mailId);
-                mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
-                mailsEntity.setToAddress(entity.getMailAddress());
-                mailsEntity.setToName(entity.getUserName());
-                mailsEntity.setTitle(title);
-                mailsEntity.setContent(contents);
-                mailsDao.insert(mailsEntity);
-            }
-        }
-    }
-
-    /**
-     * ユーザの仮登録通知
-     * 
-     * @param entity
-     */
-    public void sendNotifyAcceptUser(ProvisionalRegistrationsEntity registrationsEntity) {
-        MailConfigsDao mailConfigsDao = MailConfigsDao.get();
-        MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(org.support.project.knowledge.config.AppConfig.get().getSystemName());
-        if (mailConfigsEntity == null) {
-            // メールの設定が登録されていなければ、送信処理は終了
-            return;
-        }
-
-        LOG.trace("sendNotifyAcceptUser");
-        SystemConfigsDao configsDao = SystemConfigsDao.get();
-        SystemConfigsEntity configsEntity = configsDao.selectOnKey(SystemConfig.USER_ADD_NOTIFY, AppConfig.get().getSystemName());
-        if (configsEntity != null && SystemConfig.USER_ADD_NOTIFY_ON.equals(configsEntity.getConfigValue())) {
-            // 管理者へのメール通知がONなので、メールを送信する
-            UsersDao usersDao = UsersDao.get();
-            List<UsersEntity> users = usersDao.selectOnRoleKey(WebConfig.ROLE_ADMIN);
-            for (UsersEntity entity : users) {
-                if (!StringUtils.isEmailAddress(entity.getMailAddress())) {
-                    // 送信先のメールアドレスが不正なので、送信処理は終了
-                    LOG.warn("mail targget [" + entity.getMailAddress() + "] is wrong.");
-                    continue;
-                }
-                Locale locale = entity.getLocale();
-                MailLocaleTemplatesEntity mailConfig = load(locale, NOTIFY_ACCEPT_USER);
-
-                String contents = mailConfig.getContent();
-                String title = mailConfig.getTitle();
-
-                MailsDao mailsDao = MailsDao.get();
-                MailsEntity mailsEntity = new MailsEntity();
-                String mailId = idGen("Notify");
-                mailsEntity.setMailId(mailId);
-                mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
-                mailsEntity.setToAddress(entity.getMailAddress());
-                mailsEntity.setToName(entity.getUserName());
-                mailsEntity.setTitle(title);
-                mailsEntity.setContent(contents);
-                mailsDao.insert(mailsEntity);
-            }
-        }
-    }
-
-    /**
-     * メール変更のリクエストを受付
+     * パスワード変更のリクエストを受付
      * 
      * @param email
      * @param locale
@@ -651,22 +542,6 @@ public String getMailContent(String content) throws Exception {
         return content;
     }
     
-    /**
-     * メール送信のIDを生成
-     * @param string
-     * @return
-     */
-    protected String idGenu(String label) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(label);
-        builder.append("-");
-        builder.append(getDayFormat().format(new Date()));
-        builder.append("-");
-        builder.append(UUID.randomUUID().toString());
-        return builder.toString();
-    }
-    
-    
     
     /**
      * メールのテンプレート設定を取得
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
index a486cc027..0bee90a05 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -4,6 +4,8 @@
 import java.util.List;
 
 import org.support.project.di.Container;
+import org.support.project.knowledge.logic.notification.AcceptCheckUserNotification;
+import org.support.project.knowledge.logic.notification.AddUserNotification;
 import org.support.project.knowledge.logic.notification.CommentInsertNotification;
 import org.support.project.knowledge.logic.notification.EventNotificationByWeek;
 import org.support.project.knowledge.logic.notification.KnowledgeUpdateNotification;
@@ -58,6 +60,10 @@ public Notification getNotification(String category) {
             return ParticipateChangeStatusForParticipantNotification.get();
         } else if (MailLogic.NOTIFY_REMOVE_PARTICIPATE.equals(category)) {
             return ParticipateRemoveForSponsorNotification.get();
+        } else if (MailLogic.NOTIFY_ADD_USER.equals(category)) {
+            return AddUserNotification.get();
+        } else if (MailLogic.NOTIFY_ACCEPT_USER.equals(category)) {
+            return AcceptCheckUserNotification.get();
         }
         return null;
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java
index 34065bb75..e05f5affd 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/AbstractNotification.java
@@ -1,29 +1,30 @@
 package org.support.project.knowledge.logic.notification;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.UUID;
-
-public abstract class AbstractNotification {
-    /** date format */
-    private static DateFormat getDayFormat() {
-        return new SimpleDateFormat("yyyyMMddHHmmss");
-    }
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.web.dao.UserNotificationsDao;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UserNotificationsEntity;
 
+public abstract class AbstractNotification implements Notification {
     /**
      * メール送信のIDを生成
      * @param string
      * @return
      */
     protected String idGen(String label) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(label);
-        builder.append("-");
-        builder.append(getDayFormat().format(new Date()));
-        builder.append("-");
-        builder.append(UUID.randomUUID().toString());
-        return builder.toString();
+        return MailLogic.get().idGen(label);
     }
 
+    /**
+     * 指定の通知をユーザに紐付け
+     * @param notification
+     * @param userId
+     */
+    protected void insertUserNotification(NotificationsEntity notification, int userId) {
+        UserNotificationsEntity userNotification = new UserNotificationsEntity(notification.getNo(), userId);
+        userNotification.setStatus(NotificationLogic.STATUS_UNREAD);
+        UserNotificationsDao.get().insert(userNotification);
+    }
+    
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/AcceptCheckUserNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/AcceptCheckUserNotification.java
new file mode 100644
index 000000000..bb9b8ad8f
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/AcceptCheckUserNotification.java
@@ -0,0 +1,126 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.List;
+import java.util.Locale;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.SystemConfig;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.config.WebConfig;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.SystemConfigsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.ProvisionalRegistrationsEntity;
+import org.support.project.web.entity.SystemConfigsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+import net.arnx.jsonic.JSON;
+
+
+/**
+ * 管理者へユーザの仮登録を通知（承認する必要があるため）
+ * @author koda
+ */
+@DI(instance = Instance.Singleton)
+public class AcceptCheckUserNotification extends AbstractNotification {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(AcceptCheckUserNotification.class);
+    /** インスタンス取得 */
+    public static AcceptCheckUserNotification get() {
+        return Container.getComp(AcceptCheckUserNotification.class);
+    }
+
+    private static final String TEMPLATE = MailLogic.NOTIFY_ACCEPT_USER;
+    
+    private NotificationsEntity insertNotification(ProvisionalRegistrationsEntity registrationsEntity) {
+        NotificationsEntity notification = new NotificationsEntity();
+        notification.setTitle(TEMPLATE);
+        notification.setContent(JSON.encode(registrationsEntity));
+        notification = NotificationsDao.get().insert(notification);
+        return notification;
+    }
+    
+    /**
+     * 管理者へユーザの仮登録を通知（承認する必要があるため）
+     * 
+     * @param entity
+     */
+    public void sendNotifyAcceptUser(ProvisionalRegistrationsEntity registrationsEntity) {
+        LOG.trace("sendNotifyAcceptUser");
+        SystemConfigsDao configsDao = SystemConfigsDao.get();
+        SystemConfigsEntity configsEntity = configsDao.selectOnKey(SystemConfig.USER_ADD_NOTIFY, AppConfig.get().getSystemName());
+        if (configsEntity != null && SystemConfig.USER_ADD_NOTIFY_ON.equals(configsEntity.getConfigValue())) {
+            MailConfigsDao mailConfigsDao = MailConfigsDao.get();
+            MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(org.support.project.knowledge.config.AppConfig.get().getSystemName());
+            
+            // 通知の登録
+            NotificationsEntity notification = insertNotification(registrationsEntity);
+            
+            // 管理者へのメール通知がONなので、メールを送信する
+            UsersDao usersDao = UsersDao.get();
+            List<UsersEntity> users = usersDao.selectOnRoleKey(WebConfig.ROLE_ADMIN);
+            for (UsersEntity entity : users) {
+                // 通知を管理者ユーザに紐付け
+                insertUserNotification(notification, entity.getUserId());
+                
+                if (mailConfigsEntity == null) {
+                    // メールの設定が登録されていなければ、送信処理は終了
+                    return;
+                }
+                if (!StringUtils.isEmailAddress(entity.getMailAddress())) {
+                    // 送信先のメールアドレスが不正なので、送信処理は終了
+                    LOG.warn("mail targget [" + entity.getMailAddress() + "] is wrong.");
+                    continue;
+                }
+                Locale locale = entity.getLocale();
+                MailLocaleTemplatesEntity mailConfig = MailLogic.get().load(locale, TEMPLATE);
+
+                String contents = mailConfig.getContent();
+                contents = contents.replace("{UserKey}", registrationsEntity.getUserKey());
+                contents = contents.replace("{UserName}", registrationsEntity.getUserName());
+                
+                String title = mailConfig.getTitle();
+
+                MailsDao mailsDao = MailsDao.get();
+                MailsEntity mailsEntity = new MailsEntity();
+                String mailId = idGen("Notify");
+                mailsEntity.setMailId(mailId);
+                mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
+                mailsEntity.setToAddress(entity.getMailAddress());
+                mailsEntity.setToName(entity.getUserName());
+                mailsEntity.setTitle(title);
+                mailsEntity.setContent(contents);
+                mailsDao.insert(mailsEntity);
+            }
+        }
+    }
+    
+    @Override
+    public void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target) {
+        ProvisionalRegistrationsEntity user = JSON.decode(notificationsEntity.getContent(), ProvisionalRegistrationsEntity.class);
+        MailLocaleTemplatesEntity template = MailLogic.get().load(loginedUser.getLocale(), notificationsEntity.getTitle());
+        
+        String title = template.getTitle();
+        notificationsEntity.setTitle(title);
+        
+        if (target == TARGET.detail) {
+            String contents = template.getContent();
+            contents = contents.replace("{UserKey}", user.getUserKey());
+            contents = contents.replace("{UserName}", user.getUserName());
+            notificationsEntity.setContent(contents);
+        }
+    }
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/AddUserNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/AddUserNotification.java
new file mode 100644
index 000000000..b88761599
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/AddUserNotification.java
@@ -0,0 +1,128 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.List;
+import java.util.Locale;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.SystemConfig;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.config.WebConfig;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.SystemConfigsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.SystemConfigsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+import net.arnx.jsonic.JSON;
+
+/**
+ * 管理者へユーザが追加されたことを通知
+ * @author koda
+ */
+@DI(instance = Instance.Singleton)
+public class AddUserNotification extends AbstractNotification {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(AddUserNotification.class);
+    /** インスタンス取得 */
+    public static AddUserNotification get() {
+        return Container.getComp(AddUserNotification.class);
+    }
+    
+    private static final String TEMPLATE = MailLogic.NOTIFY_ADD_USER;
+    
+    private NotificationsEntity insertNotification(UsersEntity user) {
+        NotificationsEntity notification = new NotificationsEntity();
+        notification.setTitle(TEMPLATE);
+        user.setPassword("");
+        notification.setContent(JSON.encode(user));
+        notification = NotificationsDao.get().insert(notification);
+        return notification;
+    }
+    
+    /**
+     * 管理者へユーザが登録されたことを通知
+     * 
+     * @param user
+     */
+    public void sendNotifyAddUser(UsersEntity user) {
+        LOG.trace("sendNotifyAddUser");
+        SystemConfigsDao configsDao = SystemConfigsDao.get();
+        SystemConfigsEntity configsEntity = configsDao.selectOnKey(SystemConfig.USER_ADD_NOTIFY, AppConfig.get().getSystemName());
+        if (configsEntity != null && SystemConfig.USER_ADD_NOTIFY_ON.equals(configsEntity.getConfigValue())) {
+            // 通知の登録
+            NotificationsEntity notification = insertNotification(user);
+            
+            // メール送信の設定のロード
+            MailConfigsDao mailConfigsDao = MailConfigsDao.get();
+            MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(org.support.project.knowledge.config.AppConfig.get().getSystemName());
+            // 管理者へのメール通知がONなので、メールを送信する
+            UsersDao usersDao = UsersDao.get();
+            List<UsersEntity> users = usersDao.selectOnRoleKey(WebConfig.ROLE_ADMIN);
+            for (UsersEntity entity : users) {
+                // 通知を管理者ユーザに紐付け
+                insertUserNotification(notification, entity.getUserId());
+                
+                // メール送信するかチェック
+                if (mailConfigsEntity == null) {
+                    // メールの設定が登録されていなければ、送信処理は終了
+                    continue;
+                }
+                if (!StringUtils.isEmailAddress(entity.getMailAddress())) {
+                    // 送信先のメールアドレスが不正なので、送信処理は終了
+                    LOG.warn("mail targget [" + entity.getMailAddress() + "] is wrong.");
+                    continue;
+                }
+                Locale locale = entity.getLocale();
+                MailLocaleTemplatesEntity mailConfig = MailLogic.get().load(locale, TEMPLATE);
+
+                String contents = mailConfig.getContent();
+                contents = contents.replace("{UserId}", String.valueOf(user.getUserId()));
+                contents = contents.replace("{UserName}", user.getUserName());
+                contents = contents.replace("{UserMail}", user.getMailAddress());
+                String title = mailConfig.getTitle();
+
+                MailsDao mailsDao = MailsDao.get();
+                MailsEntity mailsEntity = new MailsEntity();
+                String mailId = idGen("Notify");
+                mailsEntity.setMailId(mailId);
+                mailsEntity.setStatus(MailLogic.MAIL_STATUS_UNSENT);
+                mailsEntity.setToAddress(entity.getMailAddress());
+                mailsEntity.setToName(entity.getUserName());
+                mailsEntity.setTitle(title);
+                mailsEntity.setContent(contents);
+                mailsDao.insert(mailsEntity);
+            }
+        }
+    }
+    
+    @Override
+    public void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target) {
+        UsersEntity user = JSON.decode(notificationsEntity.getContent(), UsersEntity.class);
+        MailLocaleTemplatesEntity template = MailLogic.get().load(loginedUser.getLocale(), notificationsEntity.getTitle());
+        
+        String title = template.getTitle();
+        notificationsEntity.setTitle(title);
+        
+        if (target == TARGET.detail) {
+            String contents = template.getContent();
+            contents = contents.replace("{UserId}", String.valueOf(user.getUserId()));
+            contents = contents.replace("{UserName}", user.getUserName());
+            contents = contents.replace("{UserMail}", user.getMailAddress());
+            notificationsEntity.setContent(contents);
+        }
+    }
+
+}

From e4b1ba66975ac520bf99474b7480434bf1c519f8 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 9 Aug 2017 17:41:04 +0900
Subject: [PATCH 016/138] #444 Add a feature to register "like" on comment

---
 document/database/A5M2_knowledge.pdf          | Bin 70126 -> 70693 bytes
 document/database/knowledge.a5er              |  93 +++--
 .../control/open/KnowledgeControl.java        |  28 +-
 .../knowledge/dao/LikeCommentsDao.java        |  31 ++
 .../knowledge/dao/gen/DatabaseControlDao.java |  58 +--
 .../knowledge/dao/gen/GenLikeCommentsDao.java | 382 ++++++++++++++++++
 .../knowledge/dao/gen/GenLikesDao.java        |   3 +
 .../project/knowledge/deploy/InitDB.java      |   4 +-
 .../deploy/v1_11_0/Migrate_1_11_1.java        |  21 +
 .../knowledge/entity/CommentsEntity.java      |  16 +
 .../knowledge/entity/LikeCommentsEntity.java  |  49 +++
 .../knowledge/entity/gen/GenEventsEntity.java |  10 +-
 .../entity/gen/GenKnowledgesEntity.java       |   6 +-
 .../entity/gen/GenLikeCommentsEntity.java     | 335 +++++++++++++++
 .../knowledge/entity/gen/GenLikesEntity.java  |  29 ++
 .../gen/GenMailHookConditionsEntity.java      |  20 +-
 .../entity/gen/GenMailPostsEntity.java        |  10 +-
 .../knowledge/logic/KnowledgeLogic.java       |  17 +
 .../LikeCommentsDao_delete.sql                |   4 +
 .../LikeCommentsDao_insert.sql                |  20 +
 .../LikeCommentsDao_physical_select_all.sql   |   2 +
 ...entsDao_physical_select_all_with_pager.sql |   3 +
 ...LikeCommentsDao_physical_select_on_key.sql |   4 +
 .../LikeCommentsDao_raw_insert.sql            |  20 +
 .../LikeCommentsDao_select_all.sql            |   3 +
 .../LikeCommentsDao_select_all_with_pager.sql |   4 +
 .../LikeCommentsDao_select_count_all.sql      |   2 +
 .../LikeCommentsDao_select_on_key.sql         |   4 +
 .../LikeCommentsDao_update.sql                |  12 +
 .../dao/sql/LikesDao/LikesDao_insert.sql      |   2 +
 .../dao/sql/LikesDao/LikesDao_raw_insert.sql  |   2 +
 .../dao/sql/LikesDao/LikesDao_update.sql      |   1 +
 .../project/knowledge/database/ddl.sql        |  38 +-
 .../deploy/v1_11_0/migrate_v1_11_1.sql        |  33 ++
 .../partials/partials-view-comment-list.jsp   |  44 +-
 src/main/webapp/css/common.css                |  32 ++
 src/main/webapp/js/knowledge-view.js          |  18 +
 37 files changed, 1267 insertions(+), 93 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_1.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/LikeCommentsEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/gen/GenLikeCommentsEntity.java
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_delete.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_raw_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_count_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_update.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql

diff --git a/document/database/A5M2_knowledge.pdf b/document/database/A5M2_knowledge.pdf
index ec98598a6a76b5df7ac4bd55c29db5fea1899619..0fd79f626738cecb554bbd71fb176beed74928df 100755
GIT binary patch
delta 49234
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

delta 48674
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

diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
index c6e152e15..0693be842 100755
--- a/document/database/knowledge.a5er
+++ b/document/database/knowledge.a5er
@@ -46,6 +46,44 @@ SqlSeparator=0
 ShowTag=1
 ShowCommonAttributes=0
 
+[Relation]
+Entity1=COMMENTS
+Entity2=LIKE_COMMENTS
+RelationType1=1
+RelationType2=3
+Fields1=COMMENT_NO
+Fields2=COMMENT_NO
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,3695,3149,4099,R,R
+Dependence=0
+Caption=
+PName=
+LineMode=0
+Bar1=370
+Bar2=315
+Bar3=410
+TermPos1=R
+TermPos2=R
+
+[Entity]
+PName=LIKE_COMMENTS
+LName=コメントのイイネ
+Comment=
+TableOption=
+Page=Main
+Left=1600
+Top=1450
+Field="NO","NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
+Field="コメント番号","COMMENT_NO","bigint","NOT NULL",,"","",$FFFFFFFF,""
+Field="種類","LIKE_CLASS","@INT",,,"1","",$FFFFFFFF,""
+Index=IDX_LIKE_COMMENTS_COMMENT_NO=0,COMMENT_NO
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20170809123907
+Position="Main",1600,1450
+
 [Entity]
 PName=TOKENS
 LName=認証トークン
@@ -228,7 +266,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=ITEM_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4194,5115,6199,R,R
+Position="MAIN",0,4194,5115,6198,R,R
 Dependence=0
 Caption=
 PName=
@@ -247,7 +285,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=2450
-Top=1600
+Top=1800
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="回答ID","ANSWER_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",2,"","",$FFFFFFFF,""
@@ -256,7 +294,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170222220138
-Position="MAIN",2450,1600
+Position="MAIN",2450,1800
 
 [Relation]
 Entity1=SURVEYS
@@ -285,14 +323,14 @@ Comment=
 TableOption=
 Page=MAIN
 Left=1950
-Top=1600
+Top=1800
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="回答ID","ANSWER_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170222215330
-Position="MAIN",1950,1600
+Position="MAIN",1950,1800
 
 [Relation]
 Entity1=SURVEY_ITEMS
@@ -303,7 +341,7 @@ Fields1=KNOWLEDGE_ID,ITEM_NO
 Fields2=KNOWLEDGE_ID,ITEM_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4139,4896,5178,R,R
+Position="MAIN",0,4139,4896,5177,R,R
 Dependence=1
 Caption=
 PName=
@@ -322,7 +360,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=2450
-Top=1100
+Top=1300
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="選択肢番号","CHOICE_NO","@INT","NOT NULL",2,"","",$FFFFFFFF,""
@@ -332,7 +370,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170220203842
-Position="MAIN",2450,1100
+Position="MAIN",2450,1300
 
 [Relation]
 Entity1=SURVEYS
@@ -362,7 +400,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=2500
-Top=1350
+Top=1550
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="項目名","ITEM_NAME","@VARCHAR(32)","NOT NULL",,"","",$FFFFFFFF,""
@@ -372,7 +410,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170220203458
-Position="MAIN",2500,1350
+Position="MAIN",2500,1550
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -401,7 +439,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=1950
-Top=1400
+Top=1600
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="タイトル","TITLE","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,""
 Field="説明","DESCRIPTION","text",,,"","",$FFFFFFFF,""
@@ -409,7 +447,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170220203309
-Position="MAIN",1950,1400
+Position="MAIN",1950,1600
 
 [Relation]
 Entity1=EVENTS
@@ -459,7 +497,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=1350
-Top=1500
+Top=1700
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="開催日","START_DATE_TIME","@DATETIME","NOT NULL",,"","UTC",$FFFFFFFF,""
 Field="タイムゾーン","TIME_ZONE","@VARCHAR(64)",,,"","",$FFFFFFFF,""
@@ -468,7 +506,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170307155432
-Position="MAIN",1350,1500
+Position="MAIN",1350,1700
 
 [Entity]
 PName=PARTICIPANTS
@@ -477,7 +515,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=1350
-Top=1750
+Top=1900
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ユーザID","USER_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="ステータス","STATUS","@INT","NOT NULL",,"","",$FFFFFFFF,""
@@ -485,7 +523,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170222215215
-Position="MAIN",1350,1750
+Position="MAIN",1350,1900
 
 [Relation]
 Entity1=SERVICE_CONFIGS
@@ -748,7 +786,7 @@ Fields1=HOOK_ID
 Fields2=HOOK_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4081,5073,3934,R,R
+Position="MAIN",0,4081,5073,4018,R,R
 Dependence=1
 Caption=
 PName=
@@ -756,7 +794,7 @@ ModifiedDateTime=20160603134957
 LineMode=0
 Bar1=408
 Bar2=507
-Bar3=393
+Bar3=402
 TermPos1=R
 TermPos2=R
 
@@ -1150,7 +1188,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=50
-Top=500
+Top=450
 Field="HASH","HASH","@VARCHAR(32)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="種類","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="通知する種類のID","ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
@@ -1158,7 +1196,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150331055404
-Position="MAIN",50,500
+Position="MAIN",50,450
 
 [Entity]
 PName=NOTIFY_CONFIGS
@@ -1167,7 +1205,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=50
-Top=140
+Top=100
 Field="ユーザID","USER_ID","@INT","NOT NULL",0,"","",$FFFFFFFF,""
 Field="メール通知する","NOTIFY_MAIL","@INT",,,"","",$FFFFFFFF,""
 Field="デスクトップ通知する","NOTIFY_DESKTOP","@INT",,,"","",$FFFFFFFF,""
@@ -1183,7 +1221,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150328062820
-Position="MAIN",50,140
+Position="MAIN",50,100
 
 [Relation]
 Entity1=COMMENTS
@@ -1254,15 +1292,16 @@ Comment=
 TableOption=
 Page=MAIN
 Left=50
-Top=650
+Top=600
 Field="NO","NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
+Field="種類","LIKE_CLASS","@INT",,,"1","",$FFFFFFFF,""
 Index=IDX_LIKES_KNOWLEDGE_ID=0,KNOWLEDGE_ID
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20150416233511
-Position="MAIN",50,650
+ModifiedDateTime=20170809123852
+Position="MAIN",50,600
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1505,14 +1544,14 @@ Fields1=TAG_ID
 Fields2=TAG_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4552,5672,4659,R,R
+Position="MAIN",0,4552,5672,4574,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
 Bar1=455
 Bar2=567
-Bar3=466
+Bar3=457
 TermPos1=R
 TermPos2=R
 
diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 18230dc1d..2a53b49fc 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -23,6 +23,7 @@
 import org.support.project.knowledge.dao.KnowledgeHistoriesDao;
 import org.support.project.knowledge.dao.KnowledgeItemValuesDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.LikeCommentsDao;
 import org.support.project.knowledge.dao.LikesDao;
 import org.support.project.knowledge.dao.StocksDao;
 import org.support.project.knowledge.dao.TagsDao;
@@ -186,6 +187,9 @@ public Boundary view() throws InvalidParamException, ParseException {
         for (CommentsEntity commentsEntity : comments) {
             MarkDown markDown2 = MarkdownLogic.get().markdownToHtml(commentsEntity.getComment());
             commentsEntity.setComment(markDown2.getHtml());
+            
+            Long likeCount = LikeCommentsDao.get().selectOnCommentNo(commentsEntity.getCommentNo());
+            commentsEntity.setLikeCount(likeCount);
         }
         setAttribute("comments", comments);
 
@@ -639,11 +643,6 @@ public Boundary stocks() throws InvalidParamException {
         return forward("stocks.jsp");
     }    
     
-    
-    
-    
-    
-
     /**
      * いいねを押下
      * 
@@ -660,6 +659,20 @@ public Boundary like() throws InvalidParamException {
         likeCount.setCount(count);
         return send(likeCount);
     }
+    /**
+     * コメントにイイネを押下
+     * @return
+     * @throws InvalidParamException 
+     */
+    @Post
+    public Boundary likecomment() throws InvalidParamException {
+        Long commentNo = super.getPathLong(Long.valueOf(-1));
+        KnowledgeLogic knowledgeLogic = KnowledgeLogic.get();
+        Long count = knowledgeLogic.addLikeComment(commentNo, getLoginedUser());
+        LikeCount likeCount = new LikeCount();
+        likeCount.setCount(count);
+        return send(likeCount);
+    }
 
     /**
      * タイトルとコンテンツの危険なタグをエスケープした結果を返す
@@ -768,6 +781,10 @@ public Boundary likes() throws InvalidParamException {
         return forward("likes.jsp");
     }
 
+    
+
+
+    
     /**
      * 編集履歴の表示
      * 
@@ -920,4 +937,5 @@ public Boundary items() throws ParseException {
         return super.send(listdata);
     }
     
+    
 }
diff --git a/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
new file mode 100644
index 000000000..d6e8767d1
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
@@ -0,0 +1,31 @@
+package org.support.project.knowledge.dao;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.gen.GenLikeCommentsDao;
+
+/**
+ * コメントのイイネ
+ */
+@DI(instance = Instance.Singleton)
+public class LikeCommentsDao extends GenLikeCommentsDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static LikeCommentsDao get() {
+        return Container.getComp(LikeCommentsDao.class);
+    }
+    
+    public Long selectOnCommentNo(Long commentNo) {
+        String sql = "SELECT COUNT(*) FROM LIKE_COMMENTS WHERE COMMENT_NO = ?";
+        return super.executeQuerySingle(sql, Long.class, commentNo);
+    }
+
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java b/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
index ec0d490f8..6db445678 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
@@ -20,7 +20,7 @@ public class DatabaseControlDao extends AbstractDao {
 
     /** Drop all tables */
     public void dropAllTable() {
-        String[] sqls = new String[43];
+        String[] sqls = new String[44];
         sqls[0] = "DROP TABLE IF EXISTS KNOWLEDGES CASCADE;";
         sqls[1] = "DROP TABLE IF EXISTS SERVICE_LOCALE_CONFIGS CASCADE;";
         sqls[2] = "DROP TABLE IF EXISTS ACCOUNT_IMAGES CASCADE;";
@@ -51,19 +51,20 @@ public void dropAllTable() {
         sqls[27] = "DROP TABLE IF EXISTS KNOWLEDGE_HISTORIES CASCADE;";
         sqls[28] = "DROP TABLE IF EXISTS KNOWLEDGE_ITEM_VALUES CASCADE;";
         sqls[29] = "DROP TABLE IF EXISTS KNOWLEDGE_TAGS CASCADE;";
-        sqls[30] = "DROP TABLE IF EXISTS SURVEY_ANSWERS CASCADE;";
-        sqls[31] = "DROP TABLE IF EXISTS SURVEYS CASCADE;";
-        sqls[32] = "DROP TABLE IF EXISTS MAIL_TEMPLATES CASCADE;";
-        sqls[33] = "DROP TABLE IF EXISTS NOTIFY_CONFIGS CASCADE;";
-        sqls[34] = "DROP TABLE IF EXISTS SURVEY_ITEMS CASCADE;";
-        sqls[35] = "DROP TABLE IF EXISTS MAIL_HOOKS CASCADE;";
-        sqls[36] = "DROP TABLE IF EXISTS DRAFT_KNOWLEDGES CASCADE;";
-        sqls[37] = "DROP TABLE IF EXISTS STOCKS CASCADE;";
-        sqls[38] = "DROP TABLE IF EXISTS STOCK_KNOWLEDGES CASCADE;";
-        sqls[39] = "DROP TABLE IF EXISTS KNOWLEDGE_USERS CASCADE;";
-        sqls[40] = "DROP TABLE IF EXISTS PARTICIPANTS CASCADE;";
-        sqls[41] = "DROP TABLE IF EXISTS TAGS CASCADE;";
-        sqls[42] = "DROP TABLE IF EXISTS TEMPLATE_ITEMS CASCADE;";
+        sqls[30] = "DROP TABLE IF EXISTS LIKE_COMMENTS CASCADE;";
+        sqls[31] = "DROP TABLE IF EXISTS SURVEY_ANSWERS CASCADE;";
+        sqls[32] = "DROP TABLE IF EXISTS SURVEYS CASCADE;";
+        sqls[33] = "DROP TABLE IF EXISTS MAIL_TEMPLATES CASCADE;";
+        sqls[34] = "DROP TABLE IF EXISTS NOTIFY_CONFIGS CASCADE;";
+        sqls[35] = "DROP TABLE IF EXISTS SURVEY_ITEMS CASCADE;";
+        sqls[36] = "DROP TABLE IF EXISTS MAIL_HOOKS CASCADE;";
+        sqls[37] = "DROP TABLE IF EXISTS DRAFT_KNOWLEDGES CASCADE;";
+        sqls[38] = "DROP TABLE IF EXISTS STOCKS CASCADE;";
+        sqls[39] = "DROP TABLE IF EXISTS STOCK_KNOWLEDGES CASCADE;";
+        sqls[40] = "DROP TABLE IF EXISTS KNOWLEDGE_USERS CASCADE;";
+        sqls[41] = "DROP TABLE IF EXISTS PARTICIPANTS CASCADE;";
+        sqls[42] = "DROP TABLE IF EXISTS TAGS CASCADE;";
+        sqls[43] = "DROP TABLE IF EXISTS TEMPLATE_ITEMS CASCADE;";
         for (String sql : sqls) {
             LOG.debug(sql);
             executeUpdate(sql);
@@ -71,7 +72,7 @@ public void dropAllTable() {
     }
     /** Delete all table data */
     public void dropAllData() {
-        String[] sqls = new String[43];
+        String[] sqls = new String[44];
         sqls[0] = "TRUNCATE TABLE KNOWLEDGES;";
         sqls[1] = "TRUNCATE TABLE SERVICE_LOCALE_CONFIGS;";
         sqls[2] = "TRUNCATE TABLE ACCOUNT_IMAGES;";
@@ -102,19 +103,20 @@ public void dropAllData() {
         sqls[27] = "TRUNCATE TABLE KNOWLEDGE_HISTORIES;";
         sqls[28] = "TRUNCATE TABLE KNOWLEDGE_ITEM_VALUES;";
         sqls[29] = "TRUNCATE TABLE KNOWLEDGE_TAGS;";
-        sqls[30] = "TRUNCATE TABLE SURVEY_ANSWERS;";
-        sqls[31] = "TRUNCATE TABLE SURVEYS;";
-        sqls[32] = "TRUNCATE TABLE MAIL_TEMPLATES;";
-        sqls[33] = "TRUNCATE TABLE NOTIFY_CONFIGS;";
-        sqls[34] = "TRUNCATE TABLE SURVEY_ITEMS;";
-        sqls[35] = "TRUNCATE TABLE MAIL_HOOKS;";
-        sqls[36] = "TRUNCATE TABLE DRAFT_KNOWLEDGES;";
-        sqls[37] = "TRUNCATE TABLE STOCKS;";
-        sqls[38] = "TRUNCATE TABLE STOCK_KNOWLEDGES;";
-        sqls[39] = "TRUNCATE TABLE KNOWLEDGE_USERS;";
-        sqls[40] = "TRUNCATE TABLE PARTICIPANTS;";
-        sqls[41] = "TRUNCATE TABLE TAGS;";
-        sqls[42] = "TRUNCATE TABLE TEMPLATE_ITEMS;";
+        sqls[30] = "TRUNCATE TABLE LIKE_COMMENTS;";
+        sqls[31] = "TRUNCATE TABLE SURVEY_ANSWERS;";
+        sqls[32] = "TRUNCATE TABLE SURVEYS;";
+        sqls[33] = "TRUNCATE TABLE MAIL_TEMPLATES;";
+        sqls[34] = "TRUNCATE TABLE NOTIFY_CONFIGS;";
+        sqls[35] = "TRUNCATE TABLE SURVEY_ITEMS;";
+        sqls[36] = "TRUNCATE TABLE MAIL_HOOKS;";
+        sqls[37] = "TRUNCATE TABLE DRAFT_KNOWLEDGES;";
+        sqls[38] = "TRUNCATE TABLE STOCKS;";
+        sqls[39] = "TRUNCATE TABLE STOCK_KNOWLEDGES;";
+        sqls[40] = "TRUNCATE TABLE KNOWLEDGE_USERS;";
+        sqls[41] = "TRUNCATE TABLE PARTICIPANTS;";
+        sqls[42] = "TRUNCATE TABLE TAGS;";
+        sqls[43] = "TRUNCATE TABLE TEMPLATE_ITEMS;";
         for (String sql : sqls) {
             LOG.debug(sql);
             executeUpdate(sql);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
new file mode 100644
index 000000000..6389575a8
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
@@ -0,0 +1,382 @@
+package org.support.project.knowledge.dao.gen;
+
+import java.util.List;
+
+import java.sql.Timestamp;
+
+
+import org.support.project.knowledge.entity.LikeCommentsEntity;
+import org.support.project.ormapping.dao.AbstractDao;
+import org.support.project.ormapping.exception.ORMappingException;
+import org.support.project.ormapping.common.SQLManager;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.ormapping.common.IDGen;
+import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.connection.ConnectionManager;
+import org.support.project.common.util.PropertyUtil;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.aop.Aspect;
+
+/**
+ * コメントのイイネ
+ * this class is auto generate and not edit.
+ * if modify dao method, you can edit LikeCommentsDao.
+ */
+@DI(instance = Instance.Singleton)
+public class GenLikeCommentsDao extends AbstractDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenLikeCommentsDao get() {
+        return Container.getComp(GenLikeCommentsDao.class);
+    }
+
+    /**
+     * Select all data.
+     * @return all data
+     */
+    public List<LikeCommentsEntity> physicalSelectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql");
+        return executeQueryList(sql, LikeCommentsEntity.class);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data on limit and offset
+     */
+    public List<LikeCommentsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql");
+        return executeQueryList(sql, LikeCommentsEntity.class, limit, offset);
+    }
+    /**
+     * Select data on key.
+     * @param  no no
+     * @return data
+     */
+    public LikeCommentsEntity physicalSelectOnKey(Long no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_on_key.sql");
+        return executeQuerySingle(sql, LikeCommentsEntity.class, no);
+    }
+    /**
+     * Select all data that not deleted.
+     * @return all data
+     */
+    public List<LikeCommentsEntity> selectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql");
+        return executeQueryList(sql, LikeCommentsEntity.class);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data
+     */
+    public List<LikeCommentsEntity> selectAllWidthPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql");
+        return executeQueryList(sql, LikeCommentsEntity.class, limit, offset);
+    }
+    /**
+     * Select count that not deleted.
+     * @return count
+     */
+    public Integer selectCountAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_count_all.sql");
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Select data that not deleted on key.
+     * @param  no no
+     * @return data
+     */
+    public LikeCommentsEntity selectOnKey(Long no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_on_key.sql");
+        return executeQuerySingle(sql, LikeCommentsEntity.class, no);
+    }
+    /**
+     * Count all data
+     * @return count
+     */
+    public int physicalCountAll() {
+        String sql = "SELECT COUNT(*) FROM LIKE_COMMENTS";
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Physical Insert.
+     * it is not create key on database sequence.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public LikeCommentsEntity rawPhysicalInsert(LikeCommentsEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_raw_insert.sql");
+        executeUpdate(sql, 
+            entity.getNo(), 
+            entity.getCommentNo(), 
+            entity.getLikeClass(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
+        if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
+            String setValSql = "select setval('LIKE_COMMENTS_NO_seq', (select max(NO) from LIKE_COMMENTS));";
+            executeQuerySingle(setValSql, Long.class);
+        }
+        return entity;
+    }
+    /**
+     * Physical Insert.
+     * if key column have sequence, key value create by database.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public LikeCommentsEntity physicalInsert(LikeCommentsEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_insert.sql");
+        Class<?> type = PropertyUtil.getPropertyType(entity, "no");
+        Object key = executeInsert(sql, type, 
+            entity.getCommentNo(), 
+            entity.getLikeClass(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        PropertyUtil.setPropertyValue(entity, "no", key);
+        return entity;
+    }
+    /**
+     * Insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public LikeCommentsEntity insert(Integer user, LikeCommentsEntity entity) {
+        entity.setInsertUser(user);
+        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setDeleteFlag(0);
+        return physicalInsert(entity);
+    }
+    /**
+     * Insert.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public LikeCommentsEntity insert(LikeCommentsEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return insert(userId, entity);
+    }
+    /**
+     * Physical Update.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public LikeCommentsEntity physicalUpdate(LikeCommentsEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_update.sql");
+        executeUpdate(sql, 
+            entity.getCommentNo(), 
+            entity.getLikeClass(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag(), 
+            entity.getNo());
+        return entity;
+    }
+    /**
+     * Update.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public LikeCommentsEntity update(Integer user, LikeCommentsEntity entity) {
+        LikeCommentsEntity db = selectOnKey(entity.getNo());
+        entity.setInsertUser(db.getInsertUser());
+        entity.setInsertDatetime(db.getInsertDatetime());
+        entity.setDeleteFlag(db.getDeleteFlag());
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        return physicalUpdate(entity);
+    }
+    /**
+     * Update.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public LikeCommentsEntity update(LikeCommentsEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return update(userId, entity);
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public LikeCommentsEntity save(Integer user, LikeCommentsEntity entity) {
+        LikeCommentsEntity db = selectOnKey(entity.getNo());
+        if (db == null) {
+            return insert(user, entity);
+        } else {
+            return update(user, entity);
+        }
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public LikeCommentsEntity save(LikeCommentsEntity entity) {
+        LikeCommentsEntity db = selectOnKey(entity.getNo());
+        if (db == null) {
+            return insert(entity);
+        } else {
+            return update(entity);
+        }
+    }
+    /**
+     * Physical Delete.
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(Long no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_delete.sql");
+        executeUpdate(sql, no);
+    }
+    /**
+     * Physical Delete.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(LikeCommentsEntity entity) {
+        physicalDelete(entity.getNo());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, Long no) {
+        LikeCommentsEntity db = selectOnKey(no);
+        db.setDeleteFlag(1);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Long no) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        delete(user, no);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, LikeCommentsEntity entity) {
+        delete(user, entity.getNo());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(LikeCommentsEntity entity) {
+        delete(entity.getNo());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, Long no) {
+        LikeCommentsEntity db = physicalSelectOnKey(no);
+        db.setDeleteFlag(0);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Long no) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        activation(user, no);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, LikeCommentsEntity entity) {
+        activation(user, entity.getNo());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(LikeCommentsEntity entity) {
+        activation(entity.getNo());
+
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
index 05791fe08..4b7e4b128 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
@@ -121,6 +121,7 @@ public LikesEntity rawPhysicalInsert(LikesEntity entity) {
         executeUpdate(sql, 
             entity.getNo(), 
             entity.getKnowledgeId(), 
+            entity.getLikeClass(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -145,6 +146,7 @@ public LikesEntity physicalInsert(LikesEntity entity) {
         Class<?> type = PropertyUtil.getPropertyType(entity, "no");
         Object key = executeInsert(sql, type, 
             entity.getKnowledgeId(), 
+            entity.getLikeClass(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -191,6 +193,7 @@ public LikesEntity physicalUpdate(LikesEntity entity) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_update.sql");
         executeUpdate(sql, 
             entity.getKnowledgeId(), 
+            entity.getLikeClass(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
index a3661fc7d..b06fa6a47 100644
--- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java
+++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
@@ -21,6 +21,7 @@
 import org.support.project.knowledge.deploy.v1_10_0.Migrate_1_10_1;
 import org.support.project.knowledge.deploy.v1_10_0.Migrate_1_10_2;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_0;
+import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_1;
 import org.support.project.knowledge.deploy.v1_1_0pre1.Migrate_1_1_0pre1;
 import org.support.project.knowledge.deploy.v1_4_0.Migrate_1_4_0;
 import org.support.project.knowledge.deploy.v1_5_0.Migrate_1_5_0;
@@ -45,7 +46,7 @@ public class InitDB {
     private static final Map<String, Migrate> MAP = new LinkedHashMap<>();
 
     private static final Migrate INIT = InitializeSystem.get();
-    public static final String CURRENT = "1.11.0";
+    public static final String CURRENT = "1.11.1";
 
     public InitDB() {
         super();
@@ -76,6 +77,7 @@ public InitDB() {
         MAP.put("1.10.1", Migrate_1_10_1.get());
         MAP.put("1.10.2", Migrate_1_10_2.get());
         MAP.put("1.11.0", Migrate_1_11_0.get());
+        MAP.put("1.11.1", Migrate_1_11_1.get());
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_1.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_1.java
new file mode 100644
index 000000000..a72932e2c
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_1.java
@@ -0,0 +1,21 @@
+package org.support.project.knowledge.deploy.v1_11_0;
+
+import org.support.project.knowledge.deploy.Migrate;
+import org.support.project.ormapping.tool.dao.InitializeDao;
+
+public class Migrate_1_11_1 implements Migrate {
+
+    public static Migrate_1_11_1 get() {
+        return org.support.project.di.Container.getComp(Migrate_1_11_1.class);
+    }
+
+    @Override
+    public boolean doMigrate() throws Exception {
+        InitializeDao initializeDao = InitializeDao.get();
+        String[] sqlpaths = {
+            "/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql",
+        };
+        initializeDao.initializeDatabase(sqlpaths);
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/support/project/knowledge/entity/CommentsEntity.java b/src/main/java/org/support/project/knowledge/entity/CommentsEntity.java
index eeeb73eed..027f8fea7 100644
--- a/src/main/java/org/support/project/knowledge/entity/CommentsEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/CommentsEntity.java
@@ -18,6 +18,8 @@ public class CommentsEntity extends GenCommentsEntity {
     private String insertUserName;
     /** 更新ユーザ名 */
     private String updateUserName;
+    
+    private long likeCount = 0;
 
     public boolean isUpdate() {
         if (getInsertDatetime().getTime() != getUpdateDatetime().getTime()) {
@@ -80,4 +82,18 @@ public void setInsertUserName(String insertUserName) {
         this.insertUserName = insertUserName;
     }
 
+    /**
+     * @return the likeCount
+     */
+    public long getLikeCount() {
+        return likeCount;
+    }
+
+    /**
+     * @param likeCount the likeCount to set
+     */
+    public void setLikeCount(long likeCount) {
+        this.likeCount = likeCount;
+    }
+
 }
diff --git a/src/main/java/org/support/project/knowledge/entity/LikeCommentsEntity.java b/src/main/java/org/support/project/knowledge/entity/LikeCommentsEntity.java
new file mode 100644
index 000000000..c00cae596
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/LikeCommentsEntity.java
@@ -0,0 +1,49 @@
+package org.support.project.knowledge.entity;
+
+import org.support.project.knowledge.entity.gen.GenLikeCommentsEntity;
+
+import java.util.List;
+import java.util.Map;
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import java.sql.Timestamp;
+
+
+/**
+ * コメントのイイネ
+ */
+@DI(instance = Instance.Prototype)
+public class LikeCommentsEntity extends GenLikeCommentsEntity {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static LikeCommentsEntity get() {
+        return Container.getComp(LikeCommentsEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public LikeCommentsEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param no NO
+     */
+
+    public LikeCommentsEntity(Long no) {
+        super( no);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenEventsEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenEventsEntity.java
index 2280f2463..97929bd13 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenEventsEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenEventsEntity.java
@@ -51,7 +51,7 @@ public GenEventsEntity(Long knowledgeId) {
     }
     /** ナレッジID */
     private Long knowledgeId;
-    /** 開催日	 UTC */
+    /** 開催日     UTC */
     private Timestamp startDateTime;
     /** タイムゾーン */
     private String timeZone;
@@ -85,15 +85,15 @@ public GenEventsEntity setKnowledgeId(Long knowledgeId) {
     }
 
     /**
-     * Get 開催日	 UTC.
-     * @return 開催日	 UTC
+     * Get 開催日     UTC.
+     * @return 開催日     UTC
      */
     public Timestamp getStartDateTime() {
         return this.startDateTime;
     }
     /**
-     * Set 開催日	 UTC.
-     * @param startDateTime 開催日	 UTC
+     * Set 開催日     UTC.
+     * @param startDateTime 開催日     UTC
      * @return this object     */
     public GenEventsEntity setStartDateTime(Timestamp startDateTime) {
         this.startDateTime = startDateTime;
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
index 4ddbd2667..381eefd72 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
@@ -62,11 +62,11 @@ public GenKnowledgesEntity(Long knowledgeId) {
     /** タグ名称一覧 */
     private String tagNames;
     /** いいね件数 */
-    private Long likeCount = new Long(0);
+    private Long likeCount;
     /** コメント件数 */
-    private Integer commentCount = 0;
+    private Integer commentCount;
     /** 参照件数 */
-    private Long viewCount = new Long(0);
+    private Long viewCount;
     /** テンプレートの種類ID */
     private Integer typeId;
     /** 通知ステータス */
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenLikeCommentsEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenLikeCommentsEntity.java
new file mode 100644
index 000000000..78776d793
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenLikeCommentsEntity.java
@@ -0,0 +1,335 @@
+package org.support.project.knowledge.entity.gen;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+import java.sql.Timestamp;
+
+
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.common.validate.Validator;
+import org.support.project.common.validate.ValidatorFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+/**
+ * コメントのイイネ
+ */
+@DI(instance = Instance.Prototype)
+public class GenLikeCommentsEntity implements Serializable {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenLikeCommentsEntity get() {
+        return Container.getComp(GenLikeCommentsEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public GenLikeCommentsEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param no NO
+     */
+
+    public GenLikeCommentsEntity(Long no) {
+        super();
+        this.no = no;
+    }
+    /** NO */
+    private Long no;
+    /** コメント番号 */
+    private Long commentNo;
+    /** 種類 */
+    private Integer likeClass;
+    /** 登録ユーザ */
+    private Integer insertUser;
+    /** 登録日時 */
+    private Timestamp insertDatetime;
+    /** 更新ユーザ */
+    private Integer updateUser;
+    /** 更新日時 */
+    private Timestamp updateDatetime;
+    /** 削除フラグ */
+    private Integer deleteFlag;
+
+    /**
+     * Get NO.
+     * @return NO
+     */
+    public Long getNo() {
+        return this.no;
+    }
+    /**
+     * Set NO.
+     * @param no NO
+     * @return this object     */
+    public GenLikeCommentsEntity setNo(Long no) {
+        this.no = no;
+        return this;
+    }
+
+    /**
+     * Get コメント番号.
+     * @return コメント番号
+     */
+    public Long getCommentNo() {
+        return this.commentNo;
+    }
+    /**
+     * Set コメント番号.
+     * @param commentNo コメント番号
+     * @return this object     */
+    public GenLikeCommentsEntity setCommentNo(Long commentNo) {
+        this.commentNo = commentNo;
+        return this;
+    }
+
+    /**
+     * Get 種類.
+     * @return 種類
+     */
+    public Integer getLikeClass() {
+        return this.likeClass;
+    }
+    /**
+     * Set 種類.
+     * @param likeClass 種類
+     * @return this object     */
+    public GenLikeCommentsEntity setLikeClass(Integer likeClass) {
+        this.likeClass = likeClass;
+        return this;
+    }
+
+    /**
+     * Get 登録ユーザ.
+     * @return 登録ユーザ
+     */
+    public Integer getInsertUser() {
+        return this.insertUser;
+    }
+    /**
+     * Set 登録ユーザ.
+     * @param insertUser 登録ユーザ
+     * @return this object     */
+    public GenLikeCommentsEntity setInsertUser(Integer insertUser) {
+        this.insertUser = insertUser;
+        return this;
+    }
+
+    /**
+     * Get 登録日時.
+     * @return 登録日時
+     */
+    public Timestamp getInsertDatetime() {
+        return this.insertDatetime;
+    }
+    /**
+     * Set 登録日時.
+     * @param insertDatetime 登録日時
+     * @return this object     */
+    public GenLikeCommentsEntity setInsertDatetime(Timestamp insertDatetime) {
+        this.insertDatetime = insertDatetime;
+        return this;
+    }
+
+    /**
+     * Get 更新ユーザ.
+     * @return 更新ユーザ
+     */
+    public Integer getUpdateUser() {
+        return this.updateUser;
+    }
+    /**
+     * Set 更新ユーザ.
+     * @param updateUser 更新ユーザ
+     * @return this object     */
+    public GenLikeCommentsEntity setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+        return this;
+    }
+
+    /**
+     * Get 更新日時.
+     * @return 更新日時
+     */
+    public Timestamp getUpdateDatetime() {
+        return this.updateDatetime;
+    }
+    /**
+     * Set 更新日時.
+     * @param updateDatetime 更新日時
+     * @return this object     */
+    public GenLikeCommentsEntity setUpdateDatetime(Timestamp updateDatetime) {
+        this.updateDatetime = updateDatetime;
+        return this;
+    }
+
+    /**
+     * Get 削除フラグ.
+     * @return 削除フラグ
+     */
+    public Integer getDeleteFlag() {
+        return this.deleteFlag;
+    }
+    /**
+     * Set 削除フラグ.
+     * @param deleteFlag 削除フラグ
+     * @return this object     */
+    public GenLikeCommentsEntity setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
+    /**
+     * Get key values 
+     * @return values 
+     */
+    public Object[] getKeyValues() {
+        Object[] keyValues = new Object[1];
+        keyValues[0] = this.no;
+        return keyValues;
+    }
+    /**
+     * Set key values 
+     * @param no NO
+     */
+    public void setKeyValues(Long no) {
+        this.no = no;
+    }
+    /**
+     * compare on key 
+     * @param entity entity 
+     * @return result 
+     */
+    public boolean equalsOnKey(GenLikeCommentsEntity entity) {
+        Object[] keyValues1 = getKeyValues();
+        Object[] keyValues2 = entity.getKeyValues();
+        for (int i = 0; i < keyValues1.length; i++) {
+            Object val1 = keyValues1[i];
+            Object val2 = keyValues2[i];
+            if (val1 == null && val2 != null) {
+                return false;
+            }
+            if (val1 != null && val2 == null) {
+                return false;
+            }
+            if (val1 != null && val2 != null) {
+                if (!val1.equals(val2)) {
+                    return false;
+                }
+            }
+            
+        }
+        return true;
+    }
+    /**
+     * ToString 
+     * @return string 
+     */
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("no = ").append(no).append("\n");
+        builder.append("commentNo = ").append(commentNo).append("\n");
+        builder.append("likeClass = ").append(likeClass).append("\n");
+        builder.append("insertUser = ").append(insertUser).append("\n");
+        builder.append("insertDatetime = ").append(insertDatetime).append("\n");
+        builder.append("updateUser = ").append(updateUser).append("\n");
+        builder.append("updateDatetime = ").append(updateDatetime).append("\n");
+        builder.append("deleteFlag = ").append(deleteFlag).append("\n");
+        return builder.toString();
+    }
+    /**
+     * Convert label to display 
+     * @param label label
+     * @return convert label 
+     */
+    protected String convLabelName(String label) {
+        return label;
+    }
+    /**
+     * validate 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate() {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.commentNo, convLabelName("Comment No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.likeClass, convLabelName("Like Class"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.insertUser, convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.updateUser, convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.deleteFlag, convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+    /**
+     * validate 
+     * @param values value map 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate(Map<String, String> values) {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("commentNo"), convLabelName("Comment No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("likeClass"), convLabelName("Like Class"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("updateUser"), convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("deleteFlag"), convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenLikesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenLikesEntity.java
index 5ff982bb8..a10d2dff4 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenLikesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenLikesEntity.java
@@ -53,6 +53,8 @@ public GenLikesEntity(Long no) {
     private Long no;
     /** ナレッジID */
     private Long knowledgeId;
+    /** 種類 */
+    private Integer likeClass;
     /** 登録ユーザ */
     private Integer insertUser;
     /** 登録日時 */
@@ -96,6 +98,22 @@ public GenLikesEntity setKnowledgeId(Long knowledgeId) {
         return this;
     }
 
+    /**
+     * Get 種類.
+     * @return 種類
+     */
+    public Integer getLikeClass() {
+        return this.likeClass;
+    }
+    /**
+     * Set 種類.
+     * @param likeClass 種類
+     * @return this object     */
+    public GenLikesEntity setLikeClass(Integer likeClass) {
+        this.likeClass = likeClass;
+        return this;
+    }
+
     /**
      * Get 登録ユーザ.
      * @return 登録ユーザ
@@ -226,6 +244,7 @@ public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("no = ").append(no).append("\n");
         builder.append("knowledgeId = ").append(knowledgeId).append("\n");
+        builder.append("likeClass = ").append(likeClass).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
         builder.append("insertDatetime = ").append(insertDatetime).append("\n");
         builder.append("updateUser = ").append(updateUser).append("\n");
@@ -255,6 +274,11 @@ public List<ValidateError> validate() {
             errors.add(error);
         }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.likeClass, convLabelName("Like Class"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
         error = validator.validate(this.insertUser, convLabelName("Insert User"));
         if (error != null) {
             errors.add(error);
@@ -286,6 +310,11 @@ public List<ValidateError> validate(Map<String, String> values) {
             errors.add(error);
         }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("likeClass"), convLabelName("Like Class"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
         error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
         if (error != null) {
             errors.add(error);
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenMailHookConditionsEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenMailHookConditionsEntity.java
index 5b35fb4ac..58cc721aa 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenMailHookConditionsEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenMailHookConditionsEntity.java
@@ -55,13 +55,13 @@ public GenMailHookConditionsEntity(Integer conditionNo, Integer hookId) {
     private Integer hookId;
     /** CONDITION_NO */
     private Integer conditionNo;
-    /** 条件の種類	 1:宛先が「条件文字」であった場合 */
+    /** 条件の種類  1:宛先が「条件文字」であった場合 */
     private Integer conditionKind;
     /** 条件の文字 */
     private String condition;
     /** 投稿者 */
     private Integer processUser;
-    /** 投稿者の指定	 1:送信者のメールアドレスから、2:常に固定 */
+    /** 投稿者の指定  1:送信者のメールアドレスから、2:常に固定 */
     private Integer processUserKind;
     /** 公開区分 */
     private Integer publicFlag;
@@ -119,15 +119,15 @@ public GenMailHookConditionsEntity setConditionNo(Integer conditionNo) {
     }
 
     /**
-     * Get 条件の種類	 1:宛先が「条件文字」であった場合.
-     * @return 条件の種類	 1:宛先が「条件文字」であった場合
+     * Get 条件の種類  1:宛先が「条件文字」であった場合.
+     * @return 条件の種類  1:宛先が「条件文字」であった場合
      */
     public Integer getConditionKind() {
         return this.conditionKind;
     }
     /**
-     * Set 条件の種類	 1:宛先が「条件文字」であった場合.
-     * @param conditionKind 条件の種類	 1:宛先が「条件文字」であった場合
+     * Set 条件の種類  1:宛先が「条件文字」であった場合.
+     * @param conditionKind 条件の種類  1:宛先が「条件文字」であった場合
      * @return this object     */
     public GenMailHookConditionsEntity setConditionKind(Integer conditionKind) {
         this.conditionKind = conditionKind;
@@ -167,15 +167,15 @@ public GenMailHookConditionsEntity setProcessUser(Integer processUser) {
     }
 
     /**
-     * Get 投稿者の指定	 1:送信者のメールアドレスから、2:常に固定.
-     * @return 投稿者の指定	 1:送信者のメールアドレスから、2:常に固定
+     * Get 投稿者の指定  1:送信者のメールアドレスから、2:常に固定.
+     * @return 投稿者の指定  1:送信者のメールアドレスから、2:常に固定
      */
     public Integer getProcessUserKind() {
         return this.processUserKind;
     }
     /**
-     * Set 投稿者の指定	 1:送信者のメールアドレスから、2:常に固定.
-     * @param processUserKind 投稿者の指定	 1:送信者のメールアドレスから、2:常に固定
+     * Set 投稿者の指定  1:送信者のメールアドレスから、2:常に固定.
+     * @param processUserKind 投稿者の指定  1:送信者のメールアドレスから、2:常に固定
      * @return this object     */
     public GenMailHookConditionsEntity setProcessUserKind(Integer processUserKind) {
         this.processUserKind = processUserKind;
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenMailPostsEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenMailPostsEntity.java
index 4ea8071cc..8f54e0736 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenMailPostsEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenMailPostsEntity.java
@@ -51,7 +51,7 @@ public GenMailPostsEntity(String messageId) {
     }
     /** Message-ID */
     private String messageId;
-    /** 投稿区分	 1: Knowledge 2:Comment */
+    /** 投稿区分  1: Knowledge 2:Comment */
     private Integer postKind;
     /** ID */
     private Long id;
@@ -85,15 +85,15 @@ public GenMailPostsEntity setMessageId(String messageId) {
     }
 
     /**
-     * Get 投稿区分	 1: Knowledge 2:Comment.
-     * @return 投稿区分	 1: Knowledge 2:Comment
+     * Get 投稿区分  1: Knowledge 2:Comment.
+     * @return 投稿区分  1: Knowledge 2:Comment
      */
     public Integer getPostKind() {
         return this.postKind;
     }
     /**
-     * Set 投稿区分	 1: Knowledge 2:Comment.
-     * @param postKind 投稿区分	 1: Knowledge 2:Comment
+     * Set 投稿区分  1: Knowledge 2:Comment.
+     * @param postKind 投稿区分  1: Knowledge 2:Comment
      * @return this object     */
     public GenMailPostsEntity setPostKind(Integer postKind) {
         this.postKind = postKind;
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index 62c0f99b6..d68a54157 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -34,6 +34,7 @@
 import org.support.project.knowledge.dao.KnowledgeTagsDao;
 import org.support.project.knowledge.dao.KnowledgeUsersDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.LikeCommentsDao;
 import org.support.project.knowledge.dao.LikesDao;
 import org.support.project.knowledge.dao.StockKnowledgesDao;
 import org.support.project.knowledge.dao.StocksDao;
@@ -52,6 +53,7 @@
 import org.support.project.knowledge.entity.KnowledgeTagsEntity;
 import org.support.project.knowledge.entity.KnowledgeUsersEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.StocksEntity;
 import org.support.project.knowledge.entity.TagsEntity;
@@ -1125,6 +1127,20 @@ public Long addLike(Long knowledgeId, LoginedUser loginedUser) {
 
         return count;
     }
+    /**
+     * コメントにイイネを追加
+     * @param commentNo
+     * @param loginedUser
+     * @return
+     */
+    public Long addLikeComment(Long commentNo, LoginedUser loginedUser) {
+        LikeCommentsEntity like = new LikeCommentsEntity();
+        like.setCommentNo(commentNo);
+        LikeCommentsDao.get().insert(like);
+        Long count = LikeCommentsDao.get().selectOnCommentNo(commentNo);
+        return count;
+    }
+    
 
     /**
      * ナレッジテーブルの タグやイイネ件数、コメント件数などの付加情報を 更新する（一覧表示用）
@@ -1597,4 +1613,5 @@ public void setViewed(List<StockKnowledge> stocks, LoginedUser loginedUser) {
             }
         }
     }
+
 }
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_delete.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_delete.sql
new file mode 100644
index 000000000..9e34e9a0f
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_delete.sql
@@ -0,0 +1,4 @@
+DELETE FROM LIKE_COMMENTS
+WHERE 
+NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_insert.sql
new file mode 100644
index 000000000..6984ae37f
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_insert.sql
@@ -0,0 +1,20 @@
+INSERT INTO LIKE_COMMENTS
+( 
+NO
+ , COMMENT_NO
+ , LIKE_CLASS
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+DEFAULT
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql
new file mode 100644
index 000000000..ab669161d
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql
@@ -0,0 +1,2 @@
+SELECT * FROM LIKE_COMMENTS
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql
new file mode 100644
index 000000000..65d77d109
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql
@@ -0,0 +1,3 @@
+SELECT * FROM LIKE_COMMENTS
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_on_key.sql
new file mode 100644
index 000000000..55e7e14af
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_on_key.sql
@@ -0,0 +1,4 @@
+SELECT * FROM LIKE_COMMENTS
+ WHERE 
+NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_raw_insert.sql
new file mode 100644
index 000000000..2fcb38adb
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_raw_insert.sql
@@ -0,0 +1,20 @@
+INSERT INTO LIKE_COMMENTS
+( 
+NO
+ , COMMENT_NO
+ , LIKE_CLASS
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql
new file mode 100644
index 000000000..55b863319
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql
@@ -0,0 +1,3 @@
+SELECT * FROM LIKE_COMMENTS
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql
new file mode 100644
index 000000000..e883b0d22
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql
@@ -0,0 +1,4 @@
+SELECT * FROM LIKE_COMMENTS
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_count_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_count_all.sql
new file mode 100644
index 000000000..9d31607b9
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_count_all.sql
@@ -0,0 +1,2 @@
+SELECT COUNT(*) FROM LIKE_COMMENTS
+WHERE DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_on_key.sql
new file mode 100644
index 000000000..226d633ff
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_on_key.sql
@@ -0,0 +1,4 @@
+SELECT * FROM LIKE_COMMENTS
+ WHERE 
+NO = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_update.sql
new file mode 100644
index 000000000..cc87d9456
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_update.sql
@@ -0,0 +1,12 @@
+UPDATE LIKE_COMMENTS
+SET 
+   COMMENT_NO = ?
+ , LIKE_CLASS = ?
+ , INSERT_USER = ?
+ , INSERT_DATETIME = ?
+ , UPDATE_USER = ?
+ , UPDATE_DATETIME = ?
+ , DELETE_FLAG = ?
+WHERE 
+NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_insert.sql
index 361503e62..5c88f0da5 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_insert.sql
@@ -2,6 +2,7 @@ INSERT INTO LIKES
 ( 
 NO
  , KNOWLEDGE_ID
+ , LIKE_CLASS
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -15,4 +16,5 @@ DEFAULT
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_raw_insert.sql
index 2783621da..d3a49e61c 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_raw_insert.sql
@@ -2,6 +2,7 @@ INSERT INTO LIKES
 ( 
 NO
  , KNOWLEDGE_ID
+ , LIKE_CLASS
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -15,4 +16,5 @@ NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_update.sql
index 99fe0c150..72e6a98b8 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_update.sql
@@ -1,6 +1,7 @@
 UPDATE LIKES
 SET 
    KNOWLEDGE_ID = ?
+ , LIKE_CLASS = ?
  , INSERT_USER = ?
  , INSERT_DATETIME = ?
  , UPDATE_USER = ?
diff --git a/src/main/resources/org/support/project/knowledge/database/ddl.sql b/src/main/resources/org/support/project/knowledge/database/ddl.sql
index 4c6e5eb0a..3e207c597 100644
--- a/src/main/resources/org/support/project/knowledge/database/ddl.sql
+++ b/src/main/resources/org/support/project/knowledge/database/ddl.sql
@@ -1,3 +1,21 @@
+-- コメントのイイネ
+drop table if exists LIKE_COMMENTS cascade;
+
+create table LIKE_COMMENTS (
+  NO BIGSERIAL not null
+  , COMMENT_NO bigint not null
+  , LIKE_CLASS integer default 1
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint LIKE_COMMENTS_PKC primary key (NO)
+) ;
+
+create index IDX_LIKE_COMMENTS_COMMENT_NO
+  on LIKE_COMMENTS(COMMENT_NO);
+
 -- 認証トークン
 drop table if exists TOKENS cascade;
 
@@ -551,6 +569,7 @@ drop table if exists LIKES cascade;
 create table LIKES (
   NO BIGSERIAL not null
   , KNOWLEDGE_ID bigint not null
+  , LIKE_CLASS integer default 1
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
@@ -740,6 +759,16 @@ create table KNOWLEDGES (
   , constraint KNOWLEDGES_PKC primary key (KNOWLEDGE_ID)
 ) ;
 
+comment on table LIKE_COMMENTS is 'コメントのイイネ';
+comment on column LIKE_COMMENTS.NO is 'NO';
+comment on column LIKE_COMMENTS.COMMENT_NO is 'コメント番号';
+comment on column LIKE_COMMENTS.LIKE_CLASS is '種類';
+comment on column LIKE_COMMENTS.INSERT_USER is '登録ユーザ';
+comment on column LIKE_COMMENTS.INSERT_DATETIME is '登録日時';
+comment on column LIKE_COMMENTS.UPDATE_USER is '更新ユーザ';
+comment on column LIKE_COMMENTS.UPDATE_DATETIME is '更新日時';
+comment on column LIKE_COMMENTS.DELETE_FLAG is '削除フラグ';
+
 comment on table TOKENS is '認証トークン';
 comment on column TOKENS.TOKEN is 'TOKEN';
 comment on column TOKENS.USER_ID is 'ユーザID';
@@ -837,7 +866,7 @@ comment on column SURVEYS.DELETE_FLAG is '削除フラグ';
 
 comment on table EVENTS is 'イベント';
 comment on column EVENTS.KNOWLEDGE_ID is 'ナレッジID';
-comment on column EVENTS.START_DATE_TIME is '開催日	 UTC';
+comment on column EVENTS.START_DATE_TIME is '開催日     UTC';
 comment on column EVENTS.TIME_ZONE is 'タイムゾーン';
 comment on column EVENTS.NOTIFY_STATUS is '通知ステータス';
 comment on column EVENTS.INSERT_USER is '登録ユーザ';
@@ -938,7 +967,7 @@ comment on column DRAFT_KNOWLEDGES.DELETE_FLAG is '削除フラグ';
 
 comment on table MAIL_POSTS is 'メールから投稿';
 comment on column MAIL_POSTS.MESSAGE_ID is 'Message-ID';
-comment on column MAIL_POSTS.POST_KIND is '投稿区分	 1: Knowledge 2:Comment';
+comment on column MAIL_POSTS.POST_KIND is '投稿区分  1: Knowledge 2:Comment';
 comment on column MAIL_POSTS.ID is 'ID';
 comment on column MAIL_POSTS.SENDER is 'SENDER';
 comment on column MAIL_POSTS.INSERT_USER is '登録ユーザ';
@@ -950,10 +979,10 @@ comment on column MAIL_POSTS.DELETE_FLAG is '削除フラグ';
 comment on table MAIL_HOOK_CONDITIONS is 'メールから投稿する条件';
 comment on column MAIL_HOOK_CONDITIONS.HOOK_ID is 'HOOK_ID';
 comment on column MAIL_HOOK_CONDITIONS.CONDITION_NO is 'CONDITION_NO';
-comment on column MAIL_HOOK_CONDITIONS.CONDITION_KIND is '条件の種類	 1:宛先が「条件文字」であった場合';
+comment on column MAIL_HOOK_CONDITIONS.CONDITION_KIND is '条件の種類  1:宛先が「条件文字」であった場合';
 comment on column MAIL_HOOK_CONDITIONS.CONDITION is '条件の文字';
 comment on column MAIL_HOOK_CONDITIONS.PROCESS_USER is '投稿者';
-comment on column MAIL_HOOK_CONDITIONS.PROCESS_USER_KIND is '投稿者の指定	 1:送信者のメールアドレスから、2:常に固定';
+comment on column MAIL_HOOK_CONDITIONS.PROCESS_USER_KIND is '投稿者の指定  1:送信者のメールアドレスから、2:常に固定';
 comment on column MAIL_HOOK_CONDITIONS.PUBLIC_FLAG is '公開区分';
 comment on column MAIL_HOOK_CONDITIONS.TAGS is 'タグ';
 comment on column MAIL_HOOK_CONDITIONS.VIEWERS is '公開先';
@@ -1118,6 +1147,7 @@ comment on column ACCOUNT_IMAGES.DELETE_FLAG is '削除フラグ';
 comment on table LIKES is 'いいね';
 comment on column LIKES.NO is 'NO';
 comment on column LIKES.KNOWLEDGE_ID is 'ナレッジID';
+comment on column LIKES.LIKE_CLASS is '種類';
 comment on column LIKES.INSERT_USER is '登録ユーザ';
 comment on column LIKES.INSERT_DATETIME is '登録日時';
 comment on column LIKES.UPDATE_USER is '更新ユーザ';
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql
new file mode 100644
index 000000000..b90b2b483
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql
@@ -0,0 +1,33 @@
+-- コメントのイイネ
+drop table if exists LIKE_COMMENTS cascade;
+
+create table LIKE_COMMENTS (
+  NO BIGSERIAL not null
+  , COMMENT_NO bigint not null
+  , LIKE_CLASS integer default 1
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint LIKE_COMMENTS_PKC primary key (NO)
+) ;
+
+create index IDX_LIKE_COMMENTS_COMMENT_NO
+  on LIKE_COMMENTS(COMMENT_NO);
+
+comment on table LIKE_COMMENTS is 'コメントのイイネ';
+comment on column LIKE_COMMENTS.NO is 'NO';
+comment on column LIKE_COMMENTS.COMMENT_NO is 'コメント番号';
+comment on column LIKE_COMMENTS.LIKE_CLASS is '種類';
+comment on column LIKE_COMMENTS.INSERT_USER is '登録ユーザ';
+comment on column LIKE_COMMENTS.INSERT_DATETIME is '登録日時';
+comment on column LIKE_COMMENTS.UPDATE_USER is '更新ユーザ';
+comment on column LIKE_COMMENTS.UPDATE_DATETIME is '更新日時';
+comment on column LIKE_COMMENTS.DELETE_FLAG is '削除フラグ';
+
+ALTER TABLE LIKES DROP COLUMN IF EXISTS LIKE_CLASS;
+ALTER TABLE LIKES ADD COLUMN LIKE_CLASS integer default 1
+
+comment on column LIKES.LIKE_CLASS is '種類';
+
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
index 3612de56b..0cc40aec1 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
@@ -14,7 +14,7 @@
 
     <%
         List commentList = jspUtil.getValue("comments", List.class);
-                if (commentList != null && !commentList.isEmpty()) {
+        if (commentList != null && !commentList.isEmpty()) {
     %>
     <hr />
     <h5>
@@ -23,8 +23,10 @@
     <c:forEach var="comment" items="${comments}" varStatus="status">
         <%
             CommentsEntity comment = jspUtil.getValue("comment", CommentsEntity.class);
-                            Integer knowledge = jspUtil.getValue("insertUser", Integer.class);
-                            if (!comment.getInsertUser().equals(knowledge)) {
+        %>
+        <%
+            Integer knowledge = jspUtil.getValue("insertUser", Integer.class);
+            if (!comment.getInsertUser().equals(knowledge)) {
         %>
         <div class="row">
             <div class="col-sm-12">
@@ -33,7 +35,7 @@
                 [<%=jspUtil.out("comment.insertUserName")%>]
                 <%
                 if (comment.isUpdate()) {
-            %>
+                %>
                 <br />[<%=jspUtil.label("label.update")%>]
                 <%=jspUtil.date("comment.updateDatetime")%>
                 [<%=jspUtil.out("comment.updateUserName")%>]
@@ -73,6 +75,9 @@
             </div>
             <div class="arrow_question markdown">
                 <%=jspUtil.out("comment.comment", JspUtil.ESCAPE_NONE)%>
+                
+                <hr class="hrstyle01"/>
+                
                 <!-- コメントに付けた添付ファイルの表示 -->
                 <c:forEach var="file" items="${files}">
                     <c:if test="${file.commentNo == comment.commentNo}">
@@ -82,6 +87,19 @@
                         </div>
                     </c:if>
                 </c:forEach>
+                
+                <a href="<%=request.getContextPath()%>/open.knowledge/likeComments/<%=jspUtil.out("comment.getCommentNo()")%><%=jspUtil.out("params")%>"
+                    class="text-primary btn-link">
+                    <i class="fa fa-thumbs-o-up"></i>&nbsp;<%=jspUtil.label("knowledge.view.like")%> × 
+                    <span id="like_comment_count_<%=comment.getCommentNo()%>">
+                    <%=comment.getLikeCount()%>
+                    </span>
+                </a>
+                &nbsp;
+                <button class="btn btn-info btn-circle" onclick="addlikeComment(<%=comment.getCommentNo()%>);">
+                    <i class="fa fa-thumbs-o-up"></i>&nbsp;
+                </button>
+                
             </div>
             <!-- /.arrow_question -->
         </div>
@@ -98,7 +116,6 @@
         %>
         <div class="row">
             <div class="col-sm-12" style="text-align: right;">
-
                 <%
                     if (jspUtil.isAdmin() || jspUtil.is(jspUtil.id(), "comment.insertUser") || (Boolean) request.getAttribute("edit")) {
                 %>
@@ -144,6 +161,9 @@
             </div>
             <div class="arrow_answer markdown">
                 <%=jspUtil.out("comment.comment", JspUtil.ESCAPE_NONE)%>
+                
+                <hr class="hrstyle01"/>
+                
                 <!-- コメントに付けた添付ファイルの表示 -->
                 <c:forEach var="file" items="${files}">
                     <c:if test="${file.commentNo == comment.commentNo}">
@@ -153,6 +173,19 @@
                         </div>
                     </c:if>
                 </c:forEach>
+                
+                <a href="<%=request.getContextPath()%>/open.knowledge/likeComments/<%=jspUtil.out("comment.getCommentNo()")%><%=jspUtil.out("params")%>"
+                    class="text-primary btn-link">
+                    <i class="fa fa-thumbs-o-up"></i>&nbsp;<%=jspUtil.label("knowledge.view.like")%> × 
+                    <span id="like_comment_count_<%=comment.getCommentNo()%>">
+                    <%=comment.getLikeCount()%>
+                    </span>
+                </a>
+                &nbsp;
+                <button class="btn btn-info btn-circle" onclick="addlikeComment(<%=comment.getCommentNo()%>);">
+                    <i class="fa fa-thumbs-o-up"></i>&nbsp;
+                </button>
+                
             </div>
             <!-- /.arrow_answer -->
         </div>
@@ -166,6 +199,7 @@
         <%
             }
         %>
+        
     </c:forEach>
     <br />
     <br />
diff --git a/src/main/webapp/css/common.css b/src/main/webapp/css/common.css
index 6255a1d12..5b1c021fc 100644
--- a/src/main/webapp/css/common.css
+++ b/src/main/webapp/css/common.css
@@ -184,3 +184,35 @@ body {
     display: none;
 }
 
+/* circle button style */
+.btn-circle.btn-xs{width:22px;height:22px;font-size:10px;border-radius:11px;line-height:1.6;padding:3px 0;}
+.btn-circle.btn-sm{width:30px;height:30px;font-size:12px;border-radius:15px;line-height:1.6;padding:6px 0;}
+.btn-circle       {width:34px;height:34px;font-size:16px;border-radius:17px;line-height:1.33;padding:6px 4px;text-align:center;}
+.btn-circle.btn-lg{width:46px;height:46px;font-size:22px;border-radius:23px;line-height:1.2;}
+
+/* round button style */
+.btn-round.btn-xs{border-radius:11px;}
+.btn-round.btn-sm{border-radius:22.5px;}
+.btn-round       {border-radius:17px;}
+.btn-round.btn-lg{border-radius:23px;}
+
+
+.markdown .hrstyle01 {
+    border:none;
+    background: none;
+    height:1px;
+    border-top: 1px solid #8c8b8b;
+    text-align: center;
+    color: #8c8b8b;
+}
+.markdown .hrstyle01:after {
+    content: '\002729';
+    display: inline-block;
+    position: relative;
+    top: -15px;
+    padding: 0 10px;
+    background: white;
+    color: #8c8b8b;
+    font-size: 18px;
+}
+
diff --git a/src/main/webapp/js/knowledge-view.js b/src/main/webapp/js/knowledge-view.js
index 0e4856da7..22a18b743 100644
--- a/src/main/webapp/js/knowledge-view.js
+++ b/src/main/webapp/js/knowledge-view.js
@@ -47,6 +47,24 @@ var addlike = function(knowledgeId) {
     });
 };
 
+var addlikeComment = function(commentNo) {
+    console.log(commentNo);
+    var url = _CONTEXT + '/open.knowledge/likecomment/' + commentNo;
+    $.ajax({
+        type : 'POST',
+        url : url,
+        success : function(data, dataType) {
+            console.log(data);
+            $('#like_comment_count_' + commentNo).text(data.count);
+            $.notify(LABEL_LIKE, 'info');
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown){
+            console.log(textStatus);
+        }
+    });
+};
+
+
 /*
 var viewProtect = function(knowledgeId) {
     var url = _CONTEXT + '/protect.knowledge/view_targets/' + knowledgeId;

From 47e694ff3cc23df579e2b8b19799777e467bddd4 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 9 Aug 2017 17:58:30 +0900
Subject: [PATCH 017/138] #444 Fix SQL syntax

---
 .../project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql
index b90b2b483..da271b141 100644
--- a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql
@@ -27,7 +27,7 @@ comment on column LIKE_COMMENTS.UPDATE_DATETIME is '更新日時';
 comment on column LIKE_COMMENTS.DELETE_FLAG is '削除フラグ';
 
 ALTER TABLE LIKES DROP COLUMN IF EXISTS LIKE_CLASS;
-ALTER TABLE LIKES ADD COLUMN LIKE_CLASS integer default 1
+ALTER TABLE LIKES ADD COLUMN LIKE_CLASS integer default 1;
 
 comment on column LIKES.LIKE_CLASS is '種類';
 

From 9c00787991a86a6c33ef5ca8e562a1a89252ebb9 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 9 Aug 2017 18:24:16 +0900
Subject: [PATCH 018/138] #444 Add some necessary tables to migrate sql

---
 .../deploy/v1_11_0/migrate_v1_11_1.sql        | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql
index da271b141..cf648aa53 100644
--- a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_1.sql
@@ -31,3 +31,58 @@ ALTER TABLE LIKES ADD COLUMN LIKE_CLASS integer default 1;
 
 comment on column LIKES.LIKE_CLASS is '種類';
 
+-- ユーザへの通知
+drop table if exists USER_NOTIFICATIONS cascade;
+
+create table USER_NOTIFICATIONS (
+  USER_ID INTEGER not null
+  , NO bigint not null
+  , STATUS integer
+  , ROW_ID character varying(64)
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint USER_NOTIFICATIONS_PKC primary key (USER_ID,NO)
+) ;
+
+-- 通知
+drop table if exists NOTIFICATIONS cascade;
+
+create table NOTIFICATIONS (
+  NO BIGSERIAL not null
+  , TITLE VARCHAR(256)
+  , CONTENT text
+  , ROW_ID character varying(64)
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint NOTIFICATIONS_PKC primary key (NO)
+) ;
+
+
+comment on table USER_NOTIFICATIONS is 'ユーザへの通知';
+comment on column USER_NOTIFICATIONS.USER_ID is 'ユーザID';
+comment on column USER_NOTIFICATIONS.NO is 'NO';
+comment on column USER_NOTIFICATIONS.STATUS is 'ステータス';
+comment on column USER_NOTIFICATIONS.ROW_ID is '行ID';
+comment on column USER_NOTIFICATIONS.INSERT_USER is '登録ユーザ';
+comment on column USER_NOTIFICATIONS.INSERT_DATETIME is '登録日時';
+comment on column USER_NOTIFICATIONS.UPDATE_USER is '更新ユーザ';
+comment on column USER_NOTIFICATIONS.UPDATE_DATETIME is '更新日時';
+comment on column USER_NOTIFICATIONS.DELETE_FLAG is '削除フラグ';
+
+comment on table NOTIFICATIONS is '通知';
+comment on column NOTIFICATIONS.NO is 'NO';
+comment on column NOTIFICATIONS.TITLE is 'タイトル';
+comment on column NOTIFICATIONS.CONTENT is 'メッセージ';
+comment on column NOTIFICATIONS.ROW_ID is '行ID';
+comment on column NOTIFICATIONS.INSERT_USER is '登録ユーザ';
+comment on column NOTIFICATIONS.INSERT_DATETIME is '登録日時';
+comment on column NOTIFICATIONS.UPDATE_USER is '更新ユーザ';
+comment on column NOTIFICATIONS.UPDATE_DATETIME is '更新日時';
+comment on column NOTIFICATIONS.DELETE_FLAG is '削除フラグ';
+

From e375547b3f9db001e85618ea492196e82e8356a1 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 9 Aug 2017 21:07:47 +0900
Subject: [PATCH 019/138] #444 Add null safe for unit test

---
 .../project/knowledge/entity/KnowledgesEntity.java     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/org/support/project/knowledge/entity/KnowledgesEntity.java b/src/main/java/org/support/project/knowledge/entity/KnowledgesEntity.java
index e90f1e38f..327689271 100644
--- a/src/main/java/org/support/project/knowledge/entity/KnowledgesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/KnowledgesEntity.java
@@ -66,6 +66,16 @@ public KnowledgesEntity(Long knowledgeId) {
         super(knowledgeId);
     }
     
+    /**
+     * Get 参照件数.(Safe null)
+     * @return 参照件数
+     */
+    public Long getViewCount() {
+        if (super.getViewCount() == null) return new Long(0);
+        return super.getViewCount();
+    }
+   
+    
     /**
      * 開始日時を指定のタイムゾーンの日時として取得
      * @param locale

From 497d3c3d73738871aa6d43d4d487afa6038ea3a1 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 10 Aug 2017 06:13:42 +0900
Subject: [PATCH 020/138] #444 Add a page of liked users list

---
 pom.xml                                       |  2 +-
 .../control/open/KnowledgeControl.java        | 37 +++++++++++++++++++
 .../knowledge/dao/LikeCommentsDao.java        |  9 +++++
 .../knowledge/entity/LikeCommentsEntity.java  | 25 +++++++++----
 .../LikeCommentsDao_selectOnCommentNo.sql     | 15 ++++++++
 .../partials/partials-view-comment-list.jsp   |  4 +-
 6 files changed, 81 insertions(+), 11 deletions(-)
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_selectOnCommentNo.sql

diff --git a/pom.xml b/pom.xml
index ec375efaf..ad97f4b40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.support-project</groupId>
             <artifactId>web</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 2a53b49fc..991b9f2e9 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -33,6 +33,7 @@
 import org.support.project.knowledge.entity.KnowledgeHistoriesEntity;
 import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.StocksEntity;
 import org.support.project.knowledge.entity.TagsEntity;
@@ -782,8 +783,44 @@ public Boundary likes() throws InvalidParamException {
     }
 
     
+    /**
+     * いいねを押したユーザを一覧表示（コメントに対し）
+     * 
+     * @return
+     * @throws InvalidParamException
+     */
+    @Get
+    public Boundary likecomments() throws InvalidParamException {
+        // 共通処理呼の表示条件の保持の呼び出し
+        setViewParam();
 
+        Long commentNo = super.getPathLong(Long.valueOf(-1));
+        CommentsEntity comment = CommentsDao.get().selectOnKey(commentNo);
+        if (comment == null) {
+            return sendError(HttpStatus.SC_404_NOT_FOUND, "NOT FOUND");
+        }
+        setAttribute("knowledgeId", comment.getKnowledgeId());
+        setAttribute("commentNo", comment.getKnowledgeId());
 
+        Integer page = 0;
+        String p = getParamWithDefault("page", "");
+        if (StringUtils.isInteger(p)) {
+            page = Integer.parseInt(p);
+        }
+
+        List<LikeCommentsEntity> likes = LikeCommentsDao.get().selectOnCommentNo(commentNo, page * PAGE_LIMIT, PAGE_LIMIT);
+        setAttribute("likes", likes);
+
+        int previous = page - 1;
+        if (previous < 0) {
+            previous = 0;
+        }
+        setAttribute("page", page);
+        setAttribute("previous", previous);
+        setAttribute("next", page + 1);
+        
+        return forward("likes.jsp");
+    }
     
     /**
      * 編集履歴の表示
diff --git a/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
index d6e8767d1..9c3c31f67 100644
--- a/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
@@ -1,9 +1,13 @@
 package org.support.project.knowledge.dao;
 
+import java.util.List;
+
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.dao.gen.GenLikeCommentsDao;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
+import org.support.project.ormapping.common.SQLManager;
 
 /**
  * コメントのイイネ
@@ -26,6 +30,11 @@ public Long selectOnCommentNo(Long commentNo) {
         return super.executeQuerySingle(sql, Long.class, commentNo);
     }
 
+    public List<LikeCommentsEntity> selectOnCommentNo(Long commentNo, int offset, int limit) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_selectOnCommentNo.sql");
+        return executeQueryList(sql, LikeCommentsEntity.class, commentNo, limit, offset);
+    }
+
 
 
 }
diff --git a/src/main/java/org/support/project/knowledge/entity/LikeCommentsEntity.java b/src/main/java/org/support/project/knowledge/entity/LikeCommentsEntity.java
index c00cae596..b80134181 100644
--- a/src/main/java/org/support/project/knowledge/entity/LikeCommentsEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/LikeCommentsEntity.java
@@ -1,16 +1,9 @@
 package org.support.project.knowledge.entity;
 
-import org.support.project.knowledge.entity.gen.GenLikeCommentsEntity;
-
-import java.util.List;
-import java.util.Map;
-
-import org.support.project.common.bean.ValidateError;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-
-import java.sql.Timestamp;
+import org.support.project.knowledge.entity.gen.GenLikeCommentsEntity;
 
 
 /**
@@ -22,6 +15,8 @@ public class LikeCommentsEntity extends GenLikeCommentsEntity {
     /** SerialVersion */
     private static final long serialVersionUID = 1L;
 
+    private String userName;
+
     /**
      * Get instance from DI container.
      * @return instance
@@ -46,4 +41,18 @@ public LikeCommentsEntity(Long no) {
         super( no);
     }
 
+    /**
+     * @return the userName
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * @param userName the userName to set
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
 }
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_selectOnCommentNo.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_selectOnCommentNo.sql
new file mode 100644
index 000000000..4e1f8de5b
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_selectOnCommentNo.sql
@@ -0,0 +1,15 @@
+SELECT
+        LIKE_COMMENTS.*,
+        USERS.USER_NAME
+    FROM
+        LIKE_COMMENTS
+        LEFT OUTER JOIN USERS ON (LIKE_COMMENTS.INSERT_USER = USERS.USER_ID)
+    WHERE
+        LIKE_COMMENTS.COMMENT_NO = ?
+        AND LIKE_COMMENTS.DELETE_FLAG = 0
+    ORDER BY
+        LIKE_COMMENTS.UPDATE_DATETIME DESC LIMIT ? OFFSET ?;
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
index 0cc40aec1..f007f8ebb 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
@@ -88,7 +88,7 @@
                     </c:if>
                 </c:forEach>
                 
-                <a href="<%=request.getContextPath()%>/open.knowledge/likeComments/<%=jspUtil.out("comment.getCommentNo()")%><%=jspUtil.out("params")%>"
+                <a href="<%=request.getContextPath()%>/open.knowledge/likecomments/<%=jspUtil.out("comment.getCommentNo()")%><%=jspUtil.out("params")%>"
                     class="text-primary btn-link">
                     <i class="fa fa-thumbs-o-up"></i>&nbsp;<%=jspUtil.label("knowledge.view.like")%> × 
                     <span id="like_comment_count_<%=comment.getCommentNo()%>">
@@ -174,7 +174,7 @@
                     </c:if>
                 </c:forEach>
                 
-                <a href="<%=request.getContextPath()%>/open.knowledge/likeComments/<%=jspUtil.out("comment.getCommentNo()")%><%=jspUtil.out("params")%>"
+                <a href="<%=request.getContextPath()%>/open.knowledge/likecomments/<%=jspUtil.out("comment.getCommentNo()")%><%=jspUtil.out("params")%>"
                     class="text-primary btn-link">
                     <i class="fa fa-thumbs-o-up"></i>&nbsp;<%=jspUtil.label("knowledge.view.like")%> × 
                     <span id="like_comment_count_<%=comment.getCommentNo()%>">

From a37bea86040600a0ae2598f3c9722aeac2efe904 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 11 Aug 2017 04:33:26 +0900
Subject: [PATCH 021/138] #819 Add like config for system config page

---
 .../knowledge/config/SystemConfig.java        |  7 +++++++
 .../control/admin/ConfigControl.java          | 14 ++++++++++++-
 src/main/resources/appresource.properties     |  5 ++++-
 src/main/resources/appresource_ja.properties  |  3 +++
 .../WEB-INF/views/admin/config/system.jsp     | 21 +++++++++++++++++--
 5 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/config/SystemConfig.java b/src/main/java/org/support/project/knowledge/config/SystemConfig.java
index 087112f17..ba27710cc 100644
--- a/src/main/java/org/support/project/knowledge/config/SystemConfig.java
+++ b/src/main/java/org/support/project/knowledge/config/SystemConfig.java
@@ -61,6 +61,13 @@ public class SystemConfig {
     /** 全ての機能は、ログインしないとアクセス出来ない */
     public static final String SYSTEM_EXPOSE_TYPE_CLOSE = "CLOSE";
 
+    /** いいね！の登録制限の設定キー */
+    public static final String LIKE_CONFIG = "LIKE_CONFIG";
+    /** いいね！の登録制限の値：複数回押せる */
+    public static final String LIKE_CONFIG_MANY = "MANY";
+    /** いいね！の登録制限の値：１回のみ押せる（ログイン必須） */
+    public static final String LIKE_CONFIG_ONLY_ONE = "ONLY_ONE";
+    
     /** UIのテーマの設定のキー */
     public static final String CONFIG_KEY_THEMA = "THEMA";
     /** Cookieにセットする際のキー：参照履歴 */
diff --git a/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java b/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java
index 5a8dd9d6f..d1a65b3a4 100644
--- a/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java
+++ b/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java
@@ -134,6 +134,11 @@ public Boundary system() {
             setAttribute("uploadMaxMBSize", "10"); // default
         }
 
+        config = dao.selectOnKey(SystemConfig.LIKE_CONFIG, AppConfig.get().getSystemName());
+        if (config != null) {
+            setAttribute("like_config", config.getConfigValue());
+        }
+        
         return forward("system.jsp");
     }
 
@@ -190,7 +195,14 @@ public Boundary save_params() {
         config = new SystemConfigsEntity(SystemConfig.UPLOAD_MAX_MB_SIZE, AppConfig.get().getSystemName());
         config.setConfigValue(uploadMaxMBSize);
         dao.save(config);
-
+        
+        String like_config = getParam("like_config");
+        if (StringUtils.isNotEmpty(like_config)) {
+            config = new SystemConfigsEntity(SystemConfig.LIKE_CONFIG, AppConfig.get().getSystemName());
+            config.setConfigValue(like_config);
+            dao.save(config);
+        }
+        
         String successMsg = "message.success.save";
         setResult(successMsg, errors);
 
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index e3227786a..4e1dee8da 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -414,9 +414,12 @@ knowledge.config.mail=Mail transmission settings
 knowledge.config.system.title=System Config
 knowledge.config.system.label.url=Service URL
 knowledge.config.system.label.limit.attach=Maximum size of attached file (MB)
-knowledge.config.system.open.title=Publishing Settings
+knowledge.config.system.open.title=Publishing setting
 knowledge.config.system.open=No login is required
 knowledge.config.system.close=Login is required
+knowledge.config.system.like=Registration settings of "Like"
+knowledge.config.system.like.many=Can be registered any number of times.
+knowledge.config.system.like.onlyone=Can be registered only one. (Sign in required)
 knowledge.config.thema=Thema select
 knowledge.config.thema.enable=Enable
 knowledge.config.thema.now=Now
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index f0f0fb781..0a77fdf37 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -417,6 +417,9 @@ knowledge.config.system.label.limit.attach=添付ファイルの最大サイズ
 knowledge.config.system.open.title=システムの公開設定
 knowledge.config.system.open=公開情報などには、ログインしなくてもアクセス可能
 knowledge.config.system.close=全ての機能には、ログインしないとアクセス不可
+knowledge.config.system.like=いいね！の登録設定
+knowledge.config.system.like.many=いいね！は何回でも押せる
+knowledge.config.system.like.onlyone=いいね！一度きり押せる（未ログインユーザは押せない）
 knowledge.config.thema=テーマ選択
 knowledge.config.thema.enable=有効にする
 knowledge.config.thema.now=現在のテーマ
diff --git a/src/main/webapp/WEB-INF/views/admin/config/system.jsp b/src/main/webapp/WEB-INF/views/admin/config/system.jsp
index 86e0895f4..859cae6ec 100644
--- a/src/main/webapp/WEB-INF/views/admin/config/system.jsp
+++ b/src/main/webapp/WEB-INF/views/admin/config/system.jsp
@@ -38,11 +38,11 @@
     
     
     <div class="form-group">
-        <label for="authType_lock"><%= jspUtil.label("knowledge.config.system.open") %></label><br/>
+        <label for="authType_lock"><%= jspUtil.label("knowledge.config.system.open.title") %></label><br/>
         <label class="radio-inline radio_block">
             <input type="radio" value="<%=SystemConfig.SYSTEM_EXPOSE_TYPE_OPEN%>" name="system_open_type" 
                 id="system_open_type_open" <%=jspUtil.checked(SystemConfig.SYSTEM_EXPOSE_TYPE_OPEN, "system_open_type", true)%>/>
-            <i class="fa fa-gavel fa-lg"></i>&nbsp;<%= jspUtil.label("knowledge.config.system.open") %>
+            <i class="fa fa-unlock fa-lg"></i>&nbsp;<%= jspUtil.label("knowledge.config.system.open") %>
         </label>
         <br/>
         <label class="radio-inline radio_block">
@@ -60,6 +60,23 @@
             value="<%= jspUtil.out("uploadMaxMBSize") %>" />
     </div>
     
+    <div class="form-group">
+        <label for="authType_lock"><%= jspUtil.label("knowledge.config.system.like") %></label><br/>
+        <label class="radio-inline radio_block">
+            <input type="radio" value="<%=SystemConfig.LIKE_CONFIG_MANY%>" name="like_config" 
+                id="like_config_many" <%=jspUtil.checked(SystemConfig.LIKE_CONFIG_MANY, "like_config", true)%>/>
+            <i class="fa fa-unlock fa-lg"></i>&nbsp;<%= jspUtil.label("knowledge.config.system.like.many") %>
+        </label>
+        <br/>
+        <label class="radio-inline radio_block">
+            <input type="radio" value="<%=SystemConfig.LIKE_CONFIG_ONLY_ONE%>" name="like_config" 
+                id="like_config_onlyone" <%=jspUtil.checked(SystemConfig.LIKE_CONFIG_ONLY_ONE, "like_config", false)%>/>
+            <i class="fa fa-lock fa-lg"></i>&nbsp;<%= jspUtil.label("knowledge.config.system.like.onlyone") %>
+        </label>
+    </div>
+    
+    
+    
     <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i>&nbsp;<%= jspUtil.label("label.save") %></button>
 </form>
 

From d345a0a1f981d8ad5c711eba65a5b65e9a240494 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 11 Aug 2017 05:24:42 +0900
Subject: [PATCH 022/138] #819 Add a check that Like is unique

---
 .../control/open/KnowledgeControl.java        |  4 +-
 .../knowledge/dao/LikeCommentsDao.java        |  5 ++
 .../project/knowledge/dao/LikesDao.java       |  5 ++
 .../knowledge/logic/KnowledgeLogic.java       | 55 ++++++++++++++++++-
 src/main/resources/appresource.properties     |  2 +
 src/main/resources/appresource_ja.properties  |  2 +
 src/main/webapp/js/knowledge-view.js          |  8 ++-
 7 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 991b9f2e9..83baeb3ea 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -654,7 +654,7 @@ public Boundary stocks() throws InvalidParamException {
     public Boundary like() throws InvalidParamException {
         Long knowledgeId = super.getPathLong(Long.valueOf(-1));
         KnowledgeLogic knowledgeLogic = KnowledgeLogic.get();
-        Long count = knowledgeLogic.addLike(knowledgeId, getLoginedUser());
+        Long count = knowledgeLogic.addLike(knowledgeId, getLoginedUser(), getLocale());
         LikeCount likeCount = new LikeCount();
         likeCount.setKnowledgeId(knowledgeId);
         likeCount.setCount(count);
@@ -669,7 +669,7 @@ public Boundary like() throws InvalidParamException {
     public Boundary likecomment() throws InvalidParamException {
         Long commentNo = super.getPathLong(Long.valueOf(-1));
         KnowledgeLogic knowledgeLogic = KnowledgeLogic.get();
-        Long count = knowledgeLogic.addLikeComment(commentNo, getLoginedUser());
+        Long count = knowledgeLogic.addLikeComment(commentNo, getLoginedUser(), getLocale());
         LikeCount likeCount = new LikeCount();
         likeCount.setCount(count);
         return send(likeCount);
diff --git a/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
index 9c3c31f67..3893b0861 100644
--- a/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
@@ -35,6 +35,11 @@ public List<LikeCommentsEntity> selectOnCommentNo(Long commentNo, int offset, in
         return executeQueryList(sql, LikeCommentsEntity.class, commentNo, limit, offset);
     }
 
+    public LikeCommentsEntity selectExistsOnUser(Long commentNo, Integer userId) {
+        String sql = "SELECT * FROM LIKE_COMMENTS WHERE COMMENT_NO = ? AND INSERT_USER = ? LIMIT 1 OFFSET 0";
+        return super.executeQuerySingle(sql, LikeCommentsEntity.class, commentNo, userId);
+    }
+
 
 
 }
diff --git a/src/main/java/org/support/project/knowledge/dao/LikesDao.java b/src/main/java/org/support/project/knowledge/dao/LikesDao.java
index 1bb8ad8e9..48e432335 100644
--- a/src/main/java/org/support/project/knowledge/dao/LikesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/LikesDao.java
@@ -37,4 +37,9 @@ public List<LikesEntity> selectOnKnowledge(Long knowledgeId, int offset, int lim
         return executeQueryList(sql, LikesEntity.class, knowledgeId, limit, offset);
     }
 
+    public LikesEntity selectExistsOnUser(Long knowledgeId, Integer userId) {
+        String sql = "SELECT * FROM LIKES WHERE KNOWLEDGE_ID = ? AND INSERT_USER = ? LIMIT 1 OFFSET 0";
+        return super.executeQuerySingle(sql, LikesEntity.class, knowledgeId, userId);
+    }
+
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index d68a54157..61efce7c4 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -6,9 +6,11 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.support.project.aop.Aspect;
+import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.HtmlUtils;
@@ -19,6 +21,7 @@
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.bat.FileParseBat;
+import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.IndexType;
 import org.support.project.knowledge.config.SystemConfig;
 import org.support.project.knowledge.dao.CommentsDao;
@@ -70,8 +73,14 @@
 import org.support.project.knowledge.vo.StockKnowledge;
 import org.support.project.web.bean.LabelValue;
 import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.common.HttpStatus;
+import org.support.project.web.config.MessageStatus;
+import org.support.project.web.dao.SystemConfigsDao;
 import org.support.project.web.entity.GroupsEntity;
+import org.support.project.web.entity.SystemConfigsEntity;
 import org.support.project.web.exception.AuthenticateException;
+import org.support.project.web.exception.InvalidParamException;
 
 /**
  * Logic class for knowledge data
@@ -1104,15 +1113,42 @@ public void addViewHistory(Long knowledgeId, LoginedUser loginedUser) {
             KnowledgesDao.get().updateViewCount(count, knowledgeId);
         }
     }
-
+    
+    /**
+     * イイネの重複チェックを行うかをシステム設定情報から取得
+     * @return
+     */
+    private boolean getCheckOfLike() {
+        boolean check = false;
+        SystemConfigsEntity config = SystemConfigsDao.get().selectOnKey(SystemConfig.LIKE_CONFIG, AppConfig.get().getSystemName());
+        if (config != null) {
+            if (SystemConfig.LIKE_CONFIG_ONLY_ONE.equals(config.getConfigValue())) {
+                check = true;
+            }
+        }
+        return check;
+    }
     /**
      * いいね！を追加
      * 
      * @param knowledgeId
      * @param loginedUser
      * @return
+     * @throws InvalidParamException 
      */
-    public Long addLike(Long knowledgeId, LoginedUser loginedUser) {
+    public Long addLike(Long knowledgeId, LoginedUser loginedUser, Locale locale) throws InvalidParamException {
+        if (getCheckOfLike()) {
+            Resources resources = Resources.getInstance(locale);
+            if (loginedUser == null || loginedUser.getUserId().equals(Integer.MIN_VALUE)) {
+                throw new InvalidParamException(new MessageResult(
+                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.required.signin"), ""));
+            }
+            LikesEntity likesEntity = LikesDao.get().selectExistsOnUser(knowledgeId, loginedUser.getUserId());
+            if (likesEntity != null) {
+                throw new InvalidParamException(new MessageResult(
+                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.duplicate"), ""));
+            }
+        }
         LikesDao likesDao = LikesDao.get();
         LikesEntity likesEntity = new LikesEntity();
         likesEntity.setKnowledgeId(knowledgeId);
@@ -1132,8 +1168,21 @@ public Long addLike(Long knowledgeId, LoginedUser loginedUser) {
      * @param commentNo
      * @param loginedUser
      * @return
+     * @throws InvalidParamException 
      */
-    public Long addLikeComment(Long commentNo, LoginedUser loginedUser) {
+    public Long addLikeComment(Long commentNo, LoginedUser loginedUser, Locale locale) throws InvalidParamException {
+        if (getCheckOfLike()) {
+            Resources resources = Resources.getInstance(locale);
+            if (loginedUser == null || loginedUser.getUserId().equals(Integer.MIN_VALUE)) {
+                throw new InvalidParamException(new MessageResult(
+                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.required.signin"), ""));
+            }
+            LikeCommentsEntity like = LikeCommentsDao.get().selectExistsOnUser(commentNo, loginedUser.getUserId());
+            if (like != null) {
+                throw new InvalidParamException(new MessageResult(
+                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.duplicate"), ""));
+            }
+        }
         LikeCommentsEntity like = new LikeCommentsEntity();
         like.setCommentNo(commentNo);
         LikeCommentsDao.get().insert(like);
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 4e1dee8da..cf8257728 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -318,6 +318,8 @@ knowledge.delete.none=Knowledge to be deleted is not specified
 knowledge.likes.title=User list that was me press the "Like"
 knowledge.likes.list.label.empty=In this page, the user presses the "Like" did not have
 knowledge.likes.anonymous=Anonymous (not sign in user)
+knowledge.likes.duplicate=Already registered（Register a "Like" is only one time）
+knowledge.likes.required.signin=Sign in required.
 
 knowledge.histories.title=History
 knowledge.histories.list.label.empty=Empty
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index 0a77fdf37..d922744c4 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -318,6 +318,8 @@ knowledge.delete.none=削除するナレッジが指定されていません
 knowledge.likes.title=「いいね！」を押してくれたユーザ一覧
 knowledge.likes.list.label.empty=このページでは、「いいね！」を押したユーザはいませんでした
 knowledge.likes.anonymous=Anonymous(未ログインユーザ)
+knowledge.likes.duplicate=登録済です（いいね！は一人一回登録できます）
+knowledge.likes.required.signin=いいね！を登録できるのはサインインしたユーザのみです
 
 knowledge.histories.title=更新履歴
 knowledge.histories.list.label.empty=データが存在しません。
diff --git a/src/main/webapp/js/knowledge-view.js b/src/main/webapp/js/knowledge-view.js
index 22a18b743..f272a381e 100644
--- a/src/main/webapp/js/knowledge-view.js
+++ b/src/main/webapp/js/knowledge-view.js
@@ -42,7 +42,9 @@ var addlike = function(knowledgeId) {
             $.notify(LABEL_LIKE, 'info');
         },
         error: function(XMLHttpRequest, textStatus, errorThrown){
-            console.log(textStatus);
+            if (XMLHttpRequest.status === 403 && XMLHttpRequest.responseJSON) {
+                $.notify(XMLHttpRequest.responseJSON.message, 'warn');
+            }
         }
     });
 };
@@ -59,7 +61,9 @@ var addlikeComment = function(commentNo) {
             $.notify(LABEL_LIKE, 'info');
         },
         error: function(XMLHttpRequest, textStatus, errorThrown){
-            console.log(textStatus);
+            if (XMLHttpRequest.status === 403 && XMLHttpRequest.responseJSON) {
+                $.notify(XMLHttpRequest.responseJSON.message, 'warn');
+            }
         }
     });
 };

From 50441827989bb0747bceca44529fdb8ce1f4d322 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 13 Aug 2017 08:17:04 +0900
Subject: [PATCH 023/138] #823 Fix typo from
 "knowledge.auth.label.request.init.passwoed" to
 "knowledge.auth.label.request.init.password".

---
 src/main/resources/appresource.properties     |  2 +-
 src/main/resources/appresource_ja.properties  |  2 +-
 .../forgot_pass_request.jsp                   | 58 +++++++++----------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index cf8257728..1750fa2c4 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -177,7 +177,7 @@ knowledge.auth.label.password=Password
 knowledge.auth.title.forgot.password=Forgot password 
 knowledge.auth.msg.forgot.password=Please enter the email address of your account
 knowledge.auth.label.back.to.signin=Back to Sign In
-knowledge.auth.label.request.init.passwoed=you will send the password initialization mail
+knowledge.auth.label.request.init.password=you will send the password initialization mail
 knowledge.auth.msg.accept.request=I have accepted the request of password initialization. Because we send an email for password initialization to <br/> specified e-mail address, please complete the processing.
 knowledge.auth.msg.change.password=Please complete the initialization by entering the password for the account
 knowledge.auth.label.change.password=Password initialization
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index d922744c4..c010a073e 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -177,7 +177,7 @@ knowledge.auth.label.password=パスワード
 knowledge.auth.title.forgot.password=パスワード忘れのリクエスト
 knowledge.auth.msg.forgot.password=アカウントのメールアドレスを入力してください
 knowledge.auth.label.back.to.signin=サインインへ戻る
-knowledge.auth.label.request.init.passwoed=パスワード初期化メールを送信
+knowledge.auth.label.request.init.password=パスワード初期化メールを送信
 knowledge.auth.msg.accept.request=パスワード初期化のリクエストを受け付けました。<br/>指定のメールアドレスにパスワード初期化用のメールを送信しましたので、処理を完了してください。
 knowledge.auth.msg.change.password=アカウントのパスワードを入力して初期化を完了してください
 knowledge.auth.label.change.password=パスワード初期化
diff --git a/src/main/webapp/WEB-INF/views/open/passwordinitialization/forgot_pass_request.jsp b/src/main/webapp/WEB-INF/views/open/passwordinitialization/forgot_pass_request.jsp
index dc8a42872..3f9c073e6 100644
--- a/src/main/webapp/WEB-INF/views/open/passwordinitialization/forgot_pass_request.jsp
+++ b/src/main/webapp/WEB-INF/views/open/passwordinitialization/forgot_pass_request.jsp
@@ -17,35 +17,35 @@
 <c:param name="PARAM_CONTENT">
 <h4 class="title"><%= jspUtil.label("knowledge.auth.title.forgot.password") %></h4>
 
-	<div class="container">
-		<form class=""
-			action="<%=request.getContextPath()%>/open.PasswordInitialization/request"
-			name="login" method="post">
-			
-			<%= jspUtil.label("knowledge.auth.msg.forgot.password") %>
-			
-			<div class="form-group">
-				<label for="inputEmail" class="control-label"><%= jspUtil.label("knowledge.auth.label.mail") %></label>
-				<div class="">
-				<input type="text" class="form-control"
-					name="username" value="<%= jspUtil.out("username") %>"
-					placeholder="Email address" autofocus>
-				</div>
-			</div>
-			<div class="form-group">
-				<div class="">
-					<button class="btn btn-primary " type="submit">
-						<i class="fa fa-sign-in"></i>&nbsp;<%= jspUtil.label("knowledge.auth.label.request.init.passwoed") %>
-					</button>
-					<a href="<%= request.getContextPath() %>/signin" class="btn btn-info">
-						<i class="fa fa-sign-in"></i>&nbsp;<%= jspUtil.label("knowledge.auth.label.back.to.signin") %>
-					</a>
-				</div>
-			</div>
-		</form>
-
-	</div>
-	
+    <div class="container">
+        <form class=""
+            action="<%=request.getContextPath()%>/open.PasswordInitialization/request"
+            name="login" method="post">
+            
+            <%= jspUtil.label("knowledge.auth.msg.forgot.password") %>
+            
+            <div class="form-group">
+                <label for="inputEmail" class="control-label"><%= jspUtil.label("knowledge.auth.label.mail") %></label>
+                <div class="">
+                <input type="text" class="form-control"
+                    name="username" value="<%= jspUtil.out("username") %>"
+                    placeholder="Email address" autofocus>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="">
+                    <button class="btn btn-primary " type="submit">
+                        <i class="fa fa-sign-in"></i>&nbsp;<%= jspUtil.label("knowledge.auth.label.request.init.password") %>
+                    </button>
+                    <a href="<%= request.getContextPath() %>/signin" class="btn btn-info">
+                        <i class="fa fa-sign-in"></i>&nbsp;<%= jspUtil.label("knowledge.auth.label.back.to.signin") %>
+                    </a>
+                </div>
+            </div>
+        </form>
+
+    </div>
+    
 </c:param>
 
 </c:import>

From 9d0331c8c7ee9e14959d7e25e1b009ca329e35fd Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 13 Aug 2017 08:24:06 +0900
Subject: [PATCH 024/138] #823 Change resource key from `label.draft`
 &`label.delete` to `label.delete.draft`

---
 src/main/resources/appresource.properties                     | 2 ++
 src/main/resources/appresource_ja.properties                  | 2 ++
 .../protect/knowledge/partials/partials-edit-buttons.jsp      | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 1750fa2c4..db2a01dbd 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -115,6 +115,8 @@ label.move.up=Move Up
 label.move.down=Move Down
 label.unread=Unread
 label.read=Read
+label.save.draft=Save draft
+label.delete.draft=Delete draft
 
 label.public.view=<i class="fa fa-globe"></i>&nbsp;[Public]
 label.protect.view=<i class="fa fa-gavel"></i>&nbsp;[Protection]
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index c010a073e..ff5667fcb 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -115,6 +115,8 @@ label.move.up=上へ移動
 label.move.down=下へ移動
 label.unread=未読
 label.read=既読
+label.save.draft=下書き保存
+label.delete.draft=下書き削除
 
 label.public.view=<i class="fa fa-globe"></i>&nbsp;[公開]
 label.protect.view=<i class="fa fa-gavel"></i>&nbsp;[保護]
diff --git a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-buttons.jsp b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-buttons.jsp
index 40d8cc2de..7e145bb01 100644
--- a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-buttons.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-buttons.jsp
@@ -28,10 +28,10 @@
     </div>
     <div>
         <button type="submit" class="btn btn-info btn_2" id="draftbutton">
-            <i class="fa fa-save"></i>&nbsp;<%= jspUtil.label("label.draft") + jspUtil.label("label.save") %>
+            <i class="fa fa-save"></i>&nbsp;<%= jspUtil.label("label.save.draft") %>
         </button>
         <button type="button" class="btn btn-info btn_2 text-warning <%= draftDeleteHide %>" onclick="" id="draftDeleteButton">
-            <i class="fa fa-eraser"></i>&nbsp; <%= jspUtil.label("label.draft") + jspUtil.label("label.delete") %>
+            <i class="fa fa-eraser"></i>&nbsp; <%= jspUtil.label("label.delete.draft") %>
         </button>
     </div>
     <div>

From 66e265baa20280aa88e037ca0bc3d4a3aa697958 Mon Sep 17 00:00:00 2001
From: nagodon <nagodon@gmail.com>
Date: Tue, 15 Aug 2017 04:14:06 +0900
Subject: [PATCH 025/138] #757 fix target labels

---
 .../control/open/KnowledgeControl.java        |   4 +-
 .../control/protect/KnowledgeControl.java     |  11 +-
 .../project/knowledge/logic/TargetLogic.java  | 106 ++++++++++++++++++
 3 files changed, 114 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 83baeb3ea..e96e66c8d 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -196,11 +196,11 @@ public Boundary view() throws InvalidParamException, ParseException {
 
         // 表示するグループを取得
         // List<GroupsEntity> groups = GroupLogic.get().selectGroupsOnKnowledgeId(knowledgeId);
-        List<LabelValue> groups = TargetLogic.get().selectTargetsOnKnowledgeId(knowledgeId);
+        List<LabelValue> groups = TargetLogic.get().selectTargetsViewOnKnowledgeId(knowledgeId, loginedUser);
         setAttribute("groups", groups);
 
         // 編集権限
-        List<LabelValue> editors = TargetLogic.get().selectEditorsOnKnowledgeId(knowledgeId);
+        List<LabelValue> editors = TargetLogic.get().selectEditorsViewOnKnowledgeId(knowledgeId, loginedUser);
         setAttribute("editors", editors);
         boolean edit = knowledgeLogic.isEditor(loginedUser, entity, editors);
         setAttribute("edit", edit);
diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index b030278c0..9db9fe6fd 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -149,20 +149,21 @@ public Boundary view_edit() throws InvalidParamException {
         if (draft != null) {
             super.setDraftInfo(draft);
         } else {
+            // 編集権限チェック
+            LoginedUser loginedUser = super.getLoginedUser();
+
             // ナレッジに紐づく添付ファイルを取得
             List<UploadFile> files = fileLogic.selectOnKnowledgeIdWithoutCommentFiles(knowledgeId, getRequest().getContextPath());
             setAttribute("files", files);
 
             // 表示するグループを取得
-            List<LabelValue> groups = TargetLogic.get().selectTargetsOnKnowledgeId(knowledgeId);
+            List<LabelValue> groups = TargetLogic.get().selectTargetsViewOnKnowledgeId(knowledgeId, loginedUser);
             setAttribute("groups", groups);
 
             // 共同編集者
-            List<LabelValue> editors = TargetLogic.get().selectEditorsOnKnowledgeId(knowledgeId);
+            List<LabelValue> editors = TargetLogic.get().selectEditorsViewOnKnowledgeId(knowledgeId, loginedUser);
             setAttribute("editors", editors);
-            
-            // 編集権限チェック
-            LoginedUser loginedUser = super.getLoginedUser();
+
             boolean edit = knowledgeLogic.isEditor(loginedUser, entity, editors);
             if (!edit) {
                 setAttribute("edit", false);
diff --git a/src/main/java/org/support/project/knowledge/logic/TargetLogic.java b/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
index 157de99eb..1b456dd62 100644
--- a/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
@@ -15,8 +15,10 @@
 import org.support.project.knowledge.dao.TargetsDao;
 import org.support.project.web.bean.LabelValue;
 import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.UserGroupsDao;
 import org.support.project.web.dao.UsersDao;
 import org.support.project.web.entity.GroupsEntity;
+import org.support.project.web.entity.UserGroupsEntity;
 import org.support.project.web.entity.UsersEntity;
 
 @DI(instance = Instance.Singleton)
@@ -125,9 +127,13 @@ public Map<Long, List<LabelValue>> selectTargetsOnKnowledgeIds(List<Long> knowle
         }
 
         TargetsDao targetsDao = TargetsDao.get();
+        List<Integer> groupIds = new ArrayList<Integer>();
+        Map<Long, List<Integer>> groupIdMaps = new HashMap<Long, List<Integer>>();
+        Map<Integer, List<Integer>> groupUserIds = new HashMap<Integer, List<Integer>>();
 
         for (Long knowledgeId : knowledgeIds) {
             results.put(knowledgeId, new ArrayList<LabelValue>());
+            groupIdMaps.put(knowledgeId, new ArrayList<Integer>());
         }
 
         List<GroupsEntity> groups = targetsDao.selectGroupsOnKnowledgeIds(knowledgeIds);
@@ -136,6 +142,17 @@ public Map<Long, List<LabelValue>> selectTargetsOnKnowledgeIds(List<Long> knowle
             labelValue.setLabel(NAME_PREFIX_GROUP + groupsEntity.getGroupName());
             labelValue.setValue(ID_PREFIX_GROUP + groupsEntity.getGroupId());
             results.get(groupsEntity.getKnowledgeId()).add(labelValue);
+            groupIdMaps.get(groupsEntity.getKnowledgeId()).add(groupsEntity.getGroupId());
+            groupIds.add(groupsEntity.getGroupId());
+            groupUserIds.put(groupsEntity.getGroupId(), new ArrayList<Integer>());
+        }
+
+        // フィルターするためにグループに所属するユーザーを取得する
+        if (!groupIds.isEmpty()) {
+            List<UserGroupsEntity> userGroups = UserGroupsDao.get().selectOnGroupIds(groupIds);
+            for (UserGroupsEntity userGroupsEntity : userGroups) {
+                groupUserIds.get(userGroupsEntity.getGroupId()).add(userGroupsEntity.getUserId());
+            }
         }
 
         List<UsersEntity> users = targetsDao.selectUsersOnKnowledgeIds(knowledgeIds);
@@ -144,6 +161,14 @@ public Map<Long, List<LabelValue>> selectTargetsOnKnowledgeIds(List<Long> knowle
             if (usersEntity.getUserId().intValue() == loginedUser.getUserId().intValue()) {
                 continue;
             }
+
+            // グループに公開されていてかつそのグループに所属してる場合もスキップ
+            for (Integer groupId : groupIdMaps.get(usersEntity.getKnowledgeId())) {
+                if (groupUserIds.get(groupId).contains(usersEntity.getUserId())) {
+                    continue;
+                }            		
+            }
+
             LabelValue labelValue = new LabelValue();
             labelValue.setLabel(NAME_PREFIX_USER + usersEntity.getUserName());
             labelValue.setValue(ID_PREFIX_USER + usersEntity.getUserId());
@@ -163,11 +188,13 @@ public List<LabelValue> selectEditorsOnKnowledgeId(Long knowledgeId) {
         List<LabelValue> results = new ArrayList<>();
         TargetsDao targetsDao = TargetsDao.get();
         List<GroupsEntity> groups = targetsDao.selectEditorGroupsOnKnowledgeId(knowledgeId);
+        List<Integer> groupIds = new ArrayList<Integer>();
         for (GroupsEntity groupsEntity : groups) {
             LabelValue labelValue = new LabelValue();
             labelValue.setLabel(NAME_PREFIX_GROUP + groupsEntity.getGroupName());
             labelValue.setValue(ID_PREFIX_GROUP + groupsEntity.getGroupId());
             results.add(labelValue);
+            groupIds.add(groupsEntity.getGroupId());
         }
         List<UsersEntity> users = targetsDao.selectEditorUsersOnKnowledgeId(knowledgeId);
         for (UsersEntity usersEntity : users) {
@@ -179,6 +206,85 @@ public List<LabelValue> selectEditorsOnKnowledgeId(Long knowledgeId) {
         return results;
     }
 
+    /**
+     * ナレッジに指定されているアクセス可能なグループを取得(表示用)
+     *
+     * @param knowledgeId
+     * @param loginedUser
+     * @return
+     */
+    public List<LabelValue> selectTargetsViewOnKnowledgeId(Long knowledgeId, LoginedUser loginedUser) {
+        TargetsDao targetsDao = TargetsDao.get();
+        List<GroupsEntity> groups = targetsDao.selectGroupsOnKnowledgeId(knowledgeId);
+        List<UsersEntity> users = targetsDao.selectUsersOnKnowledgeId(knowledgeId);
+
+        return filterTargetLabel(groups, users, loginedUser);
+    }
+
+    /**
+     * ナレッジに指定されている編集可能なグループを取得(表示用)
+     *
+     * @param knowledgeId
+     * @param loginedUser
+     * @return
+     */
+    public List<LabelValue> selectEditorsViewOnKnowledgeId(Long knowledgeId, LoginedUser loginedUser) {
+        TargetsDao targetsDao = TargetsDao.get();
+        List<GroupsEntity> groups = targetsDao.selectEditorGroupsOnKnowledgeId(knowledgeId);
+        List<UsersEntity> users = targetsDao.selectEditorUsersOnKnowledgeId(knowledgeId);
+
+        return filterTargetLabel(groups, users, loginedUser);
+    }
+
+    /**
+     * ターゲットのラベルをフィルターする
+     *
+     * @param groups
+     * @param users
+     * @param loginedUser
+     * @return
+     */
+    public List<LabelValue> filterTargetLabel(List<GroupsEntity> groups, List<UsersEntity> users, LoginedUser loginedUser) {
+        List<LabelValue> results = new ArrayList<>();
+        List<Integer> groupIds = new ArrayList<Integer>();
+
+        for (GroupsEntity groupsEntity : groups) {
+            LabelValue labelValue = new LabelValue();
+            labelValue.setLabel(NAME_PREFIX_GROUP + groupsEntity.getGroupName());
+            labelValue.setValue(ID_PREFIX_GROUP + groupsEntity.getGroupId());
+            results.add(labelValue);
+            groupIds.add(groupsEntity.getGroupId());
+        }
+
+        // フィルターするためにグループに所属するユーザーを取得する
+        List<Integer> groupUserIds = new ArrayList<Integer>();
+        if (!groupIds.isEmpty()) {
+            List<UserGroupsEntity> userGroups = UserGroupsDao.get().selectOnGroupIds(groupIds);
+            for (UserGroupsEntity userGroupsEntity : userGroups) {
+                groupUserIds.add(userGroupsEntity.getUserId());
+            }
+        }
+
+        for (UsersEntity usersEntity : users) {
+            // 自分の場合はスキップ
+            if (usersEntity.getUserId().intValue() == loginedUser.getUserId().intValue()) {
+                continue;
+            }
+
+            // グループに公開されていてかつそのグループに所属してる場合もスキップ
+            if (groupUserIds.contains(usersEntity.getUserId())) {
+                continue;
+            }
+
+            LabelValue labelValue = new LabelValue();
+            labelValue.setLabel(NAME_PREFIX_USER + usersEntity.getUserName());
+            labelValue.setValue(ID_PREFIX_USER + usersEntity.getUserId());
+            results.add(labelValue);
+        }
+
+        return results;
+    }
+
     /**
      * ターゲットからグループのIDを取得 対象外（ユーザがターゲット）の場合、MIN_VALUEを返す
      * 

From 1cf9dd0686a2aa779704ede695f2ee7bb4173c4d Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 16 Aug 2017 11:57:41 +0900
Subject: [PATCH 026/138] #757 safe null

---
 .../org/support/project/knowledge/logic/TargetLogic.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/logic/TargetLogic.java b/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
index 1b456dd62..66ce0867d 100644
--- a/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
@@ -267,8 +267,10 @@ public List<LabelValue> filterTargetLabel(List<GroupsEntity> groups, List<UsersE
 
         for (UsersEntity usersEntity : users) {
             // 自分の場合はスキップ
-            if (usersEntity.getUserId().intValue() == loginedUser.getUserId().intValue()) {
-                continue;
+            if (loginedUser != null) {
+                if (usersEntity.getUserId().intValue() == loginedUser.getUserId().intValue()) {
+                    continue;
+                }
             }
 
             // グループに公開されていてかつそのグループに所属してる場合もスキップ

From 977acf7bc75ed29cc1ca0f4e8483da9c17bfeb31 Mon Sep 17 00:00:00 2001
From: koda <koda.masaru3@gmail.com>
Date: Fri, 18 Aug 2017 17:18:35 +0900
Subject: [PATCH 027/138] #812 #658 Add a checkbox on form to not update
 timeline

---
 .../control/protect/KnowledgeControl.java     | 11 ++++++--
 .../knowledge/logic/KnowledgeLogic.java       | 11 ++++++--
 .../project/knowledge/vo/KnowledgeData.java   | 25 ++++++++++++++++++-
 src/main/resources/appresource.properties     |  1 +
 src/main/resources/appresource_ja.properties  |  1 +
 .../views/admin/database/connection.jsp       |  6 ++++-
 .../partials/partials-edit-buttons.jsp        |  6 +++++
 7 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index 9db9fe6fd..72dc43137 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -279,8 +279,16 @@ private Boundary update(KnowledgesEntity entity) throws Exception {
             return sendValidateError(errors);
         }
         
+        // 明示的にユーザが、タイムラインの上にもっていきたくないと指定した
+        if ("true".equals(super.getAttribute("notUpdateTimeline", "false"))) {
+            data.setDonotUpdateTimeline(true);
+        }
         if (!StringUtils.isEmpty(getParam("updateContent")) && getParam("updateContent").toLowerCase().equals("true")) {
+            // コンテンツの内容が更新されている
             data.setUpdateContent(true);
+            if (!data.isDonotUpdateTimeline()) {
+                data.setNotifyUpdate(true);
+            }
             LOG.debug("コンテンツを更新した");
         } else {
             // メタデータのみ更新
@@ -290,13 +298,12 @@ private Boundary update(KnowledgesEntity entity) throws Exception {
                 if (check.getPublicFlag().intValue() == KnowledgeLogic.PUBLIC_FLAG_PRIVATE &&
                         check.getPublicFlag().intValue() != data.getKnowledge().getPublicFlag().intValue()) {
                     // まだ通知を一度も出しておらず、かつ、「非公開」になっていたものを、それ以外の区分に変更した場合は、通知を出す
-                    data.setUpdateContent(true);
+                    data.setNotifyUpdate(true);
                     LOG.debug("メタデータのみ更新であったが、非公開から公開などへ変更した");
                 }
             }
         }
         
-        
         KnowledgesEntity updatedEntity = knowledgeLogic.update(data, super.getLoginedUser());
         
         if (data.isUpdateContent()) {
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index 61efce7c4..eaf2f8226 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -284,14 +284,21 @@ public KnowledgesEntity update(KnowledgeData data, LoginedUser loginedUser) thro
         if (data.isUpdateContent()) {
             // 履歴登録
             insertHistory(updatedEntity);
-            // 通知
-            NotifyLogic.get().notifyOnKnowledgeUpdate(updatedEntity);
         } else {
             // 更新ユーザ＆更新日付を戻す
             updatedEntity.setUpdateUser(db.getUpdateUser());
             updatedEntity.setUpdateDatetime(db.getUpdateDatetime());
             knowledgesDao.physicalUpdate(updatedEntity);
         }
+        if (data.isNotifyUpdate()) {
+            // 通知
+            NotifyLogic.get().notifyOnKnowledgeUpdate(updatedEntity);
+        }
+        if (data.isDonotUpdateTimeline()) {
+            // タイムラインの上に表示しないと明示的に指定があれば、全文検索エンジン上の更新日は更新しない（検索エンジンのインデックスでタイムラインを作っているため）
+            updatedEntity.setUpdateDatetime(db.getUpdateDatetime());
+        }
+        
         // 全文検索エンジンへ登録
         saveIndex(updatedEntity, data.getTags(), data.getViewers(), data.getTemplate(), updatedEntity.getInsertUser());
 
diff --git a/src/main/java/org/support/project/knowledge/vo/KnowledgeData.java b/src/main/java/org/support/project/knowledge/vo/KnowledgeData.java
index 8fbc20ba4..b7f5b31c9 100644
--- a/src/main/java/org/support/project/knowledge/vo/KnowledgeData.java
+++ b/src/main/java/org/support/project/knowledge/vo/KnowledgeData.java
@@ -19,7 +19,10 @@ public class KnowledgeData {
     private List<Long> fileNos;
     private TemplateMastersEntity template;
     private Long draftId;
-    private boolean updateContent;
+    
+    private boolean updateContent = false;
+    private boolean notifyUpdate = false;
+    private boolean donotUpdateTimeline = false;
     
     private String viewersStr;
     private String editorsStr;
@@ -246,6 +249,26 @@ public boolean isUpdateContent() {
     public void setUpdateContent(boolean updateContent) {
         this.updateContent = updateContent;
     }
+
+
+    public boolean isNotifyUpdate() {
+        return notifyUpdate;
+    }
+
+
+    public void setNotifyUpdate(boolean notifyUpdate) {
+        this.notifyUpdate = notifyUpdate;
+    }
+
+
+    public boolean isDonotUpdateTimeline() {
+        return donotUpdateTimeline;
+    }
+
+
+    public void setDonotUpdateTimeline(boolean donotUpdateTimeline) {
+        this.donotUpdateTimeline = donotUpdateTimeline;
+    }
     
     
 
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index db2a01dbd..97ac2b496 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -315,6 +315,7 @@ knowledge.edit.set.slide.path=SlideShow
 knowledge.edit.update.content=updated a content
 knowledge.edit.update.meta=Only meta information was updated (update notification is not sent)
 knowledge.edit.image.upload=Upload a image width preview
+knowledge.edit.do.not.update.timeline=Don't update timeline
 knowledge.delete.none=Knowledge to be deleted is not specified
 
 knowledge.likes.title=User list that was me press the "Like"
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index ff5667fcb..ffeb39d77 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -315,6 +315,7 @@ knowledge.edit.set.slide.path=スライドショー
 knowledge.edit.update.content=内容を更新しました
 knowledge.edit.update.meta=属性情報のみ更新しました（更新の通知は送られません）
 knowledge.edit.image.upload=画像をアップロード
+knowledge.edit.do.not.update.timeline=タイムラインを更新しない（軽微な修正）
 knowledge.delete.none=削除するナレッジが指定されていません
 
 knowledge.likes.title=「いいね！」を押してくれたユーザ一覧
diff --git a/src/main/webapp/WEB-INF/views/admin/database/connection.jsp b/src/main/webapp/WEB-INF/views/admin/database/connection.jsp
index b9168ae8f..4cd27e3df 100644
--- a/src/main/webapp/WEB-INF/views/admin/database/connection.jsp
+++ b/src/main/webapp/WEB-INF/views/admin/database/connection.jsp
@@ -127,7 +127,11 @@
                 </label>
             </div>
             <div class="form-group">
-                <label for="uRL"><%=jspUtil.label("knowledge.connection.label.URL")%></label> <input type="text" class="form-control" name="uRL"
+                <label for="uRL">
+                    <%=jspUtil.label("knowledge.connection.label.URL")%>
+                    <span class="small">(<%=jspUtil.label("knowledge.connection.msg.info.url")%>)</span>
+                </label>
+                <input type="text" class="form-control" name="uRL"
                     id="uRL" placeholder="<%=jspUtil.label("knowledge.connection.msg.info.url")%>" value="<%=jspUtil.out("uRL")%>" />
             </div>
             <div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-buttons.jsp b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-buttons.jsp
index 7e145bb01..3a54cb35d 100644
--- a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-buttons.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-buttons.jsp
@@ -21,6 +21,12 @@
     }
 %>
 <div class="article_buttons">
+    <div class="checkbox">
+        <label>
+            <input type="checkbox" name="notUpdateTimeline" value="true">
+            <%= jspUtil.label("knowledge.edit.do.not.update.timeline") %>
+        </label>
+    </div>
     <div>
         <button type="button" class="btn btn-primary btn_1" id="releasebutton">
             <i class="fa fa-rocket"></i>&nbsp;<%= jspUtil.label("label.release") %>

From ac9686bd01cdd5b5c79d72f4c3ef724b14565dad Mon Sep 17 00:00:00 2001
From: koda <koda.masaru3@gmail.com>
Date: Sun, 20 Aug 2017 08:14:39 +0900
Subject: [PATCH 028/138] #349 Changed to be able to switch "only unread" or
 "all items" in the notification list

---
 .../control/protect/NotificationControl.java  |  5 ++-
 .../knowledge/logic/NotificationLogic.java    |  4 +--
 src/main/resources/appresource.properties     |  2 ++
 src/main/resources/appresource_ja.properties  |  2 ++
 .../views/protect/notification/list.jsp       | 35 +++++++++++++++----
 5 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
index 2022640da..229928da2 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
@@ -15,9 +15,8 @@ public class NotificationControl extends Control {
     @Get
     public Boundary list() throws InvalidParamException {
         int offset = getPathInteger(0);
-        List<NotificationsEntity> notifications = NotificationLogic.get().getNotification(getLoginedUser(), offset);
-        
-        
+        boolean all = "true".equals(getAttribute("all", "false"));
+        List<NotificationsEntity> notifications = NotificationLogic.get().getNotification(getLoginedUser(), offset, all);
         setAttribute("notifications", notifications);
         
         int previous = offset - 1;
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
index 0bee90a05..f27cdb8ff 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -69,8 +69,8 @@ public Notification getNotification(String category) {
     }
     
     
-    public List<NotificationsEntity> getNotification(LoginedUser loginedUser, int offset) {
-        List<NotificationsEntity> notifications = super.getNotification(loginedUser.getUserId(), offset);
+    public List<NotificationsEntity> getNotification(LoginedUser loginedUser, int offset, boolean all) {
+        List<NotificationsEntity> notifications = super.getNotification(loginedUser.getUserId(), offset, all);
         for (Iterator<NotificationsEntity> iterator = notifications.iterator(); iterator.hasNext();) {
             NotificationsEntity notificationsEntity = (NotificationsEntity) iterator.next();
             Notification notification = getNotification(notificationsEntity.getTitle());
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 97ac2b496..75798d4ae 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -839,3 +839,5 @@ knowledge.token.label.delete=Delete Token
 knowledge.token.msg.copy=Copied
 
 knowledge.notification.title=Notifications
+knowledge.notification.list.all=All items
+knowledge.notification.list.only.unread=Only unread
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index ffeb39d77..9d9f5e56e 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -839,4 +839,6 @@ knowledge.token.label.delete=Tokenを削除する
 knowledge.token.msg.copy=コピーしました
 
 knowledge.notification.title=通知
+knowledge.notification.list.all=すべて表示
+knowledge.notification.list.only.unread=未読のみ
 
diff --git a/src/main/webapp/WEB-INF/views/protect/notification/list.jsp b/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
index 833a5172e..fb9661d9f 100644
--- a/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
@@ -20,15 +20,32 @@
 <c:param name="PARAM_CONTENT">
 <h4 class="title"><%= jspUtil.label("knowledge.notification.title") %></h4>
 
+<c:if test="${empty all}">
+<i class="fa fa-dot-circle-o" aria-hidden="true"></i>
+<%= jspUtil.label("knowledge.notification.list.only.unread") %>
+<a href="<%= request.getContextPath() %>/protect.notification/list?all=true">
+<i class="fa fa-circle-o" aria-hidden="true"></i>
+<%= jspUtil.label("knowledge.notification.list.all") %>
+</a>
+</c:if>
+<c:if test="${!empty all}">
+<a href="<%= request.getContextPath() %>/protect.notification/list">
+<i class="fa fa-circle-o" aria-hidden="true"></i>
+<%= jspUtil.label("knowledge.notification.list.only.unread") %>
+</a>
+<i class="fa fa-dot-circle-o" aria-hidden="true"></i>
+<%= jspUtil.label("knowledge.notification.list.all") %>
+</c:if>
+
 <nav>
     <ul class="pager">
         <li class="previous">
-            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("previous") %>">
+            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("previous") %><c:if test="${!empty all}">?all=true</c:if>">
                 <span aria-hidden="true">&larr;</span><%= jspUtil.label("label.previous") %>
             </a>
         </li>
         <li class="next">
-            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("next") %>">
+            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("next") %><c:if test="${!empty all}">?all=true</c:if>">
                 <%= jspUtil.label("label.next") %> <span aria-hidden="true">&rarr;</span>
             </a>
         </li>
@@ -47,14 +64,18 @@
         <c:if test="${notification.status == 0}">
             <a class="list-group-item unread" 
                 href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %>" >
-                [<%= jspUtil.label("label.unread") %>]
-                <%= jspUtil.out("notification.title") %>
+                <h4 class="list-group-item-heading">
+                    [<%= jspUtil.label("label.unread") %>]
+                    <%= jspUtil.out("notification.title") %>
+                </h4>
+                <p class="list-group-item-text"><%= jspUtil.date("notification.insertDatetime") %></p>
             </a>
         </c:if>
         <c:if test="${notification.status != 0}">
             <a class="list-group-item " 
                 href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %>" >
-                <%= jspUtil.out("notification.title") %>
+                <h4 class="list-group-item-heading"><%= jspUtil.out("notification.title") %></h4>
+                <p class="list-group-item-text"><%= jspUtil.date("notification.insertDatetime") %></p>
             </a>
         </c:if>
     </c:forEach>
@@ -67,12 +88,12 @@
 <nav>
     <ul class="pager">
         <li class="previous">
-            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("previous") %>">
+            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("previous") %><c:if test="${!empty all}">?all=true</c:if>">
                 <span aria-hidden="true">&larr;</span><%= jspUtil.label("label.previous") %>
             </a>
         </li>
         <li class="next">
-            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("next") %>">
+            <a href="<%= request.getContextPath() %>/protect.notification/list/<%= jspUtil.out("next") %><c:if test="${!empty all}">?all=true</c:if>">
                 <%= jspUtil.label("label.next") %> <span aria-hidden="true">&rarr;</span>
             </a>
         </li>

From 9e4290bd4533eb102fb4be257a2a16915db2b5da Mon Sep 17 00:00:00 2001
From: koda <koda.masaru3@gmail.com>
Date: Sun, 20 Aug 2017 09:56:11 +0900
Subject: [PATCH 029/138] #349 Add function to get previous and next
 notification

---
 .../control/protect/NotificationControl.java  | 36 ++++++++++++-
 .../knowledge/logic/NotificationLogic.java    | 27 ++++++++++
 src/main/resources/appresource.properties     |  3 +-
 src/main/resources/appresource_ja.properties  |  2 +-
 .../views/protect/notification/list.jsp       | 10 ++--
 .../views/protect/notification/not_found.jsp  | 51 +++++++++++++++++++
 .../views/protect/notification/view.jsp       | 49 ++++++++++++++++--
 7 files changed, 167 insertions(+), 11 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/views/protect/notification/not_found.jsp

diff --git a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
index 229928da2..5c002972d 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
@@ -35,12 +35,44 @@ public Boundary view() throws InvalidParamException {
         long no = getPathLong(new Long(-1));
         NotificationsEntity notification = NotificationLogic.get().load(no, getLoginedUser());
         if (notification == null) {
-            sendError(HttpStatus.SC_403_FORBIDDEN, "FORBIDDEN");
+            return sendError(HttpStatus.SC_403_FORBIDDEN, "FORBIDDEN");
         }
         NotificationLogic.get().setStatus(getLoginUserId(), no, NotificationLogic.STATUS_READED);
         setAttributeOnProperty(notification);
+        setAttribute("no", no);
         return forward("view.jsp");
     }
     
-    
+    @Get
+    public Boundary previous() throws InvalidParamException {
+        long no = getPathLong(new Long(-1));
+        boolean all = "true".equals(getAttribute("all", "false"));
+        NotificationsEntity notification = NotificationLogic.get().previous(no, getLoginedUser(), all);
+        if (notification == null) {
+            setAttribute("method", getResource("label.previous"));
+            setAttribute("no", no);
+            return forward("not_found.jsp");
+        }
+        no = notification.getNo();
+        NotificationLogic.get().setStatus(getLoginUserId(), no, NotificationLogic.STATUS_READED);
+        setAttributeOnProperty(notification);
+        setAttribute("no", no);
+        return forward("view.jsp");
+    }
+    @Get
+    public Boundary next() throws InvalidParamException {
+        long no = getPathLong(new Long(-1));
+        boolean all = "true".equals(getAttribute("all", "false"));
+        NotificationsEntity notification = NotificationLogic.get().next(no, getLoginedUser(), all);
+        if (notification == null) {
+            setAttribute("method", getResource("label.next"));
+            setAttribute("no", no);
+            return forward("not_found.jsp");
+        }
+        no = notification.getNo();
+        NotificationLogic.get().setStatus(getLoginUserId(), no, NotificationLogic.STATUS_READED);
+        setAttributeOnProperty(notification);
+        setAttribute("no", no);
+        return forward("view.jsp");
+    }
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
index f27cdb8ff..080eb4b68 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -96,9 +96,36 @@ public NotificationsEntity load(long no, LoginedUser loginedUser) {
             return null;
         }
         NotificationsEntity notificationsEntity = NotificationsDao.get().selectOnKey(no);
+        if (notificationsEntity == null) {
+            return null;
+        }
         Notification notification = getNotification(notificationsEntity.getTitle());
         notification.convNotification(notificationsEntity, loginedUser, TARGET.detail);
         return notificationsEntity;
     }
     
+    public NotificationsEntity previous(long no, LoginedUser loginedUser, boolean all) {
+        if (loginedUser == null) {
+            return null;
+        }
+        NotificationsEntity notificationsEntity = super.previous(no, loginedUser.getUserId(), all);
+        if (notificationsEntity == null) {
+            return null;
+        }
+        Notification notification = getNotification(notificationsEntity.getTitle());
+        notification.convNotification(notificationsEntity, loginedUser, TARGET.detail);
+        return notificationsEntity;
+    }
+    public NotificationsEntity next(long no, LoginedUser loginedUser, boolean all) {
+        if (loginedUser == null) {
+            return null;
+        }
+        NotificationsEntity notificationsEntity = super.next(no, loginedUser.getUserId(), all);
+        if (notificationsEntity == null) {
+            return null;
+        }
+        Notification notification = getNotification(notificationsEntity.getTitle());
+        notification.convNotification(notificationsEntity, loginedUser, TARGET.detail);
+        return notificationsEntity;
+    }
 }
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 75798d4ae..e87dcb45c 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -61,7 +61,7 @@ message.confirm.delete=Are you sure you want to delete?
 # Common Label
 label.version=v1.11.0 dev
 label.login=Sign in
-label.previous = Previous
+label.previous= Previous
 label.next=Next
 label.add=Add
 label.public=Public
@@ -841,3 +841,4 @@ knowledge.token.msg.copy=Copied
 knowledge.notification.title=Notifications
 knowledge.notification.list.all=All items
 knowledge.notification.list.only.unread=Only unread
+knowledge.notification.view.not.found=Data is not found on "{1}".
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index 9d9f5e56e..6ec5b0e97 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -841,4 +841,4 @@ knowledge.token.msg.copy=コピーしました
 knowledge.notification.title=通知
 knowledge.notification.list.all=すべて表示
 knowledge.notification.list.only.unread=未読のみ
-
+knowledge.notification.view.not.found=「{1}」 にデータがありません
diff --git a/src/main/webapp/WEB-INF/views/protect/notification/list.jsp b/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
index fb9661d9f..310aa8c3f 100644
--- a/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
@@ -63,8 +63,9 @@
     <c:forEach var="notification" items="${notifications}">
         <c:if test="${notification.status == 0}">
             <a class="list-group-item unread" 
-                href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %>" >
+                href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %><c:if test="${!empty all}">?all=true</c:if>" >
                 <h4 class="list-group-item-heading">
+                    <span class="dispKnowledgeId">#<%= jspUtil.out("notification.no") %></span>
                     [<%= jspUtil.label("label.unread") %>]
                     <%= jspUtil.out("notification.title") %>
                 </h4>
@@ -73,8 +74,11 @@
         </c:if>
         <c:if test="${notification.status != 0}">
             <a class="list-group-item " 
-                href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %>" >
-                <h4 class="list-group-item-heading"><%= jspUtil.out("notification.title") %></h4>
+                href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %><c:if test="${!empty all}">?all=true</c:if>" >
+                <h4 class="list-group-item-heading">
+                    <span class="dispKnowledgeId">#<%= jspUtil.out("notification.no") %></span>
+                    <%= jspUtil.out("notification.title") %>
+                </h4>
                 <p class="list-group-item-text"><%= jspUtil.date("notification.insertDatetime") %></p>
             </a>
         </c:if>
diff --git a/src/main/webapp/WEB-INF/views/protect/notification/not_found.jsp b/src/main/webapp/WEB-INF/views/protect/notification/not_found.jsp
new file mode 100644
index 000000000..844b76ea8
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/protect/notification/not_found.jsp
@@ -0,0 +1,51 @@
+<%@page pageEncoding="UTF-8" isELIgnored="false" session="false" errorPage="/WEB-INF/views/commons/errors/jsp_error.jsp"%>
+<%@page import="org.support.project.web.util.JspUtil"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<% JspUtil jspUtil = new JspUtil(request, pageContext); %>
+
+
+<c:import url="/WEB-INF/views/commons/layout/layoutMain.jsp">
+
+<c:param name="PARAM_HEAD">
+</c:param>
+
+<c:param name="PARAM_SCRIPTS">
+</c:param>
+
+
+<c:param name="PARAM_CONTENT">
+<h4 class="title"><%= jspUtil.out("title") %></h4>
+
+<%= jspUtil.label("knowledge.notification.view.not.found", jspUtil.out("method")) %>
+
+
+<nav>
+    <ul class="pager">
+        <li class="previous">
+            <a href="<%= request.getContextPath() %>/protect.notification/previous/<%= jspUtil.out("no") %><c:if test="${!empty all}">?all=true</c:if>">
+                <span aria-hidden="true">&larr;</span><%= jspUtil.label("label.previous") %>
+            </a>
+        </li>
+        <li>
+            <a href="<%= request.getContextPath() %>/protect.notification/list<c:if test="${!empty all}">?all=true</c:if>" >
+                <i class="fa fa-list-ul"></i>&nbsp;<%= jspUtil.label("label.backlist") %>
+            </a>
+        </li>
+        <li class="next">
+            <a href="<%= request.getContextPath() %>/protect.notification/next/<%= jspUtil.out("no") %><c:if test="${!empty all}">?all=true</c:if>">
+                <%= jspUtil.label("label.next") %> <span aria-hidden="true">&rarr;</span>
+            </a>
+        </li>
+    </ul>
+</nav>
+
+
+
+
+</c:param>
+
+</c:import>
+
diff --git a/src/main/webapp/WEB-INF/views/protect/notification/view.jsp b/src/main/webapp/WEB-INF/views/protect/notification/view.jsp
index 5a08bea81..74c046556 100644
--- a/src/main/webapp/WEB-INF/views/protect/notification/view.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/notification/view.jsp
@@ -10,6 +10,7 @@
 <c:import url="/WEB-INF/views/commons/layout/layoutMain.jsp">
 
 <c:param name="PARAM_HEAD">
+<link rel="stylesheet" href="<%= request.getContextPath() %>/css/knowledge-list.css" />
 </c:param>
 
 <c:param name="PARAM_SCRIPTS">
@@ -17,15 +18,55 @@
 
 
 <c:param name="PARAM_CONTENT">
-<h4 class="title"><%= jspUtil.out("title") %></h4>
+<h4 class="title">
+<span class="dispKnowledgeId">#<%= jspUtil.out("no") %></span>
+<%= jspUtil.out("title") %>
+</h4>
+
+<nav>
+    <ul class="pager">
+        <li class="previous">
+            <a href="<%= request.getContextPath() %>/protect.notification/previous/<%= jspUtil.out("no") %><c:if test="${!empty all}">?all=true</c:if>">
+                <span aria-hidden="true">&larr;</span><%= jspUtil.label("label.previous") %>
+            </a>
+        </li>
+        <li>
+            <a href="<%= request.getContextPath() %>/protect.notification/list<c:if test="${!empty all}">?all=true</c:if>" >
+                <i class="fa fa-list-ul"></i>&nbsp;<%= jspUtil.label("label.backlist") %>
+            </a>
+        </li>
+        <li class="next">
+            <a href="<%= request.getContextPath() %>/protect.notification/next/<%= jspUtil.out("no") %><c:if test="${!empty all}">?all=true</c:if>">
+                <%= jspUtil.label("label.next") %> <span aria-hidden="true">&rarr;</span>
+            </a>
+        </li>
+    </ul>
+</nav>
 
 <pre>
 <%= jspUtil.out("content") %>
 </pre>
 
-<a href="<%= request.getContextPath() %>/protect.notification/list" class="btn btn-success" role="button">
-<i class="fa fa-list-ul"></i>&nbsp;<%= jspUtil.label("label.backlist") %>
-</a>
+<nav>
+    <ul class="pager">
+        <li class="previous">
+            <a href="<%= request.getContextPath() %>/protect.notification/previous/<%= jspUtil.out("no") %><c:if test="${!empty all}">?all=true</c:if>">
+                <span aria-hidden="true">&larr;</span><%= jspUtil.label("label.previous") %>
+            </a>
+        </li>
+        <li>
+            <a href="<%= request.getContextPath() %>/protect.notification/list<c:if test="${!empty all}">?all=true</c:if>" >
+                <i class="fa fa-list-ul"></i>&nbsp;<%= jspUtil.label("label.backlist") %>
+            </a>
+        </li>
+        <li class="next">
+            <a href="<%= request.getContextPath() %>/protect.notification/next/<%= jspUtil.out("no") %><c:if test="${!empty all}">?all=true</c:if>">
+                <%= jspUtil.label("label.next") %> <span aria-hidden="true">&rarr;</span>
+            </a>
+        </li>
+    </ul>
+</nav>
+
 
 </c:param>
 

From 975c2b3071ab7d7dbecfab81abf3f263d5162916 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 21 Aug 2017 23:32:06 +0900
Subject: [PATCH 030/138] #349 Add mark all as read button on notification list
 page

---
 .../control/protect/NotificationControl.java  | 10 +++++++++
 .../knowledge/logic/NotificationLogic.java    | 13 +++++++++++
 src/main/resources/appresource.properties     |  1 +
 src/main/resources/appresource_ja.properties  |  1 +
 .../views/protect/notification/list.jsp       | 22 +++++++++++++++++--
 src/main/webapp/js/notification-list.js       | 21 ++++++++++++++++++
 6 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 src/main/webapp/js/notification-list.js

diff --git a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
index 5c002972d..1714078ec 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
@@ -7,6 +7,7 @@
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.common.HttpStatus;
 import org.support.project.web.control.service.Get;
+import org.support.project.web.control.service.Post;
 import org.support.project.web.entity.NotificationsEntity;
 import org.support.project.web.exception.InvalidParamException;
 
@@ -75,4 +76,13 @@ public Boundary next() throws InvalidParamException {
         setAttribute("no", no);
         return forward("view.jsp");
     }
+
+    @Post
+    public Boundary markread() {
+        String no = getAttribute("no", "");
+        NotificationLogic.get().markAllAsRead(no, getLoginUserId());
+        return send("OK");
+    }
+
+
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
index 080eb4b68..b83eb3ce8 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -3,6 +3,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.support.project.aop.Aspect;
+import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.knowledge.logic.notification.AcceptCheckUserNotification;
 import org.support.project.knowledge.logic.notification.AddUserNotification;
@@ -128,4 +130,15 @@ public NotificationsEntity next(long no, LoginedUser loginedUser, boolean all) {
         notification.convNotification(notificationsEntity, loginedUser, TARGET.detail);
         return notificationsEntity;
     }
+    
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void markAllAsRead(String no, Integer userID) {
+        String[] nos = no.split(",");
+        for (String n : nos) {
+            if (StringUtils.isInteger(n)) {
+                int num = Integer.parseInt(n);
+                super.setStatus(userID, num, NotificationLogic.STATUS_READED);
+            }
+        }
+    }
 }
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index e87dcb45c..59d000938 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -117,6 +117,7 @@ label.unread=Unread
 label.read=Read
 label.save.draft=Save draft
 label.delete.draft=Delete draft
+label.mark.all.as.read=Mark all as read
 
 label.public.view=<i class="fa fa-globe"></i>&nbsp;[Public]
 label.protect.view=<i class="fa fa-gavel"></i>&nbsp;[Protection]
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index 6ec5b0e97..c9b742b26 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -117,6 +117,7 @@ label.unread=未読
 label.read=既読
 label.save.draft=下書き保存
 label.delete.draft=下書き削除
+label.mark.all.as.read=既読にする
 
 label.public.view=<i class="fa fa-globe"></i>&nbsp;[公開]
 label.protect.view=<i class="fa fa-gavel"></i>&nbsp;[保護]
diff --git a/src/main/webapp/WEB-INF/views/protect/notification/list.jsp b/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
index 310aa8c3f..60221836f 100644
--- a/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/notification/list.jsp
@@ -10,16 +10,27 @@
 <c:import url="/WEB-INF/views/commons/layout/layoutMain.jsp">
 
 <c:param name="PARAM_HEAD">
+<!-- build:css(src/main/webapp) css/notification-list.css -->
 <link rel="stylesheet" href="<%= request.getContextPath() %>/css/knowledge-list.css" />
+<!-- endbuild -->
 </c:param>
 
 <c:param name="PARAM_SCRIPTS">
+<script>
+var UNREAD_LIST = [
+<c:forEach var="notification" items="${notifications}"><c:if test="${notification.status == 0}"><%= jspUtil.out("notification.no") %>,</c:if></c:forEach>
+];
+</script>
+<!-- build:js(src/main/webapp) js/page-notification-list.js -->
+<script type="text/javascript" src="<%= request.getContextPath() %>/js/notification-list.js"></script>
+<!-- endbuild -->
 </c:param>
 
 
 <c:param name="PARAM_CONTENT">
 <h4 class="title"><%= jspUtil.label("knowledge.notification.title") %></h4>
 
+<div class="col-sm-6">
 <c:if test="${empty all}">
 <i class="fa fa-dot-circle-o" aria-hidden="true"></i>
 <%= jspUtil.label("knowledge.notification.list.only.unread") %>
@@ -36,6 +47,13 @@
 <i class="fa fa-dot-circle-o" aria-hidden="true"></i>
 <%= jspUtil.label("knowledge.notification.list.all") %>
 </c:if>
+</div>
+<div class="col-sm-6 text-right">
+<button class="btn btn-link" id="btnMarkAllAsRead">
+<i class="fa fa-check" aria-hidden="true"></i>
+<%= jspUtil.label("label.mark.all.as.read") %>
+</button>
+</div>
 
 <nav>
     <ul class="pager">
@@ -65,7 +83,7 @@
             <a class="list-group-item unread" 
                 href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %><c:if test="${!empty all}">?all=true</c:if>" >
                 <h4 class="list-group-item-heading">
-                    <span class="dispKnowledgeId">#<%= jspUtil.out("notification.no") %></span>
+                    <span class="dispKnowledgeId">@<%= jspUtil.out("notification.no") %></span>
                     [<%= jspUtil.label("label.unread") %>]
                     <%= jspUtil.out("notification.title") %>
                 </h4>
@@ -76,7 +94,7 @@
             <a class="list-group-item " 
                 href="<%= request.getContextPath() %>/protect.notification/view/<%= jspUtil.out("notification.no") %><c:if test="${!empty all}">?all=true</c:if>" >
                 <h4 class="list-group-item-heading">
-                    <span class="dispKnowledgeId">#<%= jspUtil.out("notification.no") %></span>
+                    <span class="dispKnowledgeId">@<%= jspUtil.out("notification.no") %></span>
                     <%= jspUtil.out("notification.title") %>
                 </h4>
                 <p class="list-group-item-text"><%= jspUtil.date("notification.insertDatetime") %></p>
diff --git a/src/main/webapp/js/notification-list.js b/src/main/webapp/js/notification-list.js
new file mode 100644
index 000000000..f3c1d60f6
--- /dev/null
+++ b/src/main/webapp/js/notification-list.js
@@ -0,0 +1,21 @@
+$(document).ready(function() {
+    $('#btnMarkAllAsRead').click(function() {
+        console.log(UNREAD_LIST);
+        if (UNREAD_LIST.length > 0) {
+            var data = {
+                    no: UNREAD_LIST.join(',')
+            };
+            $.ajax({
+                url: _CONTEXT + '/protect.notification/markread',
+                type: 'POST',
+                data: data,
+                timeout: 10000,
+            }).done(function(result, textStatus, xhr) {
+                console.log(result);
+                location.reload();
+            }).fail(function(xhr, textStatus, error) {
+                console.log(error);
+            });
+        }
+    });
+});
\ No newline at end of file

From 933614ec82964f433f27d92850e8327aa9606e98 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 22 Aug 2017 00:03:34 +0900
Subject: [PATCH 031/138] #349 Add a feature what set auto link for URL on
 notification detail page

---
 .../webapp/WEB-INF/views/protect/notification/view.jsp     | 7 ++++++-
 src/main/webapp/js/notification-detail.js                  | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 src/main/webapp/js/notification-detail.js

diff --git a/src/main/webapp/WEB-INF/views/protect/notification/view.jsp b/src/main/webapp/WEB-INF/views/protect/notification/view.jsp
index 74c046556..9b4df218f 100644
--- a/src/main/webapp/WEB-INF/views/protect/notification/view.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/notification/view.jsp
@@ -10,10 +10,15 @@
 <c:import url="/WEB-INF/views/commons/layout/layoutMain.jsp">
 
 <c:param name="PARAM_HEAD">
+<!-- build:css(src/main/webapp) css/notification-detail.css -->
 <link rel="stylesheet" href="<%= request.getContextPath() %>/css/knowledge-list.css" />
+<!-- endbuild -->
 </c:param>
 
 <c:param name="PARAM_SCRIPTS">
+<!-- build:js(src/main/webapp) js/page-notification-detail.js -->
+<script type="text/javascript" src="<%= request.getContextPath() %>/js/notification-detail.js"></script>
+<!-- endbuild -->
 </c:param>
 
 
@@ -43,7 +48,7 @@
     </ul>
 </nav>
 
-<pre>
+<pre id="content">
 <%= jspUtil.out("content") %>
 </pre>
 
diff --git a/src/main/webapp/js/notification-detail.js b/src/main/webapp/js/notification-detail.js
new file mode 100644
index 000000000..a98fcb676
--- /dev/null
+++ b/src/main/webapp/js/notification-detail.js
@@ -0,0 +1,5 @@
+$(document).ready(function() {
+    $("#content").each(function(){
+        $(this).html( $(this).html().replace(/((http|https):\/\/[\w?=&.\/-;#~%-]+(?![\w\s?&.\/;#~%"=-]*>))/g, '<a href="$1">$1</a> ') );
+    });
+});
\ No newline at end of file

From 4c302b7bcc3b68fc40461ec9241706c86cb370b6 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 22 Aug 2017 02:29:59 +0900
Subject: [PATCH 032/138] #836 Change a page path that is after sign in to list
 page

---
 src/main/webapp/WEB-INF/web.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index cda9b0d33..1158de252 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -73,6 +73,14 @@
             <param-name>login-error-page</param-name>
             <param-value>/WEB-INF/views/auth/form.jsp</param-value>
         </init-param>
+        <init-param>
+            <param-name>initial-page</param-name>
+            <param-value>/open.knowledge/list</param-value>
+        </init-param>
+        <init-param>
+            <param-name>out-page</param-name>
+            <param-value>/open.knowledge/list</param-value>
+        </init-param>
         <init-param>
             <param-name>auth-class-name</param-name>
             <param-value>org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl</param-value>
@@ -85,11 +93,6 @@
             <param-name>cookie-secure</param-name>
             <param-value>false</param-value>
         </init-param>
-        <init-param>
-            <param-name>outPage</param-name>
-            <param-value>/open.knowledge/list</param-value>
-        </init-param>
-        
     </filter>
 
     <filter>

From bc9dc1dcfd4251c0f221b14a3a412b75d29df863 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 24 Aug 2017 06:48:20 +0900
Subject: [PATCH 033/138] #444 Refactor desktop notification processing

---
 .../project/knowledge/bat/NotifyMailBat.java  |  10 +-
 .../knowledge/logic/KnowledgeLogic.java       |   4 +
 .../project/knowledge/logic/MailLogic.java    |  11 +-
 .../project/knowledge/logic/NotifyLogic.java  |  58 ++++---
 .../project/knowledge/logic/WebhookLogic.java |   4 +-
 .../AbstractQueueNotification.java            |   9 +
 .../CommentInsertNotification.java            |  69 +++++++-
 .../notification/DesktopNotification.java     |  17 ++
 .../KnowledgeUpdateNotification.java          |  32 +++-
 .../notification/LikeInsertNotification.java  |  32 +++-
 .../logic/notification/QueueNotification.java |  18 +-
 .../support/project/knowledge/vo/Notify.java  | 162 ------------------
 .../knowledge/websocket/NotifyAction.java     |   4 +-
 .../knowledge/websocket/SessionObserver.java  |  10 +-
 14 files changed, 222 insertions(+), 218 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/DesktopNotification.java
 delete mode 100644 src/main/java/org/support/project/knowledge/vo/Notify.java

diff --git a/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java b/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java
index d8a0f4b56..5423f68ed 100644
--- a/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java
+++ b/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java
@@ -12,7 +12,7 @@
 import org.support.project.knowledge.logic.notification.CommentInsertNotification;
 import org.support.project.knowledge.logic.notification.KnowledgeUpdateNotification;
 import org.support.project.knowledge.logic.notification.LikeInsertNotification;
-import org.support.project.knowledge.vo.Notify;
+import org.support.project.knowledge.logic.notification.QueueNotification;
 
 /**
  * メッセージ処理を処理する定期的なバッチプログラム
@@ -52,12 +52,12 @@ private void start() throws Exception {
         NotifyQueuesDao notifyQueuesDao = NotifyQueuesDao.get();
         List<NotifyQueuesEntity> notifyQueuesEntities = notifyQueuesDao.selectAll();
         for (NotifyQueuesEntity notifyQueuesEntity : notifyQueuesEntities) {
-            if (notifyQueuesEntity.getType() == Notify.TYPE_KNOWLEDGE_INSERT 
-                    || notifyQueuesEntity.getType() == Notify.TYPE_KNOWLEDGE_UPDATE) {
+            if (notifyQueuesEntity.getType() == QueueNotification.TYPE_KNOWLEDGE_INSERT 
+                    || notifyQueuesEntity.getType() == QueueNotification.TYPE_KNOWLEDGE_UPDATE) {
                 KnowledgeUpdateNotification.get().notify(notifyQueuesEntity);
-            } else if (notifyQueuesEntity.getType() == Notify.TYPE_KNOWLEDGE_COMMENT) {
+            } else if (notifyQueuesEntity.getType() == QueueNotification.TYPE_KNOWLEDGE_COMMENT) {
                 CommentInsertNotification.get().notify(notifyQueuesEntity);
-            } else if (notifyQueuesEntity.getType() == Notify.TYPE_KNOWLEDGE_LIKE) {
+            } else if (notifyQueuesEntity.getType() == QueueNotification.TYPE_KNOWLEDGE_LIKE) {
                 LikeInsertNotification.get().notify(notifyQueuesEntity);
             }
             // 通知のキューから削除
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index eaf2f8226..4265fc1eb 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -1194,6 +1194,10 @@ public Long addLikeComment(Long commentNo, LoginedUser loginedUser, Locale local
         like.setCommentNo(commentNo);
         LikeCommentsDao.get().insert(like);
         Long count = LikeCommentsDao.get().selectOnCommentNo(commentNo);
+        
+        // 通知 TODO
+//        NotifyLogic.get().notifyOnKnowledgeLiked(knowledgeId, likesEntity);
+
         return count;
     }
     
diff --git a/src/main/java/org/support/project/knowledge/logic/MailLogic.java b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
index 5d234c1a8..44c3ddc5c 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
@@ -76,7 +76,7 @@ public class MailLogic {
     public static final String NOTIFY_EVENT = "notify_event";
     
     
-    public static String[] TEMPLATE_IDS = {
+    public static final String[] TEMPLATE_IDS = {
         INVITATION, MAIL_CONFIRM, NOTIFY_ACCEPT_USER, NOTIFY_ADD_USER,
         NOTIFY_INSERT_COMMENT_MYITEM, NOTIFY_INSERT_COMMENT, NOTIFY_INSERT_KNOWLEDGE,
         NOTIFY_INSERT_LIKE_MYITEM, NOTIFY_UPDATE_KNOWLEDGE, PASSWORD_RESET, TEST_MAIL,
@@ -154,7 +154,8 @@ public MailLocaleTemplatesEntity load(Locale locale, String configName) {
      * @throws NoSuchAlgorithmException 
      * @throws InvalidKeyException 
      */
-    public void startSendMails() throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException {
+    public void startSendMails() throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException,
+        IllegalBlockSizeException, BadPaddingException {
         MailConfigsDao mailConfigsDao = MailConfigsDao.get();
         MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
         if (mailConfigsEntity == null) {
@@ -214,7 +215,8 @@ public void startSendMails() throws InvalidKeyException, NoSuchAlgorithmExceptio
      * @throws IllegalBlockSizeException
      * @throws BadPaddingException
      */
-    private Session getSession(MailConfigsEntity config) throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException {
+    private Session getSession(MailConfigsEntity config) throws InvalidKeyException, NoSuchAlgorithmException,
+        NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException {
         String host = config.getHost();
         String port = String.valueOf(config.getPort());
         
@@ -279,7 +281,8 @@ public void mailSend(MailConfigsEntity config, MailsEntity entity) throws Invali
      * @throws NoSuchAlgorithmException
      * @throws InvalidKeyException
      */
-    private void mailSend(Session session, MailConfigsEntity config, MailsEntity entity) throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException,
+    private void mailSend(Session session, MailConfigsEntity config, MailsEntity entity)
+            throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException,
             IllegalBlockSizeException, BadPaddingException, UnsupportedEncodingException, MessagingException {
         String to = entity.getToAddress();
         String toName = entity.getToName();
diff --git a/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java b/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
index 330b32376..5800b046a 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
@@ -25,7 +25,11 @@
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.NotifyConfigsEntity;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
-import org.support.project.knowledge.vo.Notify;
+import org.support.project.knowledge.logic.notification.CommentInsertNotification;
+import org.support.project.knowledge.logic.notification.DesktopNotification;
+import org.support.project.knowledge.logic.notification.KnowledgeUpdateNotification;
+import org.support.project.knowledge.logic.notification.LikeInsertNotification;
+import org.support.project.knowledge.logic.notification.QueueNotification;
 import org.support.project.knowledge.websocket.NotifyAction;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.bean.MessageResult;
@@ -78,31 +82,33 @@ public String makeURL(Long knowledgeId) {
      * 
      * @param notify
      */
-    private void notify(Notify notify) {
+    private void notifyMail(QueueNotification notify) {
         // Mail通知
         NotifyQueuesDao notifyQueuesDao = NotifyQueuesDao.get();
         NotifyQueuesEntity notifyQueuesEntity = notify.getQueue();
         // 重複チェックし
-        if (NumberUtils.is(notifyQueuesEntity.getType(), Notify.TYPE_KNOWLEDGE_INSERT)) {
+        if (NumberUtils.is(notifyQueuesEntity.getType(), QueueNotification.TYPE_KNOWLEDGE_INSERT)) {
             // ナレッジの新規登録は必ず通知のキューに入れる
             notifyQueuesDao.insert(notifyQueuesEntity);
-        } else if (NumberUtils.is(notifyQueuesEntity.getType(), Notify.TYPE_KNOWLEDGE_UPDATE)) {
+        } else if (NumberUtils.is(notifyQueuesEntity.getType(), QueueNotification.TYPE_KNOWLEDGE_UPDATE)) {
             // ナレッジが更新された場合、キューに「登録通知」もしくは「更新通知」が存在しているのであれば登録しない
             NotifyQueuesEntity exist = notifyQueuesDao.selectOnTypeAndId(notifyQueuesEntity.getType(), notifyQueuesEntity.getId());
             if (exist == null) {
-                exist = notifyQueuesDao.selectOnTypeAndId(Notify.TYPE_KNOWLEDGE_INSERT, notifyQueuesEntity.getId());
+                exist = notifyQueuesDao.selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, notifyQueuesEntity.getId());
                 if (exist == null) {
                     notifyQueuesDao.insert(notifyQueuesEntity);
                 }
             }
-        } else if (NumberUtils.is(notifyQueuesEntity.getType(), Notify.TYPE_KNOWLEDGE_LIKE)
-                || NumberUtils.is(notifyQueuesEntity.getType(), Notify.TYPE_KNOWLEDGE_COMMENT)) {
+        } else if (NumberUtils.is(notifyQueuesEntity.getType(), QueueNotification.TYPE_KNOWLEDGE_LIKE)
+                || NumberUtils.is(notifyQueuesEntity.getType(), QueueNotification.TYPE_KNOWLEDGE_COMMENT)) {
             NotifyQueuesEntity exist = notifyQueuesDao.selectOnTypeAndId(notifyQueuesEntity.getType(), notifyQueuesEntity.getId());
             if (exist == null) {
                 notifyQueuesDao.insert(notifyQueuesEntity);
             }
         }
-
+    }
+    
+    private void notifyDeskTop(DesktopNotification notify) {
         // Desktop通知は、多数のユーザを処理するので、別スレッドで処理する
         Thread t = new Thread(new Runnable() {
             @Override
@@ -123,9 +129,11 @@ public void run() {
      * @param knowledgesEntity
      */
     public void notifyOnKnowledgeInsert(KnowledgesEntity knowledgesEntity) {
-        Notify notify = new Notify();
-        notify.inserted(knowledgesEntity);
-        notify(notify);
+        KnowledgeUpdateNotification notify = KnowledgeUpdateNotification.get();
+        notify.setKnowledge(knowledgesEntity);
+        notify.setType(QueueNotification.TYPE_KNOWLEDGE_INSERT);
+        notifyMail(notify);
+        notifyDeskTop(notify);
     }
 
     /**
@@ -134,10 +142,11 @@ public void notifyOnKnowledgeInsert(KnowledgesEntity knowledgesEntity) {
      * @param knowledgesEntity
      */
     public void notifyOnKnowledgeUpdate(KnowledgesEntity knowledgesEntity) {
-        Notify notify = new Notify();
-        notify.updated(knowledgesEntity);
-
-        notify(notify);
+        KnowledgeUpdateNotification notify = KnowledgeUpdateNotification.get();
+        notify.setKnowledge(knowledgesEntity);
+        notify.setType(QueueNotification.TYPE_KNOWLEDGE_UPDATE);
+        notifyMail(notify);
+        notifyDeskTop(notify);
     }
 
     /**
@@ -146,10 +155,11 @@ public void notifyOnKnowledgeUpdate(KnowledgesEntity knowledgesEntity) {
      * @param knowledgeId
      */
     public void notifyOnKnowledgeLiked(Long knowledgeId, LikesEntity likesEntity) {
-        Notify notify = new Notify();
-        notify.liked(likesEntity);
-
-        notify(notify);
+        LikeInsertNotification notify = LikeInsertNotification.get();
+        notify.setLike(likesEntity);
+        notify.setType(QueueNotification.TYPE_KNOWLEDGE_LIKE);
+        notifyMail(notify);
+        notifyDeskTop(notify);
     }
 
     /**
@@ -158,12 +168,12 @@ public void notifyOnKnowledgeLiked(Long knowledgeId, LikesEntity likesEntity) {
      * @param knowledgeId
      */
     public void notifyOnKnowledgeComment(Long knowledgeId, CommentsEntity commentsEntity) {
-        Notify notify = new Notify();
-        notify.commented(commentsEntity);
-
-        notify(notify);
+        CommentInsertNotification notify = CommentInsertNotification.get();
+        notify.setComment(commentsEntity);
+        notify.setType(QueueNotification.TYPE_KNOWLEDGE_COMMENT);
+        notifyMail(notify);
+        notifyDeskTop(notify);
     }
-
     /**
      * 指定のナレッジは、自分宛てのナレッジかどうかを判定し、メッセージを取得する
      * 
diff --git a/src/main/java/org/support/project/knowledge/logic/WebhookLogic.java b/src/main/java/org/support/project/knowledge/logic/WebhookLogic.java
index 69a0f29bb..f6c9d27a8 100644
--- a/src/main/java/org/support/project/knowledge/logic/WebhookLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/WebhookLogic.java
@@ -26,7 +26,7 @@
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.TagsEntity;
 import org.support.project.knowledge.entity.WebhookConfigsEntity;
-import org.support.project.knowledge.vo.Notify;
+import org.support.project.knowledge.logic.notification.QueueNotification;
 import org.support.project.web.bean.LabelValue;
 import org.support.project.web.dao.UsersDao;
 import org.support.project.web.entity.ProxyConfigsEntity;
@@ -85,7 +85,7 @@ public Map<String, Object> getKnowledgeData(KnowledgesEntity knowledge, Integer
         jsonObject.put("became_public", became_public);
 
         if (type != null) {
-            if (Notify.TYPE_KNOWLEDGE_INSERT == type) {
+            if (QueueNotification.TYPE_KNOWLEDGE_INSERT == type) {
                 jsonObject.put("status", "created");
             } else {
                 jsonObject.put("status", "updated");
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/AbstractQueueNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/AbstractQueueNotification.java
index 8968ed849..db68fa2d2 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/AbstractQueueNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/AbstractQueueNotification.java
@@ -1,6 +1,15 @@
 package org.support.project.knowledge.logic.notification;
 
 public abstract class AbstractQueueNotification extends AbstractNotification implements QueueNotification {
+    /** notify type */
+    private int type;
 
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
index 91eaebf00..264f6d6a1 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
@@ -6,8 +6,10 @@
 import java.util.Map;
 
 import org.support.project.aop.Aspect;
+import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.RandomUtil;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -17,11 +19,13 @@
 import org.support.project.knowledge.config.NotifyType;
 import org.support.project.knowledge.dao.CommentsDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.NotifyConfigsDao;
 import org.support.project.knowledge.dao.WebhookConfigsDao;
 import org.support.project.knowledge.dao.WebhooksDao;
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.entity.NotifyConfigsEntity;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.entity.WebhookConfigsEntity;
 import org.support.project.knowledge.entity.WebhooksEntity;
@@ -33,6 +37,7 @@
 import org.support.project.knowledge.logic.WebhookLogic;
 import org.support.project.knowledge.vo.notification.CommentInsert;
 import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.MessageResult;
 import org.support.project.web.dao.MailConfigsDao;
 import org.support.project.web.dao.MailsDao;
 import org.support.project.web.dao.NotificationsDao;
@@ -48,8 +53,8 @@
  * ナレッジにコメントが登録された場合の通知
  * @author koda
  */
-@DI(instance = Instance.Singleton)
-public class CommentInsertNotification extends AbstractQueueNotification {
+@DI(instance = Instance.Prototype)
+public class CommentInsertNotification extends AbstractQueueNotification implements DesktopNotification {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(CommentInsertNotification.class);
     /** インスタンス取得 */
@@ -57,9 +62,28 @@ public static CommentInsertNotification get() {
         return Container.getComp(CommentInsertNotification.class);
     }
 
+    /** Added CommentsEntity */
+    private CommentsEntity comment;
+    public CommentsEntity getComment() {
+        return comment;
+    }
+    public void setComment(CommentsEntity comment) {
+        this.comment = comment;
+    }
+
     /** knowledge id what is sended */
     private List<Long> sendedCommentKnowledgeIds = new ArrayList<>();
     
+    @Override
+    public NotifyQueuesEntity getQueue() {
+        NotifyQueuesEntity entity = new NotifyQueuesEntity();
+        entity.setHash(RandomUtil.randamGen(30));
+        entity.setType(TYPE_KNOWLEDGE_COMMENT);
+        entity.setId(comment.getCommentNo());
+        return entity;
+    }
+    
+    
     @Override
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void notify(NotifyQueuesEntity notifyQueue) throws Exception {
@@ -155,7 +179,8 @@ private NotificationsEntity insertNotificationOnComentInsert(KnowledgesEntity kn
      * @param user メールの送信先
      * @throws Exception 
      */
-    private void sendCommentMail(CommentsEntity comment, KnowledgesEntity knowledge, UsersEntity commentUser, UsersEntity user, MailLocaleTemplatesEntity template)
+    private void sendCommentMail(CommentsEntity comment, KnowledgesEntity knowledge, UsersEntity commentUser,
+            UsersEntity user, MailLocaleTemplatesEntity template)
             throws Exception {
         MailConfigsDao mailConfigsDao = MailConfigsDao.get();
         MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
@@ -256,5 +281,43 @@ public void convNotification(NotificationsEntity notificationsEntity, LoginedUse
             notificationsEntity.setContent(contents);
         }
     }
+    @Override
+    public MessageResult getMessage(LoginedUser loginuser, Locale locale) {
+        NotifyConfigsDao dao = NotifyConfigsDao.get();
+        NotifyConfigsEntity entity = dao.selectOnKey(loginuser.getUserId()); // ログインユーザのデスクトップ通知設定
+        if (!NotifyLogic.get().flagCheck(entity.getNotifyDesktop())) {
+            // デスクトップ通知対象外
+            return null;
+        }
+        
+        KnowledgesDao knowledgesDao = KnowledgesDao.get();
+        KnowledgesEntity knowledge = knowledgesDao.selectOnKey(comment.getKnowledgeId());
+        // 登録者に通知
+        UsersEntity user = NotifyCommentLogic.get().getInsertUserOnComment(NotifyType.Desktop, comment, knowledge);
+        if (user != null) {
+            if (user.getUserId().intValue() == loginuser.getUserId().intValue()) {
+                // ログインユーザはナレッジ登録者で、自分の登録したナレッジにコメントがついたら通知を希望
+                MessageResult messageResult = new MessageResult();
+                messageResult.setMessage(Resources.getInstance(locale).getResource("knowledge.notify.msg.desktop.myitem.comment",
+                        StringUtils.abbreviate(knowledge.getTitle(), 80)));
+                messageResult.setResult(NotifyLogic.get().makeURL(knowledge.getKnowledgeId())); // Knowledgeへのリンク
+                return messageResult;
+            }
+        }
+        // 宛先のナレッジにコメント追加で通知が欲しいユーザに通知
+        List<UsersEntity> users = NotifyCommentLogic.get().getTargetUsersOnComment(NotifyType.Desktop, comment, knowledge);
+        for (UsersEntity target : users) {
+            if (target.getUserId().intValue() == loginuser.getUserId().intValue()) {
+                // 自分宛てのナレッジにコメントがついたので通知
+                MessageResult messageResult = new MessageResult();
+                messageResult.setMessage(
+                        Resources.getInstance(locale).getResource("knowledge.notify.msg.desktop.to.comment",
+                                StringUtils.abbreviate(knowledge.getTitle(), 80)));
+                messageResult.setResult(NotifyLogic.get().makeURL(knowledge.getKnowledgeId())); // Knowledgeへのリンク
+                return messageResult;
+            }
+        }
+        return null;
+    }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/DesktopNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/DesktopNotification.java
new file mode 100644
index 000000000..dfafe1cc6
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/DesktopNotification.java
@@ -0,0 +1,17 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.Locale;
+
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.MessageResult;
+
+public interface DesktopNotification {
+    /**
+     * デスクトップ通知するメッセージを取得
+     * 
+     * @param loginuser
+     * @param locale
+     * @return
+     */
+    MessageResult getMessage(LoginedUser loginuser, Locale locale);
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
index 76d0cff15..fbcb36b26 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
@@ -10,6 +10,7 @@
 import org.support.project.common.config.INT_FLAG;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.RandomUtil;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -41,6 +42,7 @@
 import org.support.project.knowledge.vo.GroupUser;
 import org.support.project.knowledge.vo.notification.KnowledgeUpdate;
 import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.MessageResult;
 import org.support.project.web.dao.MailConfigsDao;
 import org.support.project.web.dao.MailsDao;
 import org.support.project.web.dao.NotificationsDao;
@@ -56,8 +58,8 @@
  * ナレッジを登録・更新した際の通知処理
  * @author koda
  */
-@DI(instance = Instance.Singleton)
-public class KnowledgeUpdateNotification extends AbstractQueueNotification {
+@DI(instance = Instance.Prototype)
+public class KnowledgeUpdateNotification extends AbstractQueueNotification implements DesktopNotification {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(KnowledgeUpdateNotification.class);
     /** インスタンス取得 */
@@ -65,6 +67,24 @@ public static KnowledgeUpdateNotification get() {
         return Container.getComp(KnowledgeUpdateNotification.class);
     }
     
+    /** Updated KnowledgesEntity */
+    private KnowledgesEntity knowledge;
+    public KnowledgesEntity getKnowledge() {
+        return knowledge;
+    }
+    public void setKnowledge(KnowledgesEntity knowledge) {
+        this.knowledge = knowledge;
+    }
+    @Override
+    public NotifyQueuesEntity getQueue() {
+        NotifyQueuesEntity entity = new NotifyQueuesEntity();
+        entity.setHash(RandomUtil.randamGen(30));
+        entity.setType(getType());
+        entity.setId(knowledge.getKnowledgeId());
+        return entity;
+    }
+    
+    
     @Override
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void notify(NotifyQueuesEntity notifyQueue) throws Exception {
@@ -203,7 +223,8 @@ private void notifyKnowledgeUpdateToUsers(NotifyQueuesEntity notifyQueuesEntity,
      * @param config
      * @throws Exception 
      */
-    private void insertNotifyKnowledgeUpdateMailQue(KnowledgesEntity knowledge, UsersEntity usersEntity, MailLocaleTemplatesEntity template, String content) throws Exception {
+    private void insertNotifyKnowledgeUpdateMailQue(KnowledgesEntity knowledge, UsersEntity usersEntity,
+            MailLocaleTemplatesEntity template, String content) throws Exception {
         MailConfigsDao mailConfigsDao = MailConfigsDao.get();
         MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
         if (mailConfigsEntity == null) {
@@ -350,6 +371,9 @@ public void convNotification(NotificationsEntity notificationsEntity, LoginedUse
             }
         }
     }
-    
+    @Override
+    public MessageResult getMessage(LoginedUser loginuser, Locale locale) {
+        return NotifyLogic.get().getInsertKnowledgeMessage(loginuser, locale, knowledge);
+    }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
index 4887a7fca..fcf11168d 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
@@ -8,6 +8,7 @@
 import org.support.project.common.config.INT_FLAG;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.RandomUtil;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -27,6 +28,7 @@
 import org.support.project.knowledge.logic.NotifyLogic;
 import org.support.project.knowledge.vo.notification.LikeInsert;
 import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.MessageResult;
 import org.support.project.web.dao.MailConfigsDao;
 import org.support.project.web.dao.MailsDao;
 import org.support.project.web.dao.NotificationsDao;
@@ -42,8 +44,8 @@
  * イイネが押されたことを通知
  * @author koda
  */
-@DI(instance = Instance.Singleton)
-public class LikeInsertNotification extends AbstractQueueNotification {
+@DI(instance = Instance.Prototype)
+public class LikeInsertNotification extends AbstractQueueNotification implements DesktopNotification {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(LikeInsertNotification.class);
     /** インスタンス取得 */
@@ -54,6 +56,24 @@ public static LikeInsertNotification get() {
     /** like id what is sended */
     private List<Long> sendedLikeKnowledgeIds = new ArrayList<>();
     
+    /** Added LikesEntity */
+    private LikesEntity like;
+    public LikesEntity getLike() {
+        return like;
+    }
+    public void setLike(LikesEntity like) {
+        this.like = like;
+    }
+
+    @Override
+    public NotifyQueuesEntity getQueue() {
+        NotifyQueuesEntity entity = new NotifyQueuesEntity();
+        entity.setHash(RandomUtil.randamGen(30));
+        entity.setType(TYPE_KNOWLEDGE_LIKE);
+        entity.setId(like.getNo());
+        return entity;
+    }
+    
     @Override
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void notify(NotifyQueuesEntity notifyQueue) throws Exception {
@@ -130,8 +150,8 @@ private NotificationsEntity insertNotificationOnLikeMyItem(KnowledgesEntity know
      * @param template
      * @throws Exception 
      */
-    private void sendLikeMail(LikesEntity like, KnowledgesEntity knowledge, UsersEntity likeUser, UsersEntity user, MailLocaleTemplatesEntity template)
-            throws Exception {
+    private void sendLikeMail(LikesEntity like, KnowledgesEntity knowledge, UsersEntity likeUser, UsersEntity user,
+            MailLocaleTemplatesEntity template) throws Exception {
         MailConfigsDao mailConfigsDao = MailConfigsDao.get();
         MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
         if (mailConfigsEntity == null) {
@@ -204,5 +224,9 @@ public void convNotification(NotificationsEntity notificationsEntity, LoginedUse
         
 
     }
+    @Override
+    public MessageResult getMessage(LoginedUser loginuser, Locale locale) {
+        return NotifyLogic.get().getSaveLikeMessage(loginuser, locale, like);
+    }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
index d7b13e945..a9c23843b 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
@@ -3,13 +3,25 @@
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 
 public interface QueueNotification extends Notification {
-
+    /** notify type: insert knowledge */
+    int TYPE_KNOWLEDGE_INSERT = 1;
+    /** notify type: update knowledge */
+    int TYPE_KNOWLEDGE_UPDATE = 2;
+    /** notify type: add comment */
+    int TYPE_KNOWLEDGE_COMMENT = 11;
+    /** notify type: add like */
+    int TYPE_KNOWLEDGE_LIKE = 21;
+    
+    /**
+     * メール通知のキューを取得
+     * 
+     * @return
+     */
+    NotifyQueuesEntity getQueue();
     /**
      * 通知キューに入っている、通知を処理する
      * @param notifyQueue
      */
     void notify(NotifyQueuesEntity notifyQueue) throws Exception;
-    
-    
 
 }
diff --git a/src/main/java/org/support/project/knowledge/vo/Notify.java b/src/main/java/org/support/project/knowledge/vo/Notify.java
deleted file mode 100644
index ff40e4d09..000000000
--- a/src/main/java/org/support/project/knowledge/vo/Notify.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.support.project.knowledge.vo;
-
-import java.util.List;
-import java.util.Locale;
-
-import org.support.project.common.config.Resources;
-import org.support.project.common.util.RandomUtil;
-import org.support.project.common.util.StringUtils;
-import org.support.project.knowledge.config.NotifyType;
-import org.support.project.knowledge.dao.KnowledgesDao;
-import org.support.project.knowledge.dao.NotifyConfigsDao;
-import org.support.project.knowledge.entity.CommentsEntity;
-import org.support.project.knowledge.entity.KnowledgesEntity;
-import org.support.project.knowledge.entity.LikesEntity;
-import org.support.project.knowledge.entity.NotifyConfigsEntity;
-import org.support.project.knowledge.entity.NotifyQueuesEntity;
-import org.support.project.knowledge.logic.NotifyCommentLogic;
-import org.support.project.knowledge.logic.NotifyLogic;
-import org.support.project.web.bean.LoginedUser;
-import org.support.project.web.bean.MessageResult;
-import org.support.project.web.entity.UsersEntity;
-
-/**
- * Class for notify
- * @author Koda
- */
-public class Notify {
-    /** notify type: insert knowledge */
-    public static final int TYPE_KNOWLEDGE_INSERT = 1;
-    /** notify type: update knowledge */
-    public static final int TYPE_KNOWLEDGE_UPDATE = 2;
-    /** notify type: add comment */
-    public static final int TYPE_KNOWLEDGE_COMMENT = 11;
-    /** notify type: add like */
-    public static final int TYPE_KNOWLEDGE_LIKE = 21;
-
-    /** notify type */
-    private int type;
-
-    /** Updated KnowledgesEntity */
-    private KnowledgesEntity knowledge;
-    /** Added CommentsEntity */
-    private CommentsEntity comment;
-    /** Added LikesEntity */
-    private LikesEntity like;
-    
-    /**
-     * Knowledge inserted.
-     * @param entity
-     */
-    public void inserted(KnowledgesEntity entity) {
-        type = TYPE_KNOWLEDGE_INSERT;
-        knowledge = entity;
-    }
-    /**
-     * Knowledge updated.
-     * @param entity
-     */
-    public void updated(KnowledgesEntity entity) {
-        type = TYPE_KNOWLEDGE_UPDATE;
-        knowledge = entity;
-    }
-    /**
-     * Comment added.
-     * @param commentsEntity
-     */
-    public void commented(CommentsEntity commentsEntity) {
-        type = TYPE_KNOWLEDGE_COMMENT;
-        comment = commentsEntity;
-    }
-    /**
-     * Like added.
-     * @param entity
-     */
-    public void liked(LikesEntity entity) {
-        type = TYPE_KNOWLEDGE_LIKE;
-        like = entity;
-    }
-    /**
-     * メール通知のキューを取得
-     * 
-     * @return
-     */
-    public NotifyQueuesEntity getQueue() {
-        NotifyQueuesEntity entity = new NotifyQueuesEntity();
-        entity.setHash(RandomUtil.randamGen(30));
-        entity.setType(type);
-
-        if (type == TYPE_KNOWLEDGE_INSERT || type == TYPE_KNOWLEDGE_UPDATE) {
-            entity.setId(knowledge.getKnowledgeId());
-        } else if (type == TYPE_KNOWLEDGE_COMMENT) {
-            entity.setId(comment.getCommentNo());
-        } else if (type == TYPE_KNOWLEDGE_LIKE) {
-            entity.setId(like.getNo());
-        }
-        return entity;
-    }
-
-    /**
-     * デスクトップ通知するメッセージを取得
-     * 
-     * @param loginuser
-     * @param locale
-     * @return
-     */
-    public MessageResult getMessage(LoginedUser loginuser, Locale locale) {
-        if (type == TYPE_KNOWLEDGE_INSERT) {
-            return NotifyLogic.get().getInsertKnowledgeMessage(loginuser, locale, knowledge);
-        } else if (type == TYPE_KNOWLEDGE_UPDATE) {
-            return NotifyLogic.get().getUpdateKnowledgeMessage(loginuser, locale, knowledge);
-        } else if (type == TYPE_KNOWLEDGE_COMMENT) {
-            return this.getSaveCommentMessage(loginuser, locale, comment);
-        } else if (type == TYPE_KNOWLEDGE_LIKE) {
-            return NotifyLogic.get().getSaveLikeMessage(loginuser, locale, like);
-        }
-        return null;
-    }
-    /**
-     * コメント更新時のデスクトップメッセージを取得
-     * @param loginuser
-     * @param locale
-     * @param comment
-     * @return
-     */
-    private MessageResult getSaveCommentMessage(LoginedUser loginuser, Locale locale, CommentsEntity comment) {
-        NotifyConfigsDao dao = NotifyConfigsDao.get();
-        NotifyConfigsEntity entity = dao.selectOnKey(loginuser.getUserId()); // ログインユーザのデスクトップ通知設定
-        if (!NotifyLogic.get().flagCheck(entity.getNotifyDesktop())) {
-            // デスクトップ通知対象外
-            return null;
-        }
-        
-        KnowledgesDao knowledgesDao = KnowledgesDao.get();
-        KnowledgesEntity knowledge = knowledgesDao.selectOnKey(comment.getKnowledgeId());
-        // 登録者に通知
-        UsersEntity user = NotifyCommentLogic.get().getInsertUserOnComment(NotifyType.Desktop, comment, knowledge);
-        if (user != null) {
-            if (user.getUserId().intValue() == loginuser.getUserId().intValue()) {
-                // ログインユーザはナレッジ登録者で、自分の登録したナレッジにコメントがついたら通知を希望
-                MessageResult messageResult = new MessageResult();
-                messageResult.setMessage(Resources.getInstance(locale).getResource("knowledge.notify.msg.desktop.myitem.comment",
-                        StringUtils.abbreviate(knowledge.getTitle(), 80)));
-                messageResult.setResult(NotifyLogic.get().makeURL(knowledge.getKnowledgeId())); // Knowledgeへのリンク
-                return messageResult;
-            }
-        }
-        // 宛先のナレッジにコメント追加で通知が欲しいユーザに通知
-        List<UsersEntity> users = NotifyCommentLogic.get().getTargetUsersOnComment(NotifyType.Desktop, comment, knowledge);
-        for (UsersEntity target : users) {
-            if (target.getUserId().intValue() == loginuser.getUserId().intValue()) {
-                // 自分宛てのナレッジにコメントがついたので通知
-                MessageResult messageResult = new MessageResult();
-                messageResult.setMessage(
-                        Resources.getInstance(locale).getResource("knowledge.notify.msg.desktop.to.comment",
-                                StringUtils.abbreviate(knowledge.getTitle(), 80)));
-                messageResult.setResult(NotifyLogic.get().makeURL(knowledge.getKnowledgeId())); // Knowledgeへのリンク
-                return messageResult;
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/main/java/org/support/project/knowledge/websocket/NotifyAction.java b/src/main/java/org/support/project/knowledge/websocket/NotifyAction.java
index 806796eaf..78e1a6938 100644
--- a/src/main/java/org/support/project/knowledge/websocket/NotifyAction.java
+++ b/src/main/java/org/support/project/knowledge/websocket/NotifyAction.java
@@ -5,7 +5,7 @@
 import org.support.project.common.exception.ArgumentException;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-import org.support.project.knowledge.vo.Notify;
+import org.support.project.knowledge.logic.notification.DesktopNotification;
 
 @DI(instance = Instance.Singleton)
 public class NotifyAction extends Observable {
@@ -17,7 +17,7 @@ public class NotifyAction extends Observable {
      */
     @Override
     public void notifyObservers(Object arg) {
-        if (!(arg instanceof Notify)) {
+        if (!(arg instanceof DesktopNotification)) {
             if (arg == null) {
                 throw new ArgumentException("notify is invalid. only Notify.class. notify is null");
             } else {
diff --git a/src/main/java/org/support/project/knowledge/websocket/SessionObserver.java b/src/main/java/org/support/project/knowledge/websocket/SessionObserver.java
index d97b6fa6a..176a01800 100644
--- a/src/main/java/org/support/project/knowledge/websocket/SessionObserver.java
+++ b/src/main/java/org/support/project/knowledge/websocket/SessionObserver.java
@@ -9,7 +9,7 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
-import org.support.project.knowledge.vo.Notify;
+import org.support.project.knowledge.logic.notification.DesktopNotification;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.bean.MessageResult;
 import org.support.project.web.websocket.EndpointConfigurator;
@@ -56,15 +56,15 @@ public void update(Observable o, Object message) {
                 }
             }
 
-            if (message instanceof Notify && loginuser != null) {
-                Notify notify = (Notify) message;
+            if (message instanceof DesktopNotification && loginuser != null) {
+                DesktopNotification notify = (DesktopNotification) message;
                 MessageResult result = notify.getMessage(loginuser, locale);
                 if (result != null) {
-                    if (LOG.isInfoEnabled()) {
+                    if (LOG.isDebugEnabled()) {
                         StringBuilder builder = new StringBuilder();
                         builder.append("[Notify] ").append("User id:    ").append(session.getUserPrincipal().getName()).append("  ");
                         builder.append("Session id: ").append(session.getId()).append("  ").append(result.getMessage());
-                        LOG.info(builder.toString());
+                        LOG.debug(builder.toString());
                     }
                     session.getBasicRemote().sendText(JSON.encode(result));
                 }

From 11bbb6d0c75332ec9a51af5fa7fe2f86278bc56f Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sat, 26 Aug 2017 17:41:02 +0900
Subject: [PATCH 034/138] #444 Refactor desktop notification processing

---
 .../knowledge/dao/NotifyQueuesDao.java        |  12 +
 .../project/knowledge/logic/NotifyLogic.java  | 249 +++---------------
 .../CommentInsertNotification.java            |  10 +-
 .../KnowledgeUpdateNotification.java          | 116 +++++++-
 .../notification/LikeInsertNotification.java  |  31 ++-
 .../logic/notification/QueueNotification.java |   4 +-
 .../support/project/knowledge/TestCommon.java |  15 ++
 .../CommentInsertNotificationTest.java        |  56 ++++
 .../KnowledgeUpdateNotificationTest.java      |  75 ++++++
 .../LikeInsertNotificationTest.java           |  56 ++++
 .../notification/NotificationTestCommon.java  |  35 +++
 11 files changed, 434 insertions(+), 225 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/logic/notification/CommentInsertNotificationTest.java
 create mode 100644 src/test/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotificationTest.java
 create mode 100644 src/test/java/org/support/project/knowledge/logic/notification/LikeInsertNotificationTest.java
 create mode 100644 src/test/java/org/support/project/knowledge/logic/notification/NotificationTestCommon.java

diff --git a/src/main/java/org/support/project/knowledge/dao/NotifyQueuesDao.java b/src/main/java/org/support/project/knowledge/dao/NotifyQueuesDao.java
index 7e36273d5..3e3b31037 100644
--- a/src/main/java/org/support/project/knowledge/dao/NotifyQueuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/NotifyQueuesDao.java
@@ -1,5 +1,7 @@
 package org.support.project.knowledge.dao;
 
+import java.util.List;
+
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -24,6 +26,16 @@ public static NotifyQueuesDao get() {
         return Container.getComp(NotifyQueuesDao.class);
     }
 
+    /**
+     * Select all data that not deleted.
+     * @return all data
+     */
+    @Override
+    public List<NotifyQueuesEntity> selectAll() { 
+        String sql = "SELECT * FROM NOTIFY_QUEUES WHERE DELETE_FLAG = 0 ORDER BY INSERT_DATETIME ASC;";
+        return executeQueryList(sql, NotifyQueuesEntity.class);
+    }
+    
     /**
      * 通知キューに、同一の通知種類／IDの情報が無いか検索する
      * 
diff --git a/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java b/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
index 5800b046a..8263863e6 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
@@ -1,40 +1,25 @@
 package org.support.project.knowledge.logic;
 
 import java.util.List;
-import java.util.Locale;
 
 import org.support.project.common.config.INT_FLAG;
-import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
-import org.support.project.common.util.NumberUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.SystemConfig;
-import org.support.project.knowledge.dao.KnowledgeGroupsDao;
-import org.support.project.knowledge.dao.KnowledgeUsersDao;
-import org.support.project.knowledge.dao.KnowledgesDao;
-import org.support.project.knowledge.dao.NotifyConfigsDao;
-import org.support.project.knowledge.dao.NotifyQueuesDao;
 import org.support.project.knowledge.entity.CommentsEntity;
-import org.support.project.knowledge.entity.KnowledgeGroupsEntity;
-import org.support.project.knowledge.entity.KnowledgeUsersEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.LikesEntity;
-import org.support.project.knowledge.entity.NotifyConfigsEntity;
-import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.logic.notification.CommentInsertNotification;
 import org.support.project.knowledge.logic.notification.DesktopNotification;
 import org.support.project.knowledge.logic.notification.KnowledgeUpdateNotification;
 import org.support.project.knowledge.logic.notification.LikeInsertNotification;
 import org.support.project.knowledge.logic.notification.QueueNotification;
 import org.support.project.knowledge.websocket.NotifyAction;
-import org.support.project.web.bean.LoginedUser;
-import org.support.project.web.bean.MessageResult;
 import org.support.project.web.dao.SystemConfigsDao;
-import org.support.project.web.entity.GroupsEntity;
 import org.support.project.web.entity.SystemConfigsEntity;
 import org.support.project.web.entity.UsersEntity;
 /**
@@ -53,7 +38,6 @@ public class NotifyLogic {
     public static NotifyLogic get() {
         return Container.getComp(NotifyLogic.class);
     }
-
     /**
      * 指定のナレッジにアクセスするURLを作成
      * 
@@ -76,38 +60,10 @@ public String makeURL(Long knowledgeId) {
         builder.append(knowledgeId);
         return builder.toString();
     }
-
     /**
-     * 通知を処理
-     * 
+     * デスクトップ通知を処理（別スレッドで実行）
      * @param notify
      */
-    private void notifyMail(QueueNotification notify) {
-        // Mail通知
-        NotifyQueuesDao notifyQueuesDao = NotifyQueuesDao.get();
-        NotifyQueuesEntity notifyQueuesEntity = notify.getQueue();
-        // 重複チェックし
-        if (NumberUtils.is(notifyQueuesEntity.getType(), QueueNotification.TYPE_KNOWLEDGE_INSERT)) {
-            // ナレッジの新規登録は必ず通知のキューに入れる
-            notifyQueuesDao.insert(notifyQueuesEntity);
-        } else if (NumberUtils.is(notifyQueuesEntity.getType(), QueueNotification.TYPE_KNOWLEDGE_UPDATE)) {
-            // ナレッジが更新された場合、キューに「登録通知」もしくは「更新通知」が存在しているのであれば登録しない
-            NotifyQueuesEntity exist = notifyQueuesDao.selectOnTypeAndId(notifyQueuesEntity.getType(), notifyQueuesEntity.getId());
-            if (exist == null) {
-                exist = notifyQueuesDao.selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, notifyQueuesEntity.getId());
-                if (exist == null) {
-                    notifyQueuesDao.insert(notifyQueuesEntity);
-                }
-            }
-        } else if (NumberUtils.is(notifyQueuesEntity.getType(), QueueNotification.TYPE_KNOWLEDGE_LIKE)
-                || NumberUtils.is(notifyQueuesEntity.getType(), QueueNotification.TYPE_KNOWLEDGE_COMMENT)) {
-            NotifyQueuesEntity exist = notifyQueuesDao.selectOnTypeAndId(notifyQueuesEntity.getType(), notifyQueuesEntity.getId());
-            if (exist == null) {
-                notifyQueuesDao.insert(notifyQueuesEntity);
-            }
-        }
-    }
-    
     private void notifyDeskTop(DesktopNotification notify) {
         // Desktop通知は、多数のユーザを処理するので、別スレッドで処理する
         Thread t = new Thread(new Runnable() {
@@ -122,7 +78,35 @@ public void run() {
         t.setDaemon(true);
         t.start();
     }
-
+    /**
+     * Integer型のフラグをチェック
+     * 
+     * @param check
+     * @return
+     */
+    public boolean flagCheck(Integer check) {
+        if (check == null) {
+            return false;
+        }
+        if (check.intValue() == INT_FLAG.ON.getValue()) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * 既に指定のユーザが追加されているのか確認
+     * @param users
+     * @param groupUser
+     * @return
+     */
+    protected boolean contains(List<UsersEntity> users, UsersEntity groupUser) {
+        for (UsersEntity usersEntity : users) {
+            if (usersEntity.equalsOnKey(groupUser)) {
+                return true;
+            }
+        }
+        return false;
+    }
     /**
      * ナレッジが登録された際の通知
      * 
@@ -132,7 +116,7 @@ public void notifyOnKnowledgeInsert(KnowledgesEntity knowledgesEntity) {
         KnowledgeUpdateNotification notify = KnowledgeUpdateNotification.get();
         notify.setKnowledge(knowledgesEntity);
         notify.setType(QueueNotification.TYPE_KNOWLEDGE_INSERT);
-        notifyMail(notify);
+        notify.insertNotifyQueue();
         notifyDeskTop(notify);
     }
 
@@ -145,7 +129,7 @@ public void notifyOnKnowledgeUpdate(KnowledgesEntity knowledgesEntity) {
         KnowledgeUpdateNotification notify = KnowledgeUpdateNotification.get();
         notify.setKnowledge(knowledgesEntity);
         notify.setType(QueueNotification.TYPE_KNOWLEDGE_UPDATE);
-        notifyMail(notify);
+        notify.insertNotifyQueue();
         notifyDeskTop(notify);
     }
 
@@ -158,7 +142,7 @@ public void notifyOnKnowledgeLiked(Long knowledgeId, LikesEntity likesEntity) {
         LikeInsertNotification notify = LikeInsertNotification.get();
         notify.setLike(likesEntity);
         notify.setType(QueueNotification.TYPE_KNOWLEDGE_LIKE);
-        notifyMail(notify);
+        notify.insertNotifyQueue();
         notifyDeskTop(notify);
     }
 
@@ -171,174 +155,9 @@ public void notifyOnKnowledgeComment(Long knowledgeId, CommentsEntity commentsEn
         CommentInsertNotification notify = CommentInsertNotification.get();
         notify.setComment(commentsEntity);
         notify.setType(QueueNotification.TYPE_KNOWLEDGE_COMMENT);
-        notifyMail(notify);
+        notify.insertNotifyQueue();
         notifyDeskTop(notify);
     }
-    /**
-     * 指定のナレッジは、自分宛てのナレッジかどうかを判定し、メッセージを取得する
-     * 
-     * @param loginuser
-     * @param knowledge
-     * @return
-     */
-    public MessageResult getInsertKnowledgeMessage(LoginedUser loginuser, Locale locale, KnowledgesEntity knowledge) {
-        if (isToKnowledgeSave(loginuser, knowledge)) {
-            MessageResult messageResult = new MessageResult();
-            messageResult.setMessage(
-                    Resources.getInstance(locale).getResource("knowledge.notify.msg.desktop.to.insert", String.valueOf(knowledge.getKnowledgeId())));
-            messageResult.setResult(makeURL(knowledge.getKnowledgeId())); // Knowledgeへのリンク
-            return messageResult;
-        }
-        return null;
-    }
-
-    /**
-     * 指定のナレッジは、自分宛てのナレッジかどうかを判定し、メッセージを取得する
-     * 
-     * @param loginuser
-     * @param knowledge
-     * @return
-     */
-    public MessageResult getUpdateKnowledgeMessage(LoginedUser loginuser, Locale locale, KnowledgesEntity knowledge) {
-        // TODO ストック機能ができたら、ストックしたナレッジの更新かどうかを判定する
-        if (isToKnowledgeSave(loginuser, knowledge)) {
-            MessageResult messageResult = new MessageResult();
-            messageResult.setMessage(
-                    Resources.getInstance(locale).getResource("knowledge.notify.msg.desktop.to.update", String.valueOf(knowledge.getKnowledgeId())));
-            messageResult.setResult(makeURL(knowledge.getKnowledgeId())); // Knowledgeへのリンク
-            return messageResult;
-        }
-        return null;
-    }
-
-    /**
-     * 自分宛てのナレッジが登録／更新されたか判定する
-     * 
-     * @param loginuser
-     * @param knowledge
-     * @return
-     */
-    private boolean isToKnowledgeSave(LoginedUser loginuser, KnowledgesEntity knowledge) {
-        NotifyConfigsDao dao = NotifyConfigsDao.get();
-        NotifyConfigsEntity entity = dao.selectOnKey(loginuser.getUserId());
-        if (!flagCheck(entity.getNotifyDesktop())) {
-            // デスクトップ通知対象外
-            return false;
-        }
-//  自分が登録した場合は、通知する必要無し？いったんは通知する
-//        if (knowledge.getInsertUser().intValue() == loginuser.getUserId().intValue()) {
-//             return false;
-//        }
-        if (!flagCheck(entity.getToItemSave())) {
-            // 自分宛てのナレッジが登録／更新されたら通知するがOFF
-            return false;
-        }
-        return isToKnowledge(loginuser, knowledge, entity);
-    }
-
-    /**
-     * 指定のナレッジは、自分宛てのナレッジかどうかを判定する 自分宛ては以下の場合を言う ・公開区分が「公開」でかつ、「公開」でも通知する設定になっている場合 ・公開区分が「保護」でかつ、宛先に自分が入っている場合
-     * 
-     * @param loginuser
-     * @param knowledge
-     * @param entity
-     * @return
-     */
-    private boolean isToKnowledge(LoginedUser loginuser, KnowledgesEntity knowledge, NotifyConfigsEntity entity) {
-        if (knowledge.getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PUBLIC) {
-            // 公開のナレッジ
-            if (!flagCheck(entity.getToItemIgnorePublic())) {
-                // 公開も除外しない
-                return true;
-            }
-        } else if (knowledge.getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PROTECT) {
-            // 保護のナレッジ
-            KnowledgeGroupsDao knowledgeGroupsDao = KnowledgeGroupsDao.get();
-            List<KnowledgeGroupsEntity> groupsEntities = knowledgeGroupsDao.selectOnKnowledgeId(knowledge.getKnowledgeId());
-            List<GroupsEntity> groups = loginuser.getGroups();
-            for (KnowledgeGroupsEntity knowledgeGroupsEntity : groupsEntities) {
-                for (GroupsEntity groupsEntity : groups) {
-                    if (knowledgeGroupsEntity.getGroupId().intValue() == groupsEntity.getGroupId().intValue()) {
-                        return true;
-                    }
-                }
-            }
-
-            KnowledgeUsersDao knowledgeUsersDao = KnowledgeUsersDao.get();
-            List<KnowledgeUsersEntity> usersEntities = knowledgeUsersDao.selectOnKnowledgeId(knowledge.getKnowledgeId());
-            for (KnowledgeUsersEntity knowledgeUsersEntity : usersEntities) {
-                if (knowledgeUsersEntity.getUserId().intValue() == loginuser.getUserId().intValue()) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Integer型のフラグをチェック
-     * 
-     * @param check
-     * @return
-     */
-    public boolean flagCheck(Integer check) {
-        if (check == null) {
-            return false;
-        }
-        if (check.intValue() == INT_FLAG.ON.getValue()) {
-            return true;
-        }
-        return false;
-    }
 
-    /**
-     * 指定の「イイネ」の追加で通知するかどうかを判定し、通知する場合はメッセージを取得する
-     * 
-     * @param loginuser
-     * @param locale
-     * @param like
-     * @return
-     */
-    public MessageResult getSaveLikeMessage(LoginedUser loginuser, Locale locale, LikesEntity like) {
-        NotifyConfigsDao dao = NotifyConfigsDao.get();
-        NotifyConfigsEntity entity = dao.selectOnKey(loginuser.getUserId());
-        if (!flagCheck(entity.getNotifyDesktop())) {
-            // デスクトップ通知対象外
-            return null;
-        }
-        KnowledgesDao knowledgesDao = KnowledgesDao.get();
-        KnowledgesEntity knowledge = knowledgesDao.selectOnKey(like.getKnowledgeId());
-
-        if (flagCheck(entity.getMyItemLike()) && knowledge.getInsertUser().intValue() == loginuser.getUserId().intValue()) {
-            // 自分で投稿したナレッジにイイネが押されたので通知
-            MessageResult messageResult = new MessageResult();
-            messageResult.setMessage(Resources.getInstance(locale).getResource("knowledge.notify.msg.desktop.myitem.like",
-                    String.valueOf(knowledge.getKnowledgeId())));
-            messageResult.setResult(makeURL(knowledge.getKnowledgeId())); // Knowledgeへのリンク
-            return messageResult;
-        }
-
-        return null;
-    }
-    
-    
-    
-    /**
-     * 既に指定のユーザが追加されているのか確認
-     * @param users
-     * @param groupUser
-     * @return
-     */
-    protected boolean contains(List<UsersEntity> users, UsersEntity groupUser) {
-        for (UsersEntity usersEntity : users) {
-            if (usersEntity.equalsOnKey(groupUser)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    
-    
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
index 264f6d6a1..40e4f4dec 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/CommentInsertNotification.java
@@ -20,6 +20,7 @@
 import org.support.project.knowledge.dao.CommentsDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.dao.NotifyConfigsDao;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
 import org.support.project.knowledge.dao.WebhookConfigsDao;
 import org.support.project.knowledge.dao.WebhooksDao;
 import org.support.project.knowledge.entity.CommentsEntity;
@@ -75,12 +76,17 @@ public void setComment(CommentsEntity comment) {
     private List<Long> sendedCommentKnowledgeIds = new ArrayList<>();
     
     @Override
-    public NotifyQueuesEntity getQueue() {
+    public void insertNotifyQueue() {
         NotifyQueuesEntity entity = new NotifyQueuesEntity();
         entity.setHash(RandomUtil.randamGen(30));
         entity.setType(TYPE_KNOWLEDGE_COMMENT);
         entity.setId(comment.getCommentNo());
-        return entity;
+        
+        NotifyQueuesDao notifyQueuesDao = NotifyQueuesDao.get();
+        NotifyQueuesEntity exist = notifyQueuesDao.selectOnTypeAndId(entity.getType(), entity.getId());
+        if (exist == null) {
+            notifyQueuesDao.insert(entity);
+        }
     }
     
     
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
index fbcb36b26..4baf6ac84 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotification.java
@@ -8,8 +8,10 @@
 
 import org.support.project.aop.Aspect;
 import org.support.project.common.config.INT_FLAG;
+import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.NumberUtils;
 import org.support.project.common.util.RandomUtil;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
@@ -18,14 +20,19 @@
 import org.support.project.knowledge.bat.WebhookBat;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.dao.ExUsersDao;
+import org.support.project.knowledge.dao.KnowledgeGroupsDao;
 import org.support.project.knowledge.dao.KnowledgeItemValuesDao;
+import org.support.project.knowledge.dao.KnowledgeUsersDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.dao.NotifyConfigsDao;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
 import org.support.project.knowledge.dao.TargetsDao;
 import org.support.project.knowledge.dao.TemplateMastersDao;
 import org.support.project.knowledge.dao.WebhookConfigsDao;
 import org.support.project.knowledge.dao.WebhooksDao;
+import org.support.project.knowledge.entity.KnowledgeGroupsEntity;
 import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
+import org.support.project.knowledge.entity.KnowledgeUsersEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
 import org.support.project.knowledge.entity.NotifyConfigsEntity;
@@ -76,12 +83,27 @@ public void setKnowledge(KnowledgesEntity knowledge) {
         this.knowledge = knowledge;
     }
     @Override
-    public NotifyQueuesEntity getQueue() {
+    public void insertNotifyQueue() {
         NotifyQueuesEntity entity = new NotifyQueuesEntity();
         entity.setHash(RandomUtil.randamGen(30));
         entity.setType(getType());
         entity.setId(knowledge.getKnowledgeId());
-        return entity;
+        
+        NotifyQueuesDao notifyQueuesDao = NotifyQueuesDao.get();
+        // 重複チェックし
+        if (NumberUtils.is(entity.getType(), QueueNotification.TYPE_KNOWLEDGE_INSERT)) {
+            // ナレッジの新規登録は必ず通知のキューに入れる
+            notifyQueuesDao.insert(entity);
+        } else if (NumberUtils.is(entity.getType(), QueueNotification.TYPE_KNOWLEDGE_UPDATE)) {
+            // ナレッジが更新された場合、キューに「登録通知」もしくは「更新通知」が存在しているのであれば登録しない
+            NotifyQueuesEntity exist = notifyQueuesDao.selectOnTypeAndId(entity.getType(), entity.getId());
+            if (exist == null) {
+                exist = notifyQueuesDao.selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, entity.getId());
+                if (exist == null) {
+                    notifyQueuesDao.insert(entity);
+                }
+            }
+        }
     }
     
     
@@ -373,7 +395,95 @@ public void convNotification(NotificationsEntity notificationsEntity, LoginedUse
     }
     @Override
     public MessageResult getMessage(LoginedUser loginuser, Locale locale) {
-        return NotifyLogic.get().getInsertKnowledgeMessage(loginuser, locale, knowledge);
+        if (getType() == TYPE_KNOWLEDGE_UPDATE) {
+            return getUpdateKnowledgeMessage(loginuser, locale, "knowledge.notify.msg.desktop.to.update");
+        } else {
+            return getUpdateKnowledgeMessage(loginuser, locale, "knowledge.notify.msg.desktop.to.insert");
+        }
+    }
+
+    /**
+     * 指定のナレッジは、自分宛てのナレッジかどうかを判定し、メッセージを取得する
+     * 
+     * @param loginuser
+     * @param knowledge
+     * @return
+     */
+    private MessageResult getUpdateKnowledgeMessage(LoginedUser loginuser, Locale locale, String title) {
+        // TODO ストック機能ができたら、ストックしたナレッジの更新かどうかを判定する
+        if (isToKnowledgeSave(loginuser, knowledge)) {
+            MessageResult messageResult = new MessageResult();
+            messageResult.setMessage(
+                    Resources.getInstance(locale).getResource(title, String.valueOf(knowledge.getKnowledgeId())));
+            messageResult.setResult(NotifyLogic.get().makeURL(knowledge.getKnowledgeId())); // Knowledgeへのリンク
+            return messageResult;
+        }
+        return null;
     }
 
+    
+    /**
+     * 自分宛てのナレッジが登録／更新されたか判定する
+     * 
+     * @param loginuser
+     * @param knowledge
+     * @return
+     */
+    private boolean isToKnowledgeSave(LoginedUser loginuser, KnowledgesEntity knowledge) {
+        NotifyConfigsDao dao = NotifyConfigsDao.get();
+        NotifyConfigsEntity entity = dao.selectOnKey(loginuser.getUserId());
+        if (!NotifyLogic.get().flagCheck(entity.getNotifyDesktop())) {
+            // デスクトップ通知対象外
+            return false;
+        }
+//  自分が登録した場合は、通知する必要無し？いったんは通知する
+//        if (knowledge.getInsertUser().intValue() == loginuser.getUserId().intValue()) {
+//             return false;
+//        }
+        if (!NotifyLogic.get().flagCheck(entity.getToItemSave())) {
+            // 自分宛てのナレッジが登録／更新されたら通知するがOFF
+            return false;
+        }
+        return isToKnowledge(loginuser, knowledge, entity);
+    }
+
+    /**
+     * 指定のナレッジは、自分宛てのナレッジかどうかを判定する 自分宛ては以下の場合を言う ・公開区分が「公開」でかつ、「公開」でも通知する設定になっている場合 ・公開区分が「保護」でかつ、宛先に自分が入っている場合
+     * 
+     * @param loginuser
+     * @param knowledge
+     * @param entity
+     * @return
+     */
+    private boolean isToKnowledge(LoginedUser loginuser, KnowledgesEntity knowledge, NotifyConfigsEntity entity) {
+        if (knowledge.getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PUBLIC) {
+            // 公開のナレッジ
+            if (!NotifyLogic.get().flagCheck(entity.getToItemIgnorePublic())) {
+                // 公開も除外しない
+                return true;
+            }
+        } else if (knowledge.getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PROTECT) {
+            // 保護のナレッジ
+            KnowledgeGroupsDao knowledgeGroupsDao = KnowledgeGroupsDao.get();
+            List<KnowledgeGroupsEntity> groupsEntities = knowledgeGroupsDao.selectOnKnowledgeId(knowledge.getKnowledgeId());
+            List<GroupsEntity> groups = loginuser.getGroups();
+            for (KnowledgeGroupsEntity knowledgeGroupsEntity : groupsEntities) {
+                for (GroupsEntity groupsEntity : groups) {
+                    if (knowledgeGroupsEntity.getGroupId().intValue() == groupsEntity.getGroupId().intValue()) {
+                        return true;
+                    }
+                }
+            }
+
+            KnowledgeUsersDao knowledgeUsersDao = KnowledgeUsersDao.get();
+            List<KnowledgeUsersEntity> usersEntities = knowledgeUsersDao.selectOnKnowledgeId(knowledge.getKnowledgeId());
+            for (KnowledgeUsersEntity knowledgeUsersEntity : usersEntities) {
+                if (knowledgeUsersEntity.getUserId().intValue() == loginuser.getUserId().intValue()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
index fcf11168d..ce5c34bf8 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
@@ -6,6 +6,7 @@
 
 import org.support.project.aop.Aspect;
 import org.support.project.common.config.INT_FLAG;
+import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.RandomUtil;
@@ -17,6 +18,7 @@
 import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.dao.LikesDao;
 import org.support.project.knowledge.dao.NotifyConfigsDao;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
@@ -66,12 +68,17 @@ public void setLike(LikesEntity like) {
     }
 
     @Override
-    public NotifyQueuesEntity getQueue() {
+    public void insertNotifyQueue() {
         NotifyQueuesEntity entity = new NotifyQueuesEntity();
         entity.setHash(RandomUtil.randamGen(30));
         entity.setType(TYPE_KNOWLEDGE_LIKE);
         entity.setId(like.getNo());
-        return entity;
+        
+        NotifyQueuesDao notifyQueuesDao = NotifyQueuesDao.get();
+        NotifyQueuesEntity exist = notifyQueuesDao.selectOnTypeAndId(entity.getType(), entity.getId());
+        if (exist == null) {
+            notifyQueuesDao.insert(entity);
+        }
     }
     
     @Override
@@ -226,7 +233,25 @@ public void convNotification(NotificationsEntity notificationsEntity, LoginedUse
     }
     @Override
     public MessageResult getMessage(LoginedUser loginuser, Locale locale) {
-        return NotifyLogic.get().getSaveLikeMessage(loginuser, locale, like);
+        NotifyConfigsDao dao = NotifyConfigsDao.get();
+        NotifyConfigsEntity entity = dao.selectOnKey(loginuser.getUserId());
+        if (!NotifyLogic.get().flagCheck(entity.getNotifyDesktop())) {
+            // デスクトップ通知対象外
+            return null;
+        }
+        KnowledgesDao knowledgesDao = KnowledgesDao.get();
+        KnowledgesEntity knowledge = knowledgesDao.selectOnKey(like.getKnowledgeId());
+
+        if (NotifyLogic.get().flagCheck(entity.getMyItemLike()) && knowledge.getInsertUser().intValue() == loginuser.getUserId().intValue()) {
+            // 自分で投稿したナレッジにイイネが押されたので通知
+            MessageResult messageResult = new MessageResult();
+            messageResult.setMessage(Resources.getInstance(locale).getResource("knowledge.notify.msg.desktop.myitem.like",
+                    String.valueOf(knowledge.getKnowledgeId())));
+            messageResult.setResult(NotifyLogic.get().makeURL(knowledge.getKnowledgeId())); // Knowledgeへのリンク
+            return messageResult;
+        }
+
+        return null;
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
index a9c23843b..24ba16cc1 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
@@ -13,11 +13,11 @@ public interface QueueNotification extends Notification {
     int TYPE_KNOWLEDGE_LIKE = 21;
     
     /**
-     * メール通知のキューを取得
+     * メール通知のキューを保存
      * 
      * @return
      */
-    NotifyQueuesEntity getQueue();
+    void insertNotifyQueue();
     /**
      * 通知キューに入っている、通知を処理する
      * @param notifyQueue
diff --git a/src/test/java/org/support/project/knowledge/TestCommon.java b/src/test/java/org/support/project/knowledge/TestCommon.java
index 0433c8d59..f8e66ca0d 100644
--- a/src/test/java/org/support/project/knowledge/TestCommon.java
+++ b/src/test/java/org/support/project/knowledge/TestCommon.java
@@ -20,6 +20,9 @@
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.dao.gen.DatabaseControlDao;
 import org.support.project.knowledge.deploy.InitDB;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.vo.KnowledgeData;
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.ormapping.tool.config.ORmappingToolConfig;
@@ -196,4 +199,16 @@ protected static List<RolesEntity> addUser(LoginedUser user, String userName, In
         return rolesEntities;
     }
 
+    protected KnowledgesEntity insertKnowledge(String title, LoginedUser loginedUser) throws Exception {
+        KnowledgesEntity entity = new KnowledgesEntity();
+        entity.setTitle(title);
+        entity.setContent("contens of " + title);
+        entity.setTypeId(-100);
+        entity.setPublicFlag(KnowledgeLogic.PUBLIC_FLAG_PUBLIC);
+        KnowledgeData data = new KnowledgeData();
+        data.setKnowledge(entity);
+        entity = KnowledgeLogic.get().insert(data, loginedUser);
+        return entity;
+    }
+    
 }
diff --git a/src/test/java/org/support/project/knowledge/logic/notification/CommentInsertNotificationTest.java b/src/test/java/org/support/project/knowledge/logic/notification/CommentInsertNotificationTest.java
new file mode 100644
index 000000000..f74407dd6
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/logic/notification/CommentInsertNotificationTest.java
@@ -0,0 +1,56 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.support.project.common.test.Order;
+import org.support.project.common.test.OrderedRunner;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.CommentsEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.knowledge.logic.notification.Notification.TARGET;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.entity.NotificationsEntity;
+
+@RunWith(OrderedRunner.class)
+public class CommentInsertNotificationTest extends NotificationTestCommon {
+    @Test
+    @Order(order = 1)
+    public void testNotification() throws Exception {
+        // Knowledgeを登録し、それにコメント登録
+        KnowledgesEntity knowledge = super.insertKnowledge("テスト", loginedUser);
+        CommentsEntity comment = KnowledgeLogic.get().saveComment(knowledge.getKnowledgeId(), "コメント", new ArrayList<>(), loginedUser);
+        
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        LOG.info(list);
+        
+        Assert.assertEquals(2, list.size()); // Knowledge登録と、イイネの通知が登録されている
+        Assert.assertEquals(knowledge.getKnowledgeId(), list.get(0).getId());
+        Assert.assertEquals(QueueNotification.TYPE_KNOWLEDGE_INSERT, list.get(0).getType().intValue());
+        Assert.assertEquals(QueueNotification.TYPE_KNOWLEDGE_COMMENT, list.get(1).getType().intValue());
+        
+        CommentInsertNotification.get().notify(list.get(1)); // Likeの通知キューを処理
+        
+        List<NotificationsEntity> notifications = NotificationLogic.get().getNotification(loginedUser.getUserId(), 0, false);
+        LOG.info(notifications.get(0));
+        Assert.assertEquals(1, notifications.size()); // 登録した通知が届いている
+        
+        // 変換処理がエラーにならないこと
+        CommentInsertNotification.get().convNotification(notifications.get(0), loginedUser, TARGET.detail);
+        
+        // Desktop notification
+        CommentInsertNotification notify = CommentInsertNotification.get();
+        notify.setComment(comment);
+        notify.setType(QueueNotification.TYPE_KNOWLEDGE_COMMENT);
+
+        MessageResult result = notify.getMessage(loginedUser, loginedUser.getLocale());
+        LOG.info(result.getMessage());
+    }
+
+}
diff --git a/src/test/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotificationTest.java b/src/test/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotificationTest.java
new file mode 100644
index 000000000..e2543fd6a
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/logic/notification/KnowledgeUpdateNotificationTest.java
@@ -0,0 +1,75 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.support.project.common.config.INT_FLAG;
+import org.support.project.common.test.Order;
+import org.support.project.common.test.OrderedRunner;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.knowledge.logic.notification.Notification.TARGET;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.entity.NotificationsEntity;
+
+@RunWith(OrderedRunner.class)
+public class KnowledgeUpdateNotificationTest extends NotificationTestCommon {
+    @Test
+    @Order(order = 1)
+    public void testInsertNotifyQueue() throws Exception {
+        KnowledgesEntity entity = new KnowledgesEntity();
+        entity.setKnowledgeId(new Long(-1));
+        KnowledgeUpdateNotification notify = KnowledgeUpdateNotification.get();
+        notify.setKnowledge(entity);
+        notify.setType(QueueNotification.TYPE_KNOWLEDGE_INSERT);
+        notify.insertNotifyQueue();
+        
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        LOG.info(list);
+        
+        Assert.assertEquals(1, list.size());
+        Assert.assertEquals(new Long(-1), list.get(0).getId());
+        Assert.assertEquals(QueueNotification.TYPE_KNOWLEDGE_INSERT, list.get(0).getType().intValue());
+        
+        NotifyQueuesDao.get().delete(list.get(0));
+    }
+    
+    @Test
+    @Order(order = 2)
+    public void testNotify() throws Exception {
+        KnowledgesEntity entity = insertKnowledge("テスト", loginedUser);
+        entity = KnowledgesDao.get().selectOnKey(entity.getKnowledgeId());
+        Assert.assertEquals(INT_FLAG.OFF.getValue(), entity.getNotifyStatus().intValue());
+        
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        LOG.info(list);
+        
+        Assert.assertEquals(1, list.size());
+        
+        KnowledgeUpdateNotification.get().notify(list.get(0));
+        
+        entity = KnowledgesDao.get().selectOnKey(entity.getKnowledgeId());
+        Assert.assertEquals(INT_FLAG.ON.getValue(), entity.getNotifyStatus().intValue());
+        
+        List<NotificationsEntity> notifications = NotificationLogic.get().getNotification(loginedUser.getUserId(), 0, false);
+        LOG.info(notifications.get(0));
+        Assert.assertEquals(1, notifications.size()); // 登録した通知が届いている
+        
+        // 変換処理がエラーにならないこと
+        KnowledgeUpdateNotification.get().convNotification(notifications.get(0), loginedUser, TARGET.detail);
+        
+        // Desktop notification
+        KnowledgeUpdateNotification notify = KnowledgeUpdateNotification.get();
+        notify.setKnowledge(entity);
+        notify.setType(QueueNotification.TYPE_KNOWLEDGE_INSERT);
+
+        MessageResult result = notify.getMessage(loginedUser, loginedUser.getLocale());
+        LOG.info(result);
+    }
+
+}
diff --git a/src/test/java/org/support/project/knowledge/logic/notification/LikeInsertNotificationTest.java b/src/test/java/org/support/project/knowledge/logic/notification/LikeInsertNotificationTest.java
new file mode 100644
index 000000000..66c349f6b
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/logic/notification/LikeInsertNotificationTest.java
@@ -0,0 +1,56 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.support.project.common.test.Order;
+import org.support.project.common.test.OrderedRunner;
+import org.support.project.knowledge.dao.LikesDao;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikesEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.knowledge.logic.notification.Notification.TARGET;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.entity.NotificationsEntity;
+
+@RunWith(OrderedRunner.class)
+public class LikeInsertNotificationTest extends NotificationTestCommon {
+    @Test
+    @Order(order = 1)
+    public void testNotification() throws Exception {
+        // Knowledgeを登録し、それにいいねを押した
+        KnowledgesEntity knowledge = super.insertKnowledge("テスト", loginedUser);
+        KnowledgeLogic.get().addLike(knowledge.getKnowledgeId(), loginedUser2, loginedUser.getLocale());
+        
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        LOG.info(list);
+        
+        Assert.assertEquals(2, list.size()); // Knowledge登録と、イイネの通知が登録されている
+        Assert.assertEquals(knowledge.getKnowledgeId(), list.get(0).getId());
+        Assert.assertEquals(QueueNotification.TYPE_KNOWLEDGE_INSERT, list.get(0).getType().intValue());
+        Assert.assertEquals(QueueNotification.TYPE_KNOWLEDGE_LIKE, list.get(1).getType().intValue());
+        
+        LikeInsertNotification.get().notify(list.get(1)); // Likeの通知キューを処理
+        
+        List<NotificationsEntity> notifications = NotificationLogic.get().getNotification(loginedUser.getUserId(), 0, false);
+        LOG.info(notifications.get(0));
+        Assert.assertEquals(1, notifications.size()); // 登録した通知が届いている
+        
+        // 変換処理がエラーにならないこと
+        LikeInsertNotification.get().convNotification(notifications.get(0), loginedUser, TARGET.detail);
+        
+        // Desktop notification
+        LikesEntity like = LikesDao.get().selectOnKnowledge(knowledge.getKnowledgeId(), 0, 100).get(0);
+        LikeInsertNotification notify = LikeInsertNotification.get();
+        notify.setLike(like);
+        notify.setType(QueueNotification.TYPE_KNOWLEDGE_LIKE);
+
+        MessageResult result = notify.getMessage(loginedUser, loginedUser.getLocale());
+        LOG.info(result.getMessage());
+    }
+}
diff --git a/src/test/java/org/support/project/knowledge/logic/notification/NotificationTestCommon.java b/src/test/java/org/support/project/knowledge/logic/notification/NotificationTestCommon.java
new file mode 100644
index 000000000..01ba79ed4
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/logic/notification/NotificationTestCommon.java
@@ -0,0 +1,35 @@
+package org.support.project.knowledge.logic.notification;
+
+import org.junit.BeforeClass;
+import org.support.project.common.config.INT_FLAG;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.knowledge.TestCommon;
+import org.support.project.knowledge.dao.NotifyConfigsDao;
+import org.support.project.knowledge.entity.NotifyConfigsEntity;
+import org.support.project.knowledge.logic.AddUserProcessLogic;
+
+public abstract class NotificationTestCommon extends TestCommon {
+    /** ログ */
+    protected Log LOG = LogFactory.getLog(this.getClass());
+    
+    /**
+     * @BeforeClass
+     * @throws Exception
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        TestCommon.setUpBeforeClass();
+        AddUserProcessLogic logic = new AddUserProcessLogic();
+        logic.addUserProcess(loginedUser.getLoginUser().getUserKey());
+        // デスクトップ通知をONにする
+        NotifyConfigsEntity notifyConfig = NotifyConfigsDao.get().selectOnKey(loginedUser.getUserId());
+        if (notifyConfig != null) {
+            // デスクトプ通知はONにする
+            notifyConfig.setNotifyDesktop(INT_FLAG.ON.getValue());
+            NotifyConfigsDao.get().update(notifyConfig);
+        }
+    }
+
+
+}

From 1f529624133d7c71284e65163abca6450adeea73 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 28 Aug 2017 21:50:11 +0900
Subject: [PATCH 035/138] #444 Add a notification at comment liked

---
 .../project/knowledge/bat/NotifyMailBat.java  |   3 +
 .../knowledge/logic/KnowledgeLogic.java       |   6 +-
 .../project/knowledge/logic/MailLogic.java    |   1 +
 .../knowledge/logic/NotificationLogic.java    |   3 +
 .../project/knowledge/logic/NotifyLogic.java  |  10 +
 .../CommentLikedNotification.java             | 191 ++++++++++++++++++
 .../notification/LikeInsertNotification.java  |   6 +-
 .../logic/notification/QueueNotification.java |   2 +
 .../knowledge/vo/notification/LikeInsert.java |  17 ++
 .../mail/notify_insert_like_myitem_ja.xml     |   2 +-
 .../CommentLikedNotificationTest.java         |  57 ++++++
 11 files changed, 290 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/notification/CommentLikedNotification.java
 create mode 100644 src/test/java/org/support/project/knowledge/logic/notification/CommentLikedNotificationTest.java

diff --git a/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java b/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java
index 5423f68ed..504617199 100644
--- a/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java
+++ b/src/main/java/org/support/project/knowledge/bat/NotifyMailBat.java
@@ -10,6 +10,7 @@
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.logic.MailEventLogic;
 import org.support.project.knowledge.logic.notification.CommentInsertNotification;
+import org.support.project.knowledge.logic.notification.CommentLikedNotification;
 import org.support.project.knowledge.logic.notification.KnowledgeUpdateNotification;
 import org.support.project.knowledge.logic.notification.LikeInsertNotification;
 import org.support.project.knowledge.logic.notification.QueueNotification;
@@ -59,6 +60,8 @@ private void start() throws Exception {
                 CommentInsertNotification.get().notify(notifyQueuesEntity);
             } else if (notifyQueuesEntity.getType() == QueueNotification.TYPE_KNOWLEDGE_LIKE) {
                 LikeInsertNotification.get().notify(notifyQueuesEntity);
+            } else if (notifyQueuesEntity.getType() == QueueNotification.TYPE_COMMENT_LIKE) {
+                CommentLikedNotification.get().notify(notifyQueuesEntity);
             }
             // 通知のキューから削除
             //notifyQueuesDao.delete(notifyQueuesEntity);
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index 4265fc1eb..6b7bf9506 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -1192,11 +1192,11 @@ public Long addLikeComment(Long commentNo, LoginedUser loginedUser, Locale local
         }
         LikeCommentsEntity like = new LikeCommentsEntity();
         like.setCommentNo(commentNo);
-        LikeCommentsDao.get().insert(like);
+        like = LikeCommentsDao.get().insert(like);
         Long count = LikeCommentsDao.get().selectOnCommentNo(commentNo);
         
-        // 通知 TODO
-//        NotifyLogic.get().notifyOnKnowledgeLiked(knowledgeId, likesEntity);
+        // 通知
+        NotifyLogic.get().notifyOnCommentLiked(like);
 
         return count;
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/MailLogic.java b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
index 44c3ddc5c..ddbf945d3 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
@@ -67,6 +67,7 @@ public class MailLogic {
     public static final String NOTIFY_INSERT_KNOWLEDGE = "notify_insert_knowledge";
     public static final String NOTIFY_UPDATE_KNOWLEDGE = "notify_update_knowledge";
     public static final String NOTIFY_INSERT_LIKE_MYITEM = "notify_insert_like_myitem";
+    public static final String NOTIFY_INSERT_LIKE_COMMENT_MYITEM = "notify_insert_like_my_comment_item";
     public static final String NOTIFY_INSERT_COMMENT = "notify_insert_comment";
     public static final String NOTIFY_INSERT_COMMENT_MYITEM = "notify_insert_comment_myitem";
     public static final String NOTIFY_ADD_PARTICIPATE = "notify_add_participate";
diff --git a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
index b83eb3ce8..dae78c3cf 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotificationLogic.java
@@ -9,6 +9,7 @@
 import org.support.project.knowledge.logic.notification.AcceptCheckUserNotification;
 import org.support.project.knowledge.logic.notification.AddUserNotification;
 import org.support.project.knowledge.logic.notification.CommentInsertNotification;
+import org.support.project.knowledge.logic.notification.CommentLikedNotification;
 import org.support.project.knowledge.logic.notification.EventNotificationByWeek;
 import org.support.project.knowledge.logic.notification.KnowledgeUpdateNotification;
 import org.support.project.knowledge.logic.notification.LikeInsertNotification;
@@ -52,6 +53,8 @@ public Notification getNotification(String category) {
             return CommentInsertNotification.get();
         } else if (MailLogic.NOTIFY_INSERT_LIKE_MYITEM.equals(category)) {
             return LikeInsertNotification.get();
+        } else if (MailLogic.NOTIFY_INSERT_LIKE_COMMENT_MYITEM.equals(category)) {
+            return CommentLikedNotification.get();
         } else if (MailLogic.NOTIFY_EVENT.equals(category)) {
             return EventNotificationByWeek.get();
         } else if (MailLogic.NOTIFY_REGISTRATION_EVENT.equals(category)) {
diff --git a/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java b/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
index 8263863e6..cb7c57267 100644
--- a/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/NotifyLogic.java
@@ -12,8 +12,10 @@
 import org.support.project.knowledge.config.SystemConfig;
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.logic.notification.CommentInsertNotification;
+import org.support.project.knowledge.logic.notification.CommentLikedNotification;
 import org.support.project.knowledge.logic.notification.DesktopNotification;
 import org.support.project.knowledge.logic.notification.KnowledgeUpdateNotification;
 import org.support.project.knowledge.logic.notification.LikeInsertNotification;
@@ -158,6 +160,14 @@ public void notifyOnKnowledgeComment(Long knowledgeId, CommentsEntity commentsEn
         notify.insertNotifyQueue();
         notifyDeskTop(notify);
     }
+    
+    public void notifyOnCommentLiked(LikeCommentsEntity like) {
+        CommentLikedNotification notify = CommentLikedNotification.get();
+        notify.setLike(like);
+        notify.setType(QueueNotification.TYPE_COMMENT_LIKE);
+        notify.insertNotifyQueue();
+        notifyDeskTop(notify);
+    }
 
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/CommentLikedNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/CommentLikedNotification.java
new file mode 100644
index 000000000..644157ab0
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/notification/CommentLikedNotification.java
@@ -0,0 +1,191 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.support.project.common.config.INT_FLAG;
+import org.support.project.common.config.Resources;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.RandomUtil;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.CommentsDao;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.LikeCommentsDao;
+import org.support.project.knowledge.dao.NotifyConfigsDao;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.CommentsEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
+import org.support.project.knowledge.entity.MailLocaleTemplatesEntity;
+import org.support.project.knowledge.entity.NotifyConfigsEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.knowledge.logic.NotifyLogic;
+import org.support.project.knowledge.vo.notification.LikeInsert;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+import net.arnx.jsonic.JSON;
+
+@DI(instance = Instance.Prototype)
+public class CommentLikedNotification extends AbstractQueueNotification implements DesktopNotification {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(CommentLikedNotification.class);
+    /** インスタンス取得 */
+    public static CommentLikedNotification get() {
+        return Container.getComp(CommentLikedNotification.class);
+    }
+    
+    private LikeCommentsEntity like;
+    /**
+     * @return the like
+     */
+    public LikeCommentsEntity getLike() {
+        return like;
+    }
+    /**
+     * @param like the like to set
+     */
+    public void setLike(LikeCommentsEntity like) {
+        this.like = like;
+    }
+    
+    /** like id what is sended */
+    private List<Long> sended = new ArrayList<>();
+    
+
+    @Override
+    public void insertNotifyQueue() {
+        NotifyQueuesEntity entity = new NotifyQueuesEntity();
+        entity.setHash(RandomUtil.randamGen(30));
+        entity.setType(TYPE_COMMENT_LIKE);
+        entity.setId(like.getNo());
+        
+        NotifyQueuesDao notifyQueuesDao = NotifyQueuesDao.get();
+        NotifyQueuesEntity exist = notifyQueuesDao.selectOnTypeAndId(entity.getType(), entity.getId());
+        if (exist == null) {
+            notifyQueuesDao.insert(entity);
+        }
+    }
+    @Override
+    public void notify(NotifyQueuesEntity notifyQueue) throws Exception {
+        LikeCommentsEntity like = LikeCommentsDao.get().selectOnKey(notifyQueue.getId());
+        if (null == like) {
+            LOG.warn("LikeComment record not found. id: " + notifyQueue.getId());
+            return;
+        }
+        CommentsEntity comment = CommentsDao.get().selectOnKey(like.getCommentNo());
+        if (null == comment) {
+            LOG.warn("Comment record not found.");
+            return;
+        }
+        KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(comment.getKnowledgeId());
+        if (null == knowledge) {
+            LOG.warn("Knowledge record not found.");
+            return;
+        }
+        
+        if (sended.contains(comment.getCommentNo())) {
+            // この通知キューでは、コメント対し何件のイイネがあっても1回送るだけになる
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("comment [" + comment.getCommentNo() + "] ");
+            }
+            return;
+        } else {
+            sended.add(comment.getCommentNo());
+        }
+        
+        // イイネを押したユーザ
+        UsersEntity likeUser = UsersDao.get().selectOnKey(like.getInsertUser());
+        
+        // 宛先のユーザ（コメントを登録したユーザ）
+        UsersEntity user = UsersDao.get().selectOnKey(comment.getInsertUser());
+        if (user != null) {
+            NotifyConfigsDao notifyConfigsDao = NotifyConfigsDao.get();
+            NotifyConfigsEntity notifyConfigsEntity = notifyConfigsDao.selectOnKey(user.getUserId());
+            // 登録者でかつイイネが登録した場合に通知が欲しい
+            if (notifyConfigsEntity != null && INT_FLAG.flagCheck(notifyConfigsEntity.getMyItemLike())) {
+                // 通知情報生成
+                NotificationsEntity notification = new NotificationsEntity();
+                notification.setTitle(MailLogic.NOTIFY_INSERT_LIKE_COMMENT_MYITEM);
+                
+                LikeInsert info = new LikeInsert();
+                info.setKnowledgeId(knowledge.getKnowledgeId());
+                info.setKnowledgeTitle(knowledge.getTitle());
+                info.setCommentNo(comment.getCommentNo());
+                
+                info.setUpdateUser(user.getUserName());
+                info.setLikeInsertUser(like.getUserName());
+                
+                notification.setContent(JSON.encode(info));
+                notification = NotificationsDao.get().insert(notification);
+                
+                // 通知とユーザの紐付け
+                NotificationLogic.get().insertUserNotification(notification, user);
+                
+                // メール送信
+                Locale locale = user.getLocale();
+                MailLocaleTemplatesEntity template = MailLogic.get().load(locale, MailLogic.NOTIFY_INSERT_LIKE_MYITEM);
+                LikeInsertNotification.get().sendLikeMail(knowledge, likeUser, user, template);
+            }
+        }
+    }
+    
+    @Override
+    public void convNotification(NotificationsEntity notificationsEntity, LoginedUser loginedUser, TARGET target) {
+        LikeInsert info = JSON.decode(notificationsEntity.getContent(), LikeInsert.class);
+        MailLocaleTemplatesEntity template = MailLogic.get().load(loginedUser.getLocale(), MailLogic.NOTIFY_INSERT_LIKE_MYITEM);
+        
+        String title = template.getTitle();
+        title = title.replace("{KnowledgeId}", String.valueOf(info.getKnowledgeId()));
+        title = title.replace("{KnowledgeTitle}", StringUtils.abbreviate(info.getKnowledgeTitle(), 80));
+        notificationsEntity.setTitle(title);
+        
+        if (target == TARGET.detail) {
+            String contents = template.getContent();
+            contents = contents.replace("{KnowledgeId}", String.valueOf(info.getKnowledgeId()));
+            contents = contents.replace("{KnowledgeTitle}", info.getKnowledgeTitle());
+            contents = contents.replace("{User}", info.getUpdateUser());
+            contents = contents.replace("{URL}", NotifyLogic.get().makeURL(info.getKnowledgeId()));
+            CommentsEntity entity = CommentsDao.get().selectOnKey(info.getCommentNo());
+            if (entity != null) {
+                contents = contents.replace("{Contents}", entity.getComment());
+            } else {
+                contents = contents.replace("{Contents}", "");
+            }
+            contents = contents.replace("{LikeInsertUser}", info.getLikeInsertUser());
+            notificationsEntity.setContent(contents);
+        }
+    }
+    @Override
+    public MessageResult getMessage(LoginedUser loginuser, Locale locale) {
+        NotifyConfigsDao dao = NotifyConfigsDao.get();
+        NotifyConfigsEntity entity = dao.selectOnKey(loginuser.getUserId());
+        if (!NotifyLogic.get().flagCheck(entity.getNotifyDesktop())) {
+            // デスクトップ通知対象外
+            return null;
+        }
+        CommentsEntity comment = CommentsDao.get().selectOnKey(like.getCommentNo());
+
+        if (NotifyLogic.get().flagCheck(entity.getMyItemLike()) && comment.getInsertUser().intValue() == loginuser.getUserId().intValue()) {
+            // 自分で投稿したナレッジにイイネが押されたので通知
+            MessageResult messageResult = new MessageResult();
+            messageResult.setMessage(Resources.getInstance(locale).getResource("knowledge.notify.msg.desktop.myitem.like",
+                    String.valueOf(comment.getKnowledgeId())));
+            messageResult.setResult(NotifyLogic.get().makeURL(comment.getKnowledgeId())); // Knowledgeへのリンク
+            return messageResult;
+        }
+        return null;
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
index ce5c34bf8..7f5e1607f 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
@@ -125,7 +125,7 @@ public void notify(NotifyQueuesEntity notifyQueue) throws Exception {
                 // メール送信
                 Locale locale = user.getLocale();
                 MailLocaleTemplatesEntity template = MailLogic.get().load(locale, MailLogic.NOTIFY_INSERT_LIKE_MYITEM);
-                sendLikeMail(like, knowledge, likeUser, user, template);
+                sendLikeMail(knowledge, likeUser, user, template);
             }
         }
     }
@@ -157,7 +157,7 @@ private NotificationsEntity insertNotificationOnLikeMyItem(KnowledgesEntity know
      * @param template
      * @throws Exception 
      */
-    private void sendLikeMail(LikesEntity like, KnowledgesEntity knowledge, UsersEntity likeUser, UsersEntity user,
+    public void sendLikeMail(KnowledgesEntity knowledge, UsersEntity likeUser, UsersEntity user,
             MailLocaleTemplatesEntity template) throws Exception {
         MailConfigsDao mailConfigsDao = MailConfigsDao.get();
         MailConfigsEntity mailConfigsEntity = mailConfigsDao.selectOnKey(AppConfig.get().getSystemName());
@@ -228,8 +228,6 @@ public void convNotification(NotificationsEntity notificationsEntity, LoginedUse
             contents = contents.replace("{LikeInsertUser}", info.getLikeInsertUser());
             notificationsEntity.setContent(contents);
         }
-        
-
     }
     @Override
     public MessageResult getMessage(LoginedUser loginuser, Locale locale) {
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
index 24ba16cc1..c4e618073 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/QueueNotification.java
@@ -11,6 +11,8 @@ public interface QueueNotification extends Notification {
     int TYPE_KNOWLEDGE_COMMENT = 11;
     /** notify type: add like */
     int TYPE_KNOWLEDGE_LIKE = 21;
+    /** notify type: add like */
+    int TYPE_COMMENT_LIKE = 22;
     
     /**
      * メール通知のキューを保存
diff --git a/src/main/java/org/support/project/knowledge/vo/notification/LikeInsert.java b/src/main/java/org/support/project/knowledge/vo/notification/LikeInsert.java
index 1653a60f4..8e7e29abe 100644
--- a/src/main/java/org/support/project/knowledge/vo/notification/LikeInsert.java
+++ b/src/main/java/org/support/project/knowledge/vo/notification/LikeInsert.java
@@ -2,6 +2,9 @@
 
 public class LikeInsert extends KnowledgeUpdate {
     private String likeInsertUser;
+    
+    /** コメントにイイネが投稿された場合は、コメントのNoを保持 */
+    private Long commentNo;
 
     /**
      * @return the likeInsertUser
@@ -18,4 +21,18 @@ public void setLikeInsertUser(String likeInsertUser) {
         this.likeInsertUser = likeInsertUser;
     }
 
+    /**
+     * @return the commentNo
+     */
+    public Long getCommentNo() {
+        return commentNo;
+    }
+
+    /**
+     * @param commentNo the commentNo to set
+     */
+    public void setCommentNo(Long commentNo) {
+        this.commentNo = commentNo;
+    }
+
 }
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem_ja.xml b/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem_ja.xml
index 4a5d7d0b9..805c1a3c3 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem_ja.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem_ja.xml
@@ -2,7 +2,7 @@
 <mail>
 <title>[Knowledge] 評価の通知 {KnowledgeId} - {KnowledgeTitle}</title>
 <contents xml:space="preserve">
-以下のナレッジに「いいね！」が押されました！
+あなたの投稿に、「いいね！」が登録されました。
 
 {URL}
 
diff --git a/src/test/java/org/support/project/knowledge/logic/notification/CommentLikedNotificationTest.java b/src/test/java/org/support/project/knowledge/logic/notification/CommentLikedNotificationTest.java
new file mode 100644
index 000000000..d62e9fbad
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/logic/notification/CommentLikedNotificationTest.java
@@ -0,0 +1,57 @@
+package org.support.project.knowledge.logic.notification;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.support.project.common.test.Order;
+import org.support.project.knowledge.dao.LikeCommentsDao;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.CommentsEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.NotificationLogic;
+import org.support.project.knowledge.logic.notification.Notification.TARGET;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.entity.NotificationsEntity;
+
+public class CommentLikedNotificationTest extends NotificationTestCommon {
+    @Test
+    @Order(order = 1)
+    public void testNotification() throws Exception {
+        // Knowledgeを登録し、そこにコメント登録し、それにいいねを押した
+        KnowledgesEntity knowledge = super.insertKnowledge("テスト", loginedUser2);
+        CommentsEntity comment = KnowledgeLogic.get().saveComment(knowledge.getKnowledgeId(), "コメント", new ArrayList<>(), loginedUser);
+        KnowledgeLogic.get().addLikeComment(comment.getCommentNo(), loginedUser2, loginedUser.getLocale());
+
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        LOG.info(list);
+
+        Assert.assertEquals(3, list.size()); // Knowledge登録と、コメントの登録、イイネの通知が登録されている
+        Assert.assertEquals(knowledge.getKnowledgeId(), list.get(0).getId());
+        Assert.assertEquals(QueueNotification.TYPE_KNOWLEDGE_INSERT, list.get(0).getType().intValue());
+        Assert.assertEquals(QueueNotification.TYPE_KNOWLEDGE_COMMENT, list.get(1).getType().intValue());
+        Assert.assertEquals(QueueNotification.TYPE_COMMENT_LIKE, list.get(2).getType().intValue());
+
+        CommentLikedNotification.get().notify(list.get(2)); // Likeの通知キューを処理
+
+        List<NotificationsEntity> notifications = NotificationLogic.get().getNotification(loginedUser.getUserId(), 0, false);
+        Assert.assertEquals(1, notifications.size()); // 登録した通知が届いている
+        LOG.info(notifications.get(0));
+
+        // 変換処理がエラーにならないこと
+        CommentLikedNotification.get().convNotification(notifications.get(0), loginedUser, TARGET.detail);
+
+        // Desktop notification
+        LikeCommentsEntity like = LikeCommentsDao.get().selectOnCommentNo(comment.getCommentNo(), 0, 100).get(0);
+        CommentLikedNotification notify = CommentLikedNotification.get();
+        notify.setLike(like);
+        notify.setType(QueueNotification.TYPE_COMMENT_LIKE);
+
+        MessageResult result = notify.getMessage(loginedUser, loginedUser.getLocale());
+        LOG.info(result.getMessage());
+    }
+}

From fa69fd850f7748a5d18d08fc3aa7ba20b3515c1e Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 28 Aug 2017 21:51:16 +0900
Subject: [PATCH 036/138] #444 Change notification resources

---
 .../project/knowledge/mail/notify_add_participate.xml     | 2 +-
 .../project/knowledge/mail/notify_add_participate_ja.xml  | 2 +-
 .../project/knowledge/mail/notify_insert_comment.xml      | 7 ++++---
 .../project/knowledge/mail/notify_insert_comment_ja.xml   | 7 ++++---
 .../knowledge/mail/notify_insert_comment_myitem.xml       | 8 +++++---
 .../knowledge/mail/notify_insert_comment_myitem_ja.xml    | 7 ++++---
 .../project/knowledge/mail/notify_insert_knowledge.xml    | 1 -
 .../project/knowledge/mail/notify_insert_like_myitem.xml  | 3 ++-
 .../knowledge/mail/notify_insert_like_myitem_ja.xml       | 3 ++-
 .../project/knowledge/mail/notify_registration_event.xml  | 2 +-
 .../knowledge/mail/notify_registration_event_ja.xml       | 2 +-
 .../project/knowledge/mail/notify_remove_participate.xml  | 2 +-
 .../knowledge/mail/notify_remove_participate_ja.xml       | 2 +-
 13 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_add_participate.xml b/src/main/resources/org/support/project/knowledge/mail/notify_add_participate.xml
index abc7348f2..4f23da0f7 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_add_participate.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_add_participate.xml
@@ -15,7 +15,7 @@ Add a participant for your event.
  Please understand that it can not reply to this email.
 </contents>
 
-<templateTitle>Add Participant</templateTitle>
+<templateTitle>Add a Participant</templateTitle>
 <description>
 Service send a notice on add a participant for event.
 
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_add_participate_ja.xml b/src/main/resources/org/support/project/knowledge/mail/notify_add_participate_ja.xml
index 46d9c48fd..cd8b93e51 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_add_participate_ja.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_add_participate_ja.xml
@@ -15,7 +15,7 @@
  このメールに対する返信は出来ませんので御了承ください。
 </contents>
 
-<templateTitle>参加者登録</templateTitle>
+<templateTitle>参加登録の通知</templateTitle>
 <description>
 参加者が登録された場合に、開催者（＝登録者）に通知をだします。
 
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment.xml b/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment.xml
index 512d493bf..0c0789c29 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment.xml
@@ -7,13 +7,14 @@ Comment was added：{KnowledgeId}
 {URL}
 
 ------------------------------------------
-{CommentInsertUser}
+User: {CommentInsertUser}
 
-{CommentContents}
+Comment: {CommentContents}
 
 ------------------------------------------
-{KnowledgeTitle}
+Title: {KnowledgeTitle}
 
+------------------------------------------
 {Contents}
 
 ------------------------------------------
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_ja.xml b/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_ja.xml
index 87b489bb0..52015a1f6 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_ja.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_ja.xml
@@ -7,13 +7,14 @@
 {URL}
 
 ------------------------------------------
-{CommentInsertUser}
+User: {CommentInsertUser}
 
-{CommentContents}
+Comment: {CommentContents}
 
 ------------------------------------------
-{KnowledgeTitle}
+Title: {KnowledgeTitle}
 
+------------------------------------------
 {Contents}
 
 ------------------------------------------
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_myitem.xml b/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_myitem.xml
index c6221b87a..9935d955b 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_myitem.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_myitem.xml
@@ -7,16 +7,18 @@ Comment has been registered to your registered knowledge：{KnowledgeId}
 {URL}
 
 ------------------------------------------
-{CommentInsertUser}
+User: {CommentInsertUser}
 
-{CommentContents}
+Comment: {CommentContents}
 
 ------------------------------------------
-{KnowledgeTitle}
+Title: {KnowledgeTitle}
 
+------------------------------------------
 {Contents}
 
 ------------------------------------------
+
  This e-mail has been sent automatically from the system.
  Please understand that it can not reply to this email.
 </contents>
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_myitem_ja.xml b/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_myitem_ja.xml
index 706fc9192..e6a6dabfd 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_myitem_ja.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_insert_comment_myitem_ja.xml
@@ -7,13 +7,14 @@
 {URL}
 
 ------------------------------------------
-{CommentInsertUser}
+User: {CommentInsertUser}
 
-{CommentContents}
+Comment: {CommentContents}
 
 ------------------------------------------
-{KnowledgeTitle}
+Title: {KnowledgeTitle}
 
+------------------------------------------
 {Contents}
 
 ------------------------------------------
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_insert_knowledge.xml b/src/main/resources/org/support/project/knowledge/mail/notify_insert_knowledge.xml
index 68217d433..c6c8622d7 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_insert_knowledge.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_insert_knowledge.xml
@@ -11,7 +11,6 @@ User: {User}
 Title: {KnowledgeTitle}
 
 ------------------------------------------
-
 {Contents}
 
 ------------------------------------------
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem.xml b/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem.xml
index 69a0cb09d..adf3fe976 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem.xml
@@ -7,8 +7,9 @@
 {URL}
 
 ------------------------------------------
-{KnowledgeTitle}
+Title: {KnowledgeTitle}
 
+------------------------------------------
 {Contents}
 
 ------------------------------------------
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem_ja.xml b/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem_ja.xml
index 805c1a3c3..def1ba614 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem_ja.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_insert_like_myitem_ja.xml
@@ -7,8 +7,9 @@
 {URL}
 
 ------------------------------------------
-{KnowledgeTitle}
+Title: {KnowledgeTitle}
 
+------------------------------------------
 {Contents}
 
 ------------------------------------------
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_registration_event.xml b/src/main/resources/org/support/project/knowledge/mail/notify_registration_event.xml
index 711de8264..66af5dfcf 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_registration_event.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_registration_event.xml
@@ -16,7 +16,7 @@ Status: {Status}
  Please understand that it can not reply to this email.
 </contents>
 
-<templateTitle>Registration to event</templateTitle>
+<templateTitle>Registration to the event</templateTitle>
 <description>
 System will notify the user who registered for participation.
 
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_registration_event_ja.xml b/src/main/resources/org/support/project/knowledge/mail/notify_registration_event_ja.xml
index 257662c89..e97e429ac 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_registration_event_ja.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_registration_event_ja.xml
@@ -16,7 +16,7 @@ Status: {Status}
  このメールに対する返信は出来ませんので御了承ください。
 </contents>
 
-<templateTitle>参加者登録</templateTitle>
+<templateTitle>イベントへの参加を登録しました</templateTitle>
 <description>
 参加登録したユーザに通知を出します。
 
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_remove_participate.xml b/src/main/resources/org/support/project/knowledge/mail/notify_remove_participate.xml
index 6302d8099..fb8365356 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_remove_participate.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_remove_participate.xml
@@ -15,7 +15,7 @@ Remove a participant for your event.
  Please understand that it can not reply to this email.
 </contents>
 
-<templateTitle>Add Participant</templateTitle>
+<templateTitle>Remove a participant</templateTitle>
 <description>
 Service send a notice on remove a participant for event.
 
diff --git a/src/main/resources/org/support/project/knowledge/mail/notify_remove_participate_ja.xml b/src/main/resources/org/support/project/knowledge/mail/notify_remove_participate_ja.xml
index de1fe65d4..2eea0ecdd 100644
--- a/src/main/resources/org/support/project/knowledge/mail/notify_remove_participate_ja.xml
+++ b/src/main/resources/org/support/project/knowledge/mail/notify_remove_participate_ja.xml
@@ -15,7 +15,7 @@
  このメールに対する返信は出来ませんので御了承ください。
 </contents>
 
-<templateTitle>参加者登録</templateTitle>
+<templateTitle>参加取り消しの通知</templateTitle>
 <description>
 参加者が参加取り消しを実施した場合に、開催者（＝登録者）に通知をだします。
 

From 3d5571634f50c789fddd45927d5c33d1bd86501a Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 29 Aug 2017 23:37:25 +0900
Subject: [PATCH 037/138] #820 Change database migration process timing.
 Before: auto execute at startup After: execute on the maintenance screen

---
 document/database/knowledge.a5er              | 184 ++++++++++++++++--
 .../project/knowledge/config/AppConfig.java   |  16 ++
 .../control/admin/ConfigControl.java          |   7 +
 .../project/knowledge/deploy/InitDB.java      |  38 +++-
 .../deploy/InitializationListener.java        |  24 ++-
 .../deploy/v1_11_0/Migrate_1_11_2.java        |  26 +++
 .../filter/MaintenanceModeFilter.java         |  89 +++++++++
 .../knowledge/listener/CronListener.java      |  24 +++
 .../GlobalInitializationListener.java         |   1 -
 .../websocket/DataExportEndpoint.java         |   5 +
 .../knowledge/websocket/MigrateEndpoint.java  |  67 +++++++
 src/main/resources/appresource.properties     |   9 +
 src/main/resources/appresource_ja.properties  |   9 +
 .../project/knowledge/database/ddl.sql        |  89 +++++++++
 .../deploy/v1_11_0/migrate_v1_11_2.sql        |  92 +++++++++
 .../WEB-INF/views/admin/config/system.jsp     |   5 +-
 .../WEB-INF/views/commons/maintenance.jsp     |  94 +++++++++
 .../webapp/WEB-INF/views/commons/migrate.jsp  | 112 +++++++++++
 src/main/webapp/WEB-INF/web.xml               |  14 +-
 19 files changed, 881 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
 create mode 100644 src/main/java/org/support/project/knowledge/filter/MaintenanceModeFilter.java
 create mode 100644 src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java
 create mode 100644 src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
 create mode 100644 src/main/webapp/WEB-INF/views/commons/maintenance.jsp
 create mode 100644 src/main/webapp/WEB-INF/views/commons/migrate.jsp

diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
index 0693be842..735705f81 100755
--- a/document/database/knowledge.a5er
+++ b/document/database/knowledge.a5er
@@ -46,6 +46,165 @@ SqlSeparator=0
 ShowTag=1
 ShowCommonAttributes=0
 
+[Relation]
+Entity1=BADGES
+Entity2=USER_BADGES
+RelationType1=2
+RelationType2=3
+Fields1=NO
+Fields2=NO
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,5330,5968,5735,R,R
+Dependence=1
+Caption=
+PName=
+ModifiedDateTime=20170829163644
+LineMode=0
+Bar1=533
+Bar2=597
+Bar3=574
+TermPos1=R
+TermPos2=R
+
+[Relation]
+Entity1=USERS
+Entity2=USER_BADGES
+RelationType1=1
+RelationType2=3
+Fields1=USER_ID
+Fields2=USER_ID
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,4363,5637,3229,R,R
+Dependence=1
+Caption=
+PName=
+LineMode=0
+Bar1=436
+Bar2=564
+Bar3=323
+TermPos1=R
+TermPos2=R
+
+[Entity]
+PName=USER_BADGES
+LName=ユーザの称号
+Comment=
+TableOption=
+Page=Main
+Left=2950
+Top=850
+Field="ユーザID","USER_ID","INTEGER","NOT NULL",0,"","",$FFFFFFFF,""
+Field="番号","NO","INTEGER","NOT NULL",1,"","",$FFFFFFFF,""
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20170829163555
+Position="Main",2950,850
+
+[Comment]
+Comment=種類 / ターゲット : 意味\n------------------------\n1 / knowledge_id : ナレッジを登録した [+]\n2 / knowledge_id : ナレッジを参照した [+]\n3 / knowledge_id : ナレッジにイイネを押した [+]\n4 / knowledge_id : ナレッジにイイネが押された\n5 / knowledge_id : イベントに参加登録した [+]\n6 / knowledge_id : イベント参加者が増えた\n7 / knowledge_id : ナレッジがストックされた [+]\n8 / knowledge_id : ナレッジのアンケートに回答した [+]\n9 / knowledge_id : ナレッジのアンケートに回答があった\n10 / knowledge_id : ナレッジにコメントが登録された [+]\n11 / knowledge_id : コメントにイイネが押された [+]\n\n101 / knowledge_id : 参加をやめた（マイナス）\n\n1002 / comment_no : コメントを登録した\n1003 / comment_no : コメントにイイネを押した\n1004 / comment_no : コメントにイイネが押された\n\nユーザのポイントは、USER_CONFIGSテーブルへ格納する\n\n\n\n
+FontName=Tahoma
+FontBold=0
+FontItalic=0
+FontUnderline=0
+FontSize=6
+FontColor=$000000
+LineColor=$000000
+BkColor=$FFFFFF
+Page=Main
+Left=3500
+Top=950
+Width=564
+Height=586
+
+[Relation]
+Entity1=USERS
+Entity2=ACTIVITIES
+RelationType1=2
+RelationType2=3
+Fields1=USER_ID
+Fields2=USER_ID
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,3081,6033,4726,R,R
+Dependence=1
+Caption=
+PName=
+ModifiedDateTime=20170829161626
+LineMode=0
+Bar1=308
+Bar2=603
+Bar3=473
+TermPos1=R
+TermPos2=R
+
+[Entity]
+PName=ACTIVITIES
+LName=アクティビティ
+Comment=
+TableOption=
+Page=Main
+Left=3500
+Top=800
+Field="番号","NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
+Field="ユーザID","USER_ID","INTEGER","NOT NULL",,"","",$FFFFFFFF,""
+Field="種類","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Field="ターゲットID","TARGET","BIGINT","NOT NULL",,"","",$FFFFFFFF,""
+Field="獲得ポイント","POINT","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Index=IDX_ACTIVITIES_USER_ID=0,USER_ID
+Index=IDX_ACTIVITIES_TYPE_TARGET=0,TYPE,TARGET
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20170829163512
+Position="Main",3500,800
+
+[Entity]
+PName=USERS
+LName=ユーザ
+Comment=
+TableOption=
+Page=Main
+Left=3500
+Top=500
+Field="ユーザID","USER_ID","SERIAL","NOT NULL",0,"","",$FFFFFFFF,""
+Field="ユーザKEY","USER_KEY","@VARCHAR(256)","NOT NULL",,"","ユニーク",$FFFFFFFF,""
+Field="ユーザ名","USER_NAME","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,""
+Field="パスワード","PASSWORD","@VARCHAR(1024)","NOT NULL",,"","ハッシュ(不可逆)",$FFFFFFFF,""
+Field="SALT","SALT","@VARCHAR(1024)",,,"","",$FFFFFFFF,""
+Field="ロケール","LOCALE_KEY","@VARCHAR(12)",,,"","",$FFFFFFFF,""
+Field="メールアドレス","MAIL_ADDRESS","@VARCHAR(256)",,,"","",$FFFFFFFF,""
+Field="LDAP認証ユーザかどうか","AUTH_LDAP","@INT",,,"","",$FFFFFFFF,""
+Index=IDX_USERS_USER_KEY=1,USER_KEY
+NoDDL=1
+UsingCommonColumns=0
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20170829160846
+Position="Main",3500,500
+
+[Entity]
+PName=BADGES
+LName=称号
+Comment=
+TableOption=
+Page=Main
+Left=2900
+Top=600
+Field="番号","NO","SERIAL","NOT NULL",0,"","",$FFFFFFFF,""
+Field="名称","NAME","@VARCHAR(128)","NOT NULL",,"","",$FFFFFFFF,""
+Field="表示名","DISPLAY_TEXT","@VARCHAR(32)","NOT NULL",,"","",$FFFFFFFF,""
+Field="説明","DESCRIPTION","text",,,"","",$FFFFFFFF,""
+Field="画像の種類","IMAGE_CATEGORY","@INT",,,"","",$FFFFFFFF,""
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20170829161444
+Position="Main",2900,600
+
 [Relation]
 Entity1=COMMENTS
 Entity2=LIKE_COMMENTS
@@ -71,7 +230,7 @@ PName=LIKE_COMMENTS
 LName=コメントのイイネ
 Comment=
 TableOption=
-Page=Main
+Page=MAIN
 Left=1600
 Top=1450
 Field="NO","NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
@@ -82,7 +241,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170809123907
-Position="Main",1600,1450
+Position="MAIN",1600,1450
 
 [Entity]
 PName=TOKENS
@@ -266,7 +425,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=ITEM_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4194,5115,6198,R,R
+Position="MAIN",0,4194,5115,6185,R,R
 Dependence=0
 Caption=
 PName=
@@ -274,7 +433,7 @@ ModifiedDateTime=20170220204434
 LineMode=0
 Bar1=419
 Bar2=512
-Bar3=620
+Bar3=618
 TermPos1=R
 TermPos2=R
 
@@ -305,7 +464,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4662,4335,5353,R,R
+Position="MAIN",0,4662,4335,5351,R,R
 Dependence=0
 Caption=
 PName=
@@ -458,7 +617,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4320,4611,5418,R,R
+Position="MAIN",0,4320,4611,5405,R,R
 Dependence=1
 Caption=
 PName=
@@ -466,7 +625,7 @@ ModifiedDateTime=20170222215225
 LineMode=0
 Bar1=432
 Bar2=461
-Bar3=542
+Bar3=540
 TermPos1=R
 TermPos2=R
 
@@ -608,7 +767,7 @@ Fields1=HOOK_ID
 Fields2=HOOK
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4124,4194,3043,R,R
+Position="MAIN",0,4124,4194,3050,R,R
 Dependence=0
 Caption=
 PName=
@@ -616,7 +775,7 @@ ModifiedDateTime=20161206104307
 LineMode=0
 Bar1=412
 Bar2=419
-Bar3=304
+Bar3=305
 TermPos1=R
 TermPos2=R
 
@@ -1432,7 +1591,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,2082,5725,4638,R,R
+Position="MAIN",0,2082,5725,4629,R,R
 Dependence=1
 Caption=
 PName=
@@ -1440,7 +1599,7 @@ ModifiedDateTime=20150910042925
 LineMode=0
 Bar1=208
 Bar2=572
-Bar3=464
+Bar3=463
 TermPos1=R
 TermPos2=R
 
@@ -1670,10 +1829,11 @@ Field="コメント件数","COMMENT_COUNT","@INT",,,"","",$FFFFFFFF,""
 Field="参照件数","VIEW_COUNT","bigint",,,"","",$FFFFFFFF,""
 Field="テンプレートの種類ID","TYPE_ID","@INT",,,"","",$FFFFFFFF,""
 Field="通知ステータス","NOTIFY_STATUS","@INT",,,"","",$FFFFFFFF,""
+Field="ポイント","POINT","@INT","NOT NULL",,"0","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20170705135801
+ModifiedDateTime=20170829164715
 Position="MAIN",700,1100
 
 [Comment]
diff --git a/src/main/java/org/support/project/knowledge/config/AppConfig.java b/src/main/java/org/support/project/knowledge/config/AppConfig.java
index ed82a5101..3cb6fd6c7 100644
--- a/src/main/java/org/support/project/knowledge/config/AppConfig.java
+++ b/src/main/java/org/support/project/knowledge/config/AppConfig.java
@@ -22,6 +22,8 @@ public static AppConfig get() {
     
     private boolean convSlidePath = false;
     
+    private boolean maintenanceMode = false;
+    
 
     /**
      * @return the indexPath
@@ -71,4 +73,18 @@ public void setSlidePath(String slidePath) {
         this.slidePath = slidePath;
     }
 
+    /**
+     * @return the maintenanceMode
+     */
+    public boolean isMaintenanceMode() {
+        return maintenanceMode;
+    }
+
+    /**
+     * @param maintenanceMode the maintenanceMode to set
+     */
+    public void setMaintenanceMode(boolean maintenanceMode) {
+        this.maintenanceMode = maintenanceMode;
+    }
+
 }
diff --git a/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java b/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java
index d1a65b3a4..e75525723 100644
--- a/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java
+++ b/src/main/java/org/support/project/knowledge/control/admin/ConfigControl.java
@@ -21,10 +21,12 @@
 import org.support.project.web.dao.MailConfigsDao;
 import org.support.project.web.dao.SystemAttributesDao;
 import org.support.project.web.dao.SystemConfigsDao;
+import org.support.project.web.dao.SystemsDao;
 import org.support.project.web.entity.LdapConfigsEntity;
 import org.support.project.web.entity.MailConfigsEntity;
 import org.support.project.web.entity.SystemAttributesEntity;
 import org.support.project.web.entity.SystemConfigsEntity;
+import org.support.project.web.entity.SystemsEntity;
 
 @DI(instance = Instance.Prototype)
 public class ConfigControl extends Control {
@@ -139,6 +141,11 @@ public Boundary system() {
             setAttribute("like_config", config.getConfigValue());
         }
         
+        SystemsEntity entity = SystemsDao.get().selectOnKey(AppConfig.get().getSystemName());
+        if (entity != null) {
+            setAttribute("db_version", entity.getVersion());
+        }
+        
         return forward("system.jsp");
     }
 
diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
index b06fa6a47..72b8c1df8 100644
--- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java
+++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
@@ -7,6 +7,8 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.deploy.v0_0_1.InitializeSystem;
 import org.support.project.knowledge.deploy.v0_4_4.Migrate_0_4_4;
 import org.support.project.knowledge.deploy.v0_5_0.Migrate_0_5_0;
@@ -22,6 +24,7 @@
 import org.support.project.knowledge.deploy.v1_10_0.Migrate_1_10_2;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_0;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_1;
+import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_2;
 import org.support.project.knowledge.deploy.v1_1_0pre1.Migrate_1_1_0pre1;
 import org.support.project.knowledge.deploy.v1_4_0.Migrate_1_4_0;
 import org.support.project.knowledge.deploy.v1_5_0.Migrate_1_5_0;
@@ -37,6 +40,7 @@
 import org.support.project.knowledge.deploy.v1_8_0.Migrate_1_8_5;
 import org.support.project.web.dao.SystemsDao;
 import org.support.project.web.entity.SystemsEntity;
+import org.support.project.web.logic.DBConnenctionLogic;
 
 public class InitDB {
     /** ログ */
@@ -46,7 +50,7 @@ public class InitDB {
     private static final Map<String, Migrate> MAP = new LinkedHashMap<>();
 
     private static final Migrate INIT = InitializeSystem.get();
-    public static final String CURRENT = "1.11.1";
+    public static final String CURRENT = "1.11.2";
 
     public InitDB() {
         super();
@@ -78,6 +82,7 @@ public InitDB() {
         MAP.put("1.10.2", Migrate_1_10_2.get());
         MAP.put("1.11.0", Migrate_1_11_0.get());
         MAP.put("1.11.1", Migrate_1_11_1.get());
+        MAP.put("1.11.2", Migrate_1_11_2.get());
     }
 
     public static void main(String[] args) throws Exception {
@@ -85,9 +90,40 @@ public static void main(String[] args) throws Exception {
         TimeZone zone = TimeZone.getTimeZone("GMT");
         TimeZone.setDefault(zone);
 
+        AppConfig.get();
+        String envValue = System.getenv(AppConfig.getEnvKey());
+        LOG.info("migrate is start.");
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Env [" + AppConfig.getEnvKey() + "] is [" + envValue + "].");
+            LOG.debug("Config :" + PropertyUtil.reflectionToString(AppConfig.get()));
+        }
+        DBConnenctionLogic.get().connectCustomConnection();
+        
         InitDB init = new InitDB();
         init.start();
     }
+    
+    private String doInit() throws Exception {
+        String version = CURRENT;
+        Migrate migrate = INIT;
+        doMigrate(migrate, version);
+        return CURRENT;
+    }
+    public String init() throws Exception {
+        SystemsDao dao = SystemsDao.get();
+        try {
+            SystemsEntity entity = dao.selectOnKey(SYSTEM_NAME);
+            if (entity != null) {
+                LOG.info("The database of this service is arleady inited. database version is " + entity.getVersion() + ".");
+                return entity.getVersion();
+            } else {
+                return doInit();
+            }
+        } catch (Exception e) {
+            // テーブルが存在しない（初めての起動）
+            return doInit();
+        }
+    }
 
     public void start() throws Exception {
         String version = "";
diff --git a/src/main/java/org/support/project/knowledge/deploy/InitializationListener.java b/src/main/java/org/support/project/knowledge/deploy/InitializationListener.java
index 7de390742..3e5a09846 100644
--- a/src/main/java/org/support/project/knowledge/deploy/InitializationListener.java
+++ b/src/main/java/org/support/project/knowledge/deploy/InitializationListener.java
@@ -1,20 +1,17 @@
 package org.support.project.knowledge.deploy;
 
 import java.io.File;
-import java.util.List;
+import java.util.TimeZone;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
+import org.support.project.common.exception.SystemException;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.knowledge.config.AnalyticsConfig;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.SystemConfig;
-import org.support.project.knowledge.dao.ServiceConfigsDao;
-import org.support.project.knowledge.dao.ServiceLocaleConfigsDao;
-import org.support.project.knowledge.entity.ServiceConfigsEntity;
-import org.support.project.knowledge.entity.ServiceLocaleConfigsEntity;
 import org.support.project.knowledge.logic.ServiceConfigLogic;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.web.dao.SystemAttributesDao;
@@ -35,7 +32,16 @@ public void contextDestroyed(ServletContextEvent contextEvent) {
     @Override
     public void contextInitialized(ServletContextEvent contextEvent) {
         LOG.debug("contextInitialized");
-        InitializationLogic.get().init();
+        // DBの初期化処理
+        TimeZone zone = TimeZone.getTimeZone("GMT");
+        TimeZone.setDefault(zone);
+        InitDB initDB = new InitDB();
+        String version;
+        try {
+            version = initDB.init();
+        } catch (Exception e) {
+            throw new SystemException(e);
+        }
 
         // 添付ファイル格納ディレクトリ（テンポラリディレクトリ）が存在しなければ生成
         AppConfig appConfig = AppConfig.get();
@@ -66,6 +72,12 @@ public void contextInitialized(ServletContextEvent contextEvent) {
         
         // トップページ情報を取得
         ServiceConfigLogic.get().load();
+        
+        if (!InitDB.CURRENT.equals(version)) {
+            // Databaseのマイグレーションが必要
+            appConfig.setMaintenanceMode(true);
+            LOG.warn("The database version of this service is " + version + ". but lastest version is " + InitDB.CURRENT + ". Then this service start MaintenanceMode");
+        }
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
new file mode 100644
index 000000000..88335c6f0
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -0,0 +1,26 @@
+package org.support.project.knowledge.deploy.v1_11_0;
+
+import org.support.project.knowledge.deploy.Migrate;
+import org.support.project.ormapping.tool.dao.InitializeDao;
+
+public class Migrate_1_11_2 implements Migrate {
+
+    public static Migrate_1_11_2 get() {
+        return org.support.project.di.Container.getComp(Migrate_1_11_2.class);
+    }
+
+    @Override
+    public boolean doMigrate() throws Exception {
+        InitializeDao initializeDao = InitializeDao.get();
+        String[] sqlpaths = {
+            "/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql",
+        };
+        initializeDao.initializeDatabase(sqlpaths);
+        
+        // 参照回数を集計
+        
+        // ポイント修正
+        
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/support/project/knowledge/filter/MaintenanceModeFilter.java b/src/main/java/org/support/project/knowledge/filter/MaintenanceModeFilter.java
new file mode 100644
index 000000000..3e704f39c
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/filter/MaintenanceModeFilter.java
@@ -0,0 +1,89 @@
+package org.support.project.knowledge.filter;
+
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.common.HttpUtil;
+import org.support.project.web.config.CommonWebParameter;
+import org.support.project.web.dao.SystemsDao;
+import org.support.project.web.entity.SystemsEntity;
+
+public class MaintenanceModeFilter implements Filter {
+    
+    private Pattern pattern = Pattern.compile("^/bower|^/images|^/css|^/js|^/favicon.ico|^/lang|css$|js$|jpg$|jpeg$|gif$|png$|ico$|html$");
+    
+    @Override
+    public void destroy() {
+    }
+
+    @Override
+    public void init(FilterConfig config) throws ServletException {
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletrequest, ServletResponse servletresponse, FilterChain filterchain)
+            throws IOException, ServletException {
+        HttpServletRequest req = (HttpServletRequest) servletrequest;
+        HttpServletResponse res = (HttpServletResponse) servletresponse;
+        
+        StringBuilder pathBuilder = new StringBuilder();
+        pathBuilder.append(req.getServletPath());
+        if (req.getPathInfo() != null && req.getPathInfo().length() > 0) {
+            pathBuilder.append(req.getPathInfo());
+        }
+        String path = pathBuilder.toString();
+        
+        if (AppConfig.get().isMaintenanceMode()) {
+            // アクセス遮断の対象外のものは、普通にアクセス可能
+            Matcher matcher = pattern.matcher(path);
+            if (matcher.find()) {
+                // 対象外なのでスルー
+                filterchain.doFilter(servletrequest, servletresponse);
+                return;
+            }
+            
+            // メンテナンスモード中にして、一般のユーザはアクセスできないようにする
+            LoginedUser user = (LoginedUser) req.getSession().getAttribute(CommonWebParameter.LOGIN_USER_INFO_SESSION_KEY);
+            if (user != null && user.isAdmin()) {
+                // 管理者
+                if (path.equals("/protect.migrate")) {
+                    SystemsEntity entity = SystemsDao.get().selectOnKey(AppConfig.get().getSystemName());
+                    if (entity != null) {
+                        req.setAttribute("db_version", entity.getVersion());
+                    }
+                    HttpUtil.forward(res, req, "/WEB-INF/views/commons/migrate.jsp");
+                    return;
+                } else if (path.equals("/migrate")) {
+                    // マイグレーションのWebSocketパス
+                    filterchain.doFilter(servletrequest, servletresponse);
+                    return;
+                }
+            }
+            HttpUtil.forward(res, req, "/WEB-INF/views/commons/maintenance.jsp");
+            return;
+        } else {
+            if (path.equals("/protect.migrate")) {
+                SystemsEntity entity = SystemsDao.get().selectOnKey(AppConfig.get().getSystemName());
+                if (entity != null) {
+                    req.setAttribute("db_version", entity.getVersion());
+                }
+                HttpUtil.forward(res, req, "/WEB-INF/views/commons/migrate.jsp");
+                return;
+            }
+            filterchain.doFilter(servletrequest, servletresponse);
+        }
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/listener/CronListener.java b/src/main/java/org/support/project/knowledge/listener/CronListener.java
index 4ff9f14f5..e6685fbd3 100644
--- a/src/main/java/org/support/project/knowledge/listener/CronListener.java
+++ b/src/main/java/org/support/project/knowledge/listener/CronListener.java
@@ -45,6 +45,10 @@ public void contextInitialized(final ServletContextEvent sce) {
         fileClearfuture = service.scheduleAtFixedRate(new Runnable() {
             @Override
             public void run() {
+                if (AppConfig.get().isMaintenanceMode()) {
+                    LOG.debug("This service is maintenance mode now.");
+                    return;
+                }
                 LOG.trace("called. [fileClearfuture]");
                 // Java を別のVMで実行（添付ファイルの定期的なクリア）
                 JavaJob job = new JavaJob();
@@ -73,6 +77,10 @@ public void run() {
         parsefuture = service.scheduleAtFixedRate(new Runnable() {
             @Override
             public void run() {
+                if (AppConfig.get().isMaintenanceMode()) {
+                    LOG.debug("This service is maintenance mode now.");
+                    return;
+                }
                 LOG.trace("called. [parsefuture]");
                 // 添付ファイルの中身を抽出し検索可能にする
                 JavaJob job = new JavaJob();
@@ -101,6 +109,10 @@ public void run() {
         mailfuture = service.scheduleAtFixedRate(new Runnable() {
             @Override
             public void run() {
+                if (AppConfig.get().isMaintenanceMode()) {
+                    LOG.debug("This service is maintenance mode now.");
+                    return;
+                }
                 LOG.trace("called. [mailfuture]");
                 // メール送信
                 JavaJob job = new JavaJob();
@@ -129,6 +141,10 @@ public void run() {
         webhookfuture = service.scheduleAtFixedRate(new Runnable() {
             @Override
             public void run() {
+                if (AppConfig.get().isMaintenanceMode()) {
+                    LOG.debug("This service is maintenance mode now.");
+                    return;
+                }
                 LOG.trace("called. [webhookfuture]");
                 // Webhook
                 JavaJob job = new JavaJob();
@@ -157,6 +173,10 @@ public void run() {
         mailHookfuture = service.scheduleAtFixedRate(new Runnable() {
             @Override
             public void run() {
+                if (AppConfig.get().isMaintenanceMode()) {
+                    LOG.debug("This service is maintenance mode now.");
+                    return;
+                }
                 LOG.trace("called. [mailHookfuture]");
                 // メールからの投稿用のメールの読み込み
                 JavaJob job = new JavaJob();
@@ -185,6 +205,10 @@ public void run() {
         notifyfuture = service.scheduleAtFixedRate(new Runnable() {
             @Override
             public void run() {
+                if (AppConfig.get().isMaintenanceMode()) {
+                    LOG.debug("This service is maintenance mode now.");
+                    return;
+                }
                 LOG.trace("called. [notifyfuture]");
                 // Java を別のVMで実行（添付ファイルの中身を抽出し検索可能にする）
                 JavaJob job = new JavaJob();
diff --git a/src/main/java/org/support/project/knowledge/listener/GlobalInitializationListener.java b/src/main/java/org/support/project/knowledge/listener/GlobalInitializationListener.java
index e22962035..e7355ef2e 100644
--- a/src/main/java/org/support/project/knowledge/listener/GlobalInitializationListener.java
+++ b/src/main/java/org/support/project/knowledge/listener/GlobalInitializationListener.java
@@ -11,7 +11,6 @@
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.StringUtils;
 import org.support.project.knowledge.config.AppConfig;
-import org.support.project.knowledge.config.SystemConfig;
 
 public class GlobalInitializationListener implements ServletContextListener {
     private static final Log LOG = LogFactory.getLog(GlobalInitializationListener.class);
diff --git a/src/main/java/org/support/project/knowledge/websocket/DataExportEndpoint.java b/src/main/java/org/support/project/knowledge/websocket/DataExportEndpoint.java
index 08df2c9cb..23711655c 100644
--- a/src/main/java/org/support/project/knowledge/websocket/DataExportEndpoint.java
+++ b/src/main/java/org/support/project/knowledge/websocket/DataExportEndpoint.java
@@ -9,6 +9,7 @@
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
 
+import org.support.project.common.bat.JobResult;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.knowledge.bat.CreateExportDataBat;
@@ -44,4 +45,8 @@ public void onError(Throwable t) {
             LOG.warn("websocket error -> ", t);
         }
     }
+
+    @Override
+    protected void finishJob(JobResult result, Session session) {
+    }
 }
diff --git a/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java b/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java
new file mode 100644
index 000000000..e277484b7
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java
@@ -0,0 +1,67 @@
+package org.support.project.knowledge.websocket;
+
+import java.io.IOException;
+
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+
+import org.support.project.common.bat.JobResult;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.deploy.InitDB;
+import org.support.project.web.dao.SystemsDao;
+import org.support.project.web.entity.SystemsEntity;
+import org.support.project.web.websocket.CallBatchEndpoint;
+import org.support.project.web.websocket.EndpointConfigurator;
+
+import net.arnx.jsonic.JSONException;
+
+@ServerEndpoint(value = "/migrate", configurator = EndpointConfigurator.class)
+public class MigrateEndpoint extends CallBatchEndpoint {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(ReindexingEndpoint.class);
+
+    @OnOpen
+    public void onOpen(Session session) throws IOException {
+        if (super.isAdmin(session)) {
+            this.setSendPlefix("");
+            call(session, InitDB.class);
+        }
+    }
+    
+    @OnClose
+    public void onClose(Session session) {
+    }
+
+    @OnMessage
+    public void onMessage(String text) throws JSONException, IOException {
+    }
+
+    @OnError
+    public void onError(Throwable t) {
+        LOG.warn("websocket on error." + t.getClass().getName() + " : " + t.getMessage());
+        if (LOG.isDebugEnabled()) {
+            LOG.warn("websocket error -> ", t);
+        }
+    }
+
+    @Override
+    protected void finishJob(JobResult result, Session session) {
+        SystemsEntity entity = SystemsDao.get().selectOnKey(AppConfig.get().getSystemName());
+        if (entity != null) {
+            if (InitDB.CURRENT.equals(entity.getVersion())) {
+                AppConfig.get().setMaintenanceMode(false);
+            }
+        }
+        try {
+            session.close();
+        } catch (IOException e) {
+            LOG.warn("websocket on error." + e.getClass().getName() + " : " + e.getMessage());
+        }
+    }
+}
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 59d000938..fe20e305c 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -843,3 +843,12 @@ knowledge.notification.title=Notifications
 knowledge.notification.list.all=All items
 knowledge.notification.list.only.unread=Only unread
 knowledge.notification.view.not.found=Data is not found on "{1}".
+
+knowledge.maintenance.status=Site is down for maintenance
+knowledge.maintenance.do.migrate=Execute maintenance
+knowledge.maintenance.do.migrate.no.login=Execute maintenance(only administrator)
+knowledge.maintenance.migrate.title=Database migration
+knowledge.maintenance.migrate.message=You can execute database migration. recommend to backup database data.
+
+
+
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index c9b742b26..9591363ec 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -843,3 +843,12 @@ knowledge.notification.title=通知
 knowledge.notification.list.all=すべて表示
 knowledge.notification.list.only.unread=未読のみ
 knowledge.notification.view.not.found=「{1}」 にデータがありません
+
+knowledge.maintenance.status=メンテナンス中
+knowledge.maintenance.do.migrate=メンテナンス管理を実行
+knowledge.maintenance.do.migrate.no.login=メンテナンス管理を実行(管理者のみアクセス可能)
+knowledge.maintenance.migrate.title=Database migration
+knowledge.maintenance.migrate.message=DBのマイグレーションを実行します。事前にDBのバックアップを取ることをオススメします。
+
+
+
diff --git a/src/main/resources/org/support/project/knowledge/database/ddl.sql b/src/main/resources/org/support/project/knowledge/database/ddl.sql
index 3e207c597..3c240ff4f 100644
--- a/src/main/resources/org/support/project/knowledge/database/ddl.sql
+++ b/src/main/resources/org/support/project/knowledge/database/ddl.sql
@@ -1,3 +1,57 @@
+-- ユーザの称号
+drop table if exists USER_BADGES cascade;
+
+create table USER_BADGES (
+  USER_ID INTEGER not null
+  , NO INTEGER not null
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint USER_BADGES_PKC primary key (USER_ID,NO)
+) ;
+
+-- アクティビティ
+drop table if exists ACTIVITIES cascade;
+
+create table ACTIVITIES (
+  NO BIGSERIAL not null
+  , USER_ID INTEGER not null
+  , TYPE integer not null
+  , TARGET BIGINT not null
+  , POINT integer not null
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint ACTIVITIES_PKC primary key (NO)
+) ;
+
+create index IDX_ACTIVITIES_USER_ID
+  on ACTIVITIES(USER_ID);
+
+create index IDX_ACTIVITIES_TYPE_TARGET
+  on ACTIVITIES(TYPE,TARGET);
+
+-- 称号
+drop table if exists BADGES cascade;
+
+create table BADGES (
+  NO SERIAL not null
+  , NAME character varying(128) not null
+  , DISPLAY_TEXT character varying(32) not null
+  , DESCRIPTION text
+  , IMAGE_CATEGORY integer
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint BADGES_PKC primary key (NO)
+) ;
+
 -- コメントのイイネ
 drop table if exists LIKE_COMMENTS cascade;
 
@@ -751,6 +805,7 @@ create table KNOWLEDGES (
   , VIEW_COUNT bigint
   , TYPE_ID integer
   , NOTIFY_STATUS integer
+  , POINT integer default 0 not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
@@ -759,6 +814,39 @@ create table KNOWLEDGES (
   , constraint KNOWLEDGES_PKC primary key (KNOWLEDGE_ID)
 ) ;
 
+comment on table USER_BADGES is 'ユーザの称号';
+comment on column USER_BADGES.USER_ID is 'ユーザID';
+comment on column USER_BADGES.NO is '番号';
+comment on column USER_BADGES.INSERT_USER is '登録ユーザ';
+comment on column USER_BADGES.INSERT_DATETIME is '登録日時';
+comment on column USER_BADGES.UPDATE_USER is '更新ユーザ';
+comment on column USER_BADGES.UPDATE_DATETIME is '更新日時';
+comment on column USER_BADGES.DELETE_FLAG is '削除フラグ';
+
+comment on table ACTIVITIES is 'アクティビティ';
+comment on column ACTIVITIES.NO is '番号';
+comment on column ACTIVITIES.USER_ID is 'ユーザID';
+comment on column ACTIVITIES.TYPE is '種類';
+comment on column ACTIVITIES.TARGET is 'ターゲットID';
+comment on column ACTIVITIES.POINT is '獲得ポイント';
+comment on column ACTIVITIES.INSERT_USER is '登録ユーザ';
+comment on column ACTIVITIES.INSERT_DATETIME is '登録日時';
+comment on column ACTIVITIES.UPDATE_USER is '更新ユーザ';
+comment on column ACTIVITIES.UPDATE_DATETIME is '更新日時';
+comment on column ACTIVITIES.DELETE_FLAG is '削除フラグ';
+
+comment on table BADGES is '称号';
+comment on column BADGES.NO is '番号';
+comment on column BADGES.NAME is '名称';
+comment on column BADGES.DISPLAY_TEXT is '表示名';
+comment on column BADGES.DESCRIPTION is '説明';
+comment on column BADGES.IMAGE_CATEGORY is '画像の種類';
+comment on column BADGES.INSERT_USER is '登録ユーザ';
+comment on column BADGES.INSERT_DATETIME is '登録日時';
+comment on column BADGES.UPDATE_USER is '更新ユーザ';
+comment on column BADGES.UPDATE_DATETIME is '更新日時';
+comment on column BADGES.DELETE_FLAG is '削除フラグ';
+
 comment on table LIKE_COMMENTS is 'コメントのイイネ';
 comment on column LIKE_COMMENTS.NO is 'NO';
 comment on column LIKE_COMMENTS.COMMENT_NO is 'コメント番号';
@@ -1258,6 +1346,7 @@ comment on column KNOWLEDGES.COMMENT_COUNT is 'コメント件数';
 comment on column KNOWLEDGES.VIEW_COUNT is '参照件数';
 comment on column KNOWLEDGES.TYPE_ID is 'テンプレートの種類ID';
 comment on column KNOWLEDGES.NOTIFY_STATUS is '通知ステータス';
+comment on column KNOWLEDGES.POINT is 'ポイント';
 comment on column KNOWLEDGES.INSERT_USER is '登録ユーザ';
 comment on column KNOWLEDGES.INSERT_DATETIME is '登録日時';
 comment on column KNOWLEDGES.UPDATE_USER is '更新ユーザ';
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
new file mode 100644
index 000000000..e6ebeb79d
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
@@ -0,0 +1,92 @@
+-- ユーザの称号
+drop table if exists USER_BADGES cascade;
+
+create table USER_BADGES (
+  USER_ID INTEGER not null
+  , NO INTEGER not null
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint USER_BADGES_PKC primary key (USER_ID,NO)
+) ;
+
+-- アクティビティ
+drop table if exists ACTIVITIES cascade;
+
+create table ACTIVITIES (
+  NO BIGSERIAL not null
+  , USER_ID INTEGER not null
+  , TYPE integer not null
+  , TARGET BIGINT not null
+  , POINT integer not null
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint ACTIVITIES_PKC primary key (NO)
+) ;
+
+create index IDX_ACTIVITIES_USER_ID
+  on ACTIVITIES(USER_ID);
+
+create index IDX_ACTIVITIES_TYPE_TARGET
+  on ACTIVITIES(TYPE,TARGET);
+
+-- 称号
+drop table if exists BADGES cascade;
+
+create table BADGES (
+  NO SERIAL not null
+  , NAME character varying(128) not null
+  , DISPLAY_TEXT character varying(32) not null
+  , DESCRIPTION text
+  , IMAGE_CATEGORY integer
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint BADGES_PKC primary key (NO)
+) ;
+
+comment on table USER_BADGES is 'ユーザの称号';
+comment on column USER_BADGES.USER_ID is 'ユーザID';
+comment on column USER_BADGES.NO is '番号';
+comment on column USER_BADGES.INSERT_USER is '登録ユーザ';
+comment on column USER_BADGES.INSERT_DATETIME is '登録日時';
+comment on column USER_BADGES.UPDATE_USER is '更新ユーザ';
+comment on column USER_BADGES.UPDATE_DATETIME is '更新日時';
+comment on column USER_BADGES.DELETE_FLAG is '削除フラグ';
+
+comment on table ACTIVITIES is 'アクティビティ';
+comment on column ACTIVITIES.NO is '番号';
+comment on column ACTIVITIES.USER_ID is 'ユーザID';
+comment on column ACTIVITIES.TYPE is '種類';
+comment on column ACTIVITIES.TARGET is 'ターゲットID';
+comment on column ACTIVITIES.POINT is '獲得ポイント';
+comment on column ACTIVITIES.INSERT_USER is '登録ユーザ';
+comment on column ACTIVITIES.INSERT_DATETIME is '登録日時';
+comment on column ACTIVITIES.UPDATE_USER is '更新ユーザ';
+comment on column ACTIVITIES.UPDATE_DATETIME is '更新日時';
+comment on column ACTIVITIES.DELETE_FLAG is '削除フラグ';
+
+comment on table BADGES is '称号';
+comment on column BADGES.NO is '番号';
+comment on column BADGES.NAME is '名称';
+comment on column BADGES.DISPLAY_TEXT is '表示名';
+comment on column BADGES.DESCRIPTION is '説明';
+comment on column BADGES.IMAGE_CATEGORY is '画像の種類';
+comment on column BADGES.INSERT_USER is '登録ユーザ';
+comment on column BADGES.INSERT_DATETIME is '登録日時';
+comment on column BADGES.UPDATE_USER is '更新ユーザ';
+comment on column BADGES.UPDATE_DATETIME is '更新日時';
+comment on column BADGES.DELETE_FLAG is '削除フラグ';
+
+
+ALTER TABLE KNOWLEDGES DROP COLUMN IF EXISTS POINT;
+ALTER TABLE KNOWLEDGES ADD COLUMN POINT integer default 0 not null;
+comment on column KNOWLEDGES.POINT is 'ポイント';
+
diff --git a/src/main/webapp/WEB-INF/views/admin/config/system.jsp b/src/main/webapp/WEB-INF/views/admin/config/system.jsp
index 859cae6ec..46a74abd3 100644
--- a/src/main/webapp/WEB-INF/views/admin/config/system.jsp
+++ b/src/main/webapp/WEB-INF/views/admin/config/system.jsp
@@ -75,11 +75,12 @@
         </label>
     </div>
     
-    
-    
     <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i>&nbsp;<%= jspUtil.label("label.save") %></button>
 </form>
 
+<hr/>
+Database version: <%= jspUtil.out("db_version") %><br/>
+
 
 </c:param>
 
diff --git a/src/main/webapp/WEB-INF/views/commons/maintenance.jsp b/src/main/webapp/WEB-INF/views/commons/maintenance.jsp
new file mode 100644
index 000000000..721d8c3c9
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/commons/maintenance.jsp
@@ -0,0 +1,94 @@
+<%@page pageEncoding="UTF-8" isELIgnored="false" session="false" errorPage="/WEB-INF/views/commons/errors/jsp_error.jsp"%>
+
+<%@page import="org.support.project.common.util.StringUtils"%>
+<%@page import="org.support.project.web.util.JspUtil"%>
+<%@page import="org.support.project.knowledge.config.SystemConfig"%>
+
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<% JspUtil jspUtil = new JspUtil(request, pageContext); %>
+
+<!DOCTYPE html>
+<html>
+<head>
+
+<meta charset="UTF-8">
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="imagetoolbar" content="no" />
+
+<meta http-equiv="expires" content="0" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Cache-Control" content="no-cache">
+
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
+
+<meta content="<%= jspUtil.label("knowledge.header.meta.title") %>" name="title">
+<meta content="<%= jspUtil.label("knowledge.header.meta.description") %>" name="description">
+<meta content='ナレッジマネジメント,ナレッジベース,情報共有,オープンソース,KnowledgeBase,KnowledgeManagement,OSS,Markdown' name='keywords'>
+<meta property="og:type" content="article"/>
+<meta property="og:title" content="<%= jspUtil.label("knowledge.header.meta.title") %>"/>
+<meta property="og:description" content="<%= jspUtil.label("knowledge.header.meta.description") %>" />
+<%-- <meta property="og:image" content="" /> --%>
+<meta property="og:url" content="https://support-project.org/knowledge/index" />
+<meta property="og:site_name" content="Knowledge"/>
+
+<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/vnd.microsoft.icon" /> 
+
+<% if (StringUtils.isNotEmpty(jspUtil.out("thema"))) { %>
+<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/bootswatch/<%= jspUtil.out("thema") %>/bootstrap.min.css" />
+<% } else { %>
+<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/bootswatch/<%= jspUtil.cookie(SystemConfig.COOKIE_KEY_THEMA, "flatly") %>/bootstrap.min.css" />
+<% } %>
+
+<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/font-awesome/css/font-awesome.min.css" />
+<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/flag-icon-css/css/flag-icon.min.css" />
+
+<!-- Knowledge - <%= jspUtil.label("label.version") %> -->
+
+</head>
+
+<body class="container">
+<br/>
+
+<div class="jumbotron">
+  <h1>
+  <i class="fa fa-spin fa-1x fa-cog" aria-hidden="true"></i>
+  </h1>
+  <p>
+  Site is down for maintenance
+  </p>
+</div>
+
+<hr/>
+
+<% if(jspUtil.logined()) { %>
+    <% if (jspUtil.isAdmin()) { %>
+        <a href="<%= request.getContextPath() %>/protect.migrate">
+            <i class="fa fa-cog" aria-hidden="true"></i><%= jspUtil.label("knowledge.maintenance.do.migrate") %>
+        </a><br/>
+    <% } else { %>
+    <% } %>
+    <a href="<%= request.getContextPath() %>/signout">
+        <i class="fa fa-sign-out"></i>&nbsp;<%= jspUtil.label("knowledge.navbar.signout") %>
+    </a>
+<% } else { %>
+    <a href="<%= request.getContextPath() %>/protect.migrate">
+        <i class="fa fa-cog" aria-hidden="true"></i><%= jspUtil.label("knowledge.maintenance.do.migrate.no.login") %>
+    </a>
+<% } %>
+
+
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/jquery/dist/jquery.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/bootstrap/dist/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/bluebird/js/browser/bluebird.min.js"></script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/commons/migrate.jsp b/src/main/webapp/WEB-INF/views/commons/migrate.jsp
new file mode 100644
index 000000000..6e76ac028
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/commons/migrate.jsp
@@ -0,0 +1,112 @@
+<%@page import="org.support.project.knowledge.deploy.InitDB"%>
+<%@page pageEncoding="UTF-8" isELIgnored="false" session="false" errorPage="/WEB-INF/views/commons/errors/jsp_error.jsp"%>
+
+<%@page import="org.support.project.common.util.StringUtils"%>
+<%@page import="org.support.project.web.util.JspUtil"%>
+<%@page import="org.support.project.knowledge.config.SystemConfig"%>
+
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<% JspUtil jspUtil = new JspUtil(request, pageContext); %>
+
+<!DOCTYPE html>
+<html>
+<head>
+
+<meta charset="UTF-8">
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="imagetoolbar" content="no" />
+
+<meta http-equiv="expires" content="0" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Cache-Control" content="no-cache">
+
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
+
+<meta content="<%= jspUtil.label("knowledge.header.meta.title") %>" name="title">
+<meta content="<%= jspUtil.label("knowledge.header.meta.description") %>" name="description">
+<meta content='ナレッジマネジメント,ナレッジベース,情報共有,オープンソース,KnowledgeBase,KnowledgeManagement,OSS,Markdown' name='keywords'>
+<meta property="og:type" content="article"/>
+<meta property="og:title" content="<%= jspUtil.label("knowledge.header.meta.title") %>"/>
+<meta property="og:description" content="<%= jspUtil.label("knowledge.header.meta.description") %>" />
+<%-- <meta property="og:image" content="" /> --%>
+<meta property="og:url" content="https://support-project.org/knowledge/index" />
+<meta property="og:site_name" content="Knowledge"/>
+
+<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/vnd.microsoft.icon" /> 
+
+<% if (StringUtils.isNotEmpty(jspUtil.out("thema"))) { %>
+<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/bootswatch/<%= jspUtil.out("thema") %>/bootstrap.min.css" />
+<% } else { %>
+<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/bootswatch/<%= jspUtil.cookie(SystemConfig.COOKIE_KEY_THEMA, "flatly") %>/bootstrap.min.css" />
+<% } %>
+
+<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/font-awesome/css/font-awesome.min.css" />
+<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/flag-icon-css/css/flag-icon.min.css" />
+
+<!-- Knowledge - <%= jspUtil.label("label.version") %> -->
+
+</head>
+
+<body class="container">
+
+<h2>
+<%= jspUtil.label("knowledge.maintenance.migrate.title") %>
+</h2>
+<p>
+<%= jspUtil.label("knowledge.maintenance.migrate.message") %>
+</p>
+service database version: <%= jspUtil.out("db_version") %><br/>
+latest database version: <%= InitDB.CURRENT %><br/>
+
+<button class="btn btn-primary" id="startMigrate">Execute</button><br/>
+<br/>
+
+-- Execute Log-- <br/>
+<textarea class="form-control" id="log" readonly="readonly" rows="5"></textarea>
+
+
+<a href="<%= request.getContextPath() %>/"><i class="fa fa-home" aria-hidden="true"></i>Back to knowledge top</a>
+
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/jquery/dist/jquery.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/bootstrap/dist/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/bluebird/js/browser/bluebird.min.js"></script>
+
+<script>
+$('#startMigrate').click(function() {
+    $('#log').val('');
+    var forRtoA = document.createElement('a');
+    forRtoA.href = '<%= request.getContextPath() %>/migrate';
+    console.log(forRtoA.href.replace("http://", "ws://").replace("https://", "wss://"));
+    webSocket = new WebSocket(forRtoA.href.replace("http://", "ws://").replace("https://", "wss://"));
+    webSocket.onopen = function() {
+        console.log('onopen');
+    }
+    webSocket.onclose = function() {
+        console.log('onclose');
+    }
+    webSocket.onmessage = function(message) {
+        var result = JSON.parse(message.data);
+        console.log(result);
+        $('#log').val($('#log').val() + result.message + "\n");
+        var psconsole = $('#log');
+        psconsole.scrollTop(
+            psconsole[0].scrollHeight - psconsole.height()
+        );
+    }
+    webSocket.onerror = function(message) {
+        console.log(message);
+    }
+});
+
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 1158de252..2b095dd62 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -94,11 +94,16 @@
             <param-value>false</param-value>
         </init-param>
     </filter>
-
+    
     <filter>
         <filter-name>MultipartFilter</filter-name>
         <filter-class>org.support.project.web.filter.MultipartFilter</filter-class>
     </filter>
+    
+    <filter>
+        <filter-name>MaintenanceModeFilter</filter-name>
+        <filter-class>org.support.project.knowledge.filter.MaintenanceModeFilter</filter-class>
+    </filter>
 
     <filter>
         <filter-name>ControlFilter</filter-name>
@@ -113,7 +118,6 @@
         </init-param>
     </filter>
 
-
     <filter-mapping>
         <filter-name>EncodingFilter</filter-name>
         <url-pattern>/*</url-pattern>
@@ -156,6 +160,12 @@
         <url-pattern>/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
+    
+    <filter-mapping>
+        <filter-name>MaintenanceModeFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
 
     <filter-mapping>
         <filter-name>ControlFilter</filter-name>

From 411d03f9c68aaec452383e9043af6e458f0c42cd Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 29 Aug 2017 23:40:23 +0900
Subject: [PATCH 038/138] #840 Add some model and dao to save contribution
 point data

---
 document/database/A5M2_knowledge.pdf          | Bin 70693 -> 78943 bytes
 .../project/knowledge/dao/ActivitiesDao.java  |  27 ++
 .../project/knowledge/dao/BadgesDao.java      |  48 ++
 .../project/knowledge/dao/UserBadgesDao.java  |  27 ++
 .../knowledge/dao/gen/DatabaseControlDao.java |  62 +--
 .../knowledge/dao/gen/GenActivitiesDao.java   | 388 ++++++++++++++++
 .../knowledge/dao/gen/GenBadgesDao.java       | 388 ++++++++++++++++
 .../knowledge/dao/gen/GenKnowledgesDao.java   |   3 +
 .../knowledge/dao/gen/GenUserBadgesDao.java   | 416 +++++++++++++++++
 .../knowledge/entity/ActivitiesEntity.java    |  49 ++
 .../knowledge/entity/BadgesEntity.java        |  49 ++
 .../knowledge/entity/UserBadgesEntity.java    |  50 +++
 .../entity/gen/GenActivitiesEntity.java       | 423 ++++++++++++++++++
 .../knowledge/entity/gen/GenBadgesEntity.java | 413 +++++++++++++++++
 .../entity/gen/GenKnowledgesEntity.java       |  39 ++
 .../entity/gen/GenUserBadgesEntity.java       | 341 ++++++++++++++
 .../ActivitiesDao/ActivitiesDao_delete.sql    |   4 +
 .../ActivitiesDao/ActivitiesDao_insert.sql    |  24 +
 .../ActivitiesDao_physical_select_all.sql     |   2 +
 ...tiesDao_physical_select_all_with_pager.sql |   3 +
 .../ActivitiesDao_physical_select_on_key.sql  |   4 +
 .../ActivitiesDao_raw_insert.sql              |  24 +
 .../ActivitiesDao_select_all.sql              |   3 +
 .../ActivitiesDao_select_all_with_pager.sql   |   4 +
 .../ActivitiesDao_select_count_all.sql        |   2 +
 .../ActivitiesDao_select_on_key.sql           |   4 +
 .../ActivitiesDao/ActivitiesDao_update.sql    |  14 +
 .../dao/sql/BadgesDao/BadgesDao_delete.sql    |   4 +
 .../dao/sql/BadgesDao/BadgesDao_insert.sql    |  24 +
 .../BadgesDao_physical_select_all.sql         |   2 +
 ...dgesDao_physical_select_all_with_pager.sql |   3 +
 .../BadgesDao_physical_select_on_key.sql      |   4 +
 .../sql/BadgesDao/BadgesDao_raw_insert.sql    |  24 +
 .../sql/BadgesDao/BadgesDao_select_all.sql    |   3 +
 .../BadgesDao_select_all_with_pager.sql       |   4 +
 .../BadgesDao/BadgesDao_select_count_all.sql  |   2 +
 .../sql/BadgesDao/BadgesDao_select_on_key.sql |   4 +
 .../dao/sql/BadgesDao/BadgesDao_update.sql    |  14 +
 .../KnowledgesDao/KnowledgesDao_insert.sql    |   2 +
 .../KnowledgesDao_raw_insert.sql              |   2 +
 .../KnowledgesDao/KnowledgesDao_update.sql    |   1 +
 .../UserBadgesDao/UserBadgesDao_delete.sql    |   5 +
 .../UserBadgesDao/UserBadgesDao_insert.sql    |  18 +
 .../UserBadgesDao_physical_select_all.sql     |   2 +
 ...dgesDao_physical_select_all_with_pager.sql |   3 +
 .../UserBadgesDao_physical_select_on_key.sql  |   5 +
 .../UserBadgesDao_physical_select_on_no.sql   |   4 +
 ...erBadgesDao_physical_select_on_user_id.sql |   4 +
 .../UserBadgesDao_raw_insert.sql              |  18 +
 .../UserBadgesDao_select_all.sql              |   3 +
 .../UserBadgesDao_select_all_with_pager.sql   |   4 +
 .../UserBadgesDao_select_count_all.sql        |   2 +
 .../UserBadgesDao_select_on_key.sql           |   5 +
 .../UserBadgesDao_select_on_no.sql            |   4 +
 .../UserBadgesDao_select_on_user_id.sql       |   4 +
 .../UserBadgesDao/UserBadgesDao_update.sql    |  11 +
 56 files changed, 2968 insertions(+), 28 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/BadgesDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/UserBadgesDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/ActivitiesEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/BadgesEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/UserBadgesEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/gen/GenActivitiesEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/gen/GenBadgesEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/gen/GenUserBadgesEntity.java
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_delete.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_raw_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_count_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_update.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_delete.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_raw_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_count_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_update.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_delete.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_no.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_user_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_raw_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_count_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_no.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_user_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_update.sql

diff --git a/document/database/A5M2_knowledge.pdf b/document/database/A5M2_knowledge.pdf
index 0fd79f626738cecb554bbd71fb176beed74928df..0874648cef844ad429883d16bab8a5f35e9af92c 100755
GIT binary patch
delta 78273
zcmV)IK)k=Ds082W1dzoDGC49cGBPzZk<A$hGC49cGBPzZk?wGRH83<jK67+(Wnpa!
zc${6AOKv7N5(f7=g>KNrHwhTr*c&fAFg$YsJ`F9b7UcHAw;yICdw{Wk4&aZj$Cp`I
ztg0_R{`}L=?{D8;zx?|7b^LpMd);sE^K<?A^{>ydUi<p}?fu2r*ZDTS-CuD0(LP?j
z{P;`z_|M-T>-B7Zu(tmGSNmgq`ORdE(S63(x&HiUV|}*w-`C3z&-trA?DJP&*8BX&
zf1Bsg-TMB%efP6o`gQgd6;i!Cs-xzpmwwHR+OA&uwWFv}O1<=Z8Pt%&!|+%yYT8&Y
z!_x-JKlL&^W1~v1m%(_>I6FHEgNeFhFZD8*#2M#ctHD-(Ifz=%s+YkmqAr{3Ww4Jb
z=j&y#CZRmaqnvJ)r63q=qhG5@dKm19a@2lWy$sGZRFtm5;D$vdR6<S8xH&uwZqbQd
zLcI)b>sFi*2LB9Ird}R3Q46(D$sJ{kKj%`0I2S66dKu!D9gPiV7iGvLp<1Yyp&03e
zapP2{3_U!5sQJ{(AoFvSf6jm?LoZF0ua`%4l#viHbXsV9kYmBnH&K0&Gr};UTv`(;
z2!`!cWr+&I&Z>%pfMIJvshj~(M)OFcO)h6Zl+hM;%#;m}B1G=CUPjvoYD&Lgw9LK9
zi>-vwJy*qgc@!a9IP<5BA<@DX<%}?ftXpL{7L1{P>sDpf%NV9^MN}BWB7Ga|D2(wT
zeOuCK7^9adG~LKnFvdtHdX%W}7_X|-%cC+%23Hx=!$s>El~G2Im3O_2$<nV*3t>!=
z=JY8A!I%nL4KH1VF+0=>GC45zM6Shkgs~55+)F~hIJeA~Jt^yDGEw?v?L5<<OfE?$
zth48T(kqi^QLs)DDO0c+CCyW&;5fXO<|$K%4Rw~W%M=q^orR`ernnZWn|hfN7tKal
zA(W}Gbl8|%y*vX;h`8ifFqJJcVUw)<%GB&qwd-YSZlgx1m#GJ7q0O>FDAQ!=uyTuE
zrpdi+i`-DkG#4Qn3g+h_eOsu7YIL=2=@-m@=Sd){8_5Op!<u7zldWJji?VkS1#|Z7
zxMgOPIn#-AC!J|f=F$>M?h9pZJk#8HP}R%a>_m-HFLPtQoH-Z$GPlfDMlPx{H&%f2
zW7f;un(jE|@GuW1+PQTmOPROScpk^!AG^i=<1y^qnbXVi7%AU*f10Q)Poman<e0F3
zIA>8y%7-OnnKPHp<MOgZE}lD6Sue}E?@>h}!xD!KyUS4&ESc-+a$EKCTzV-#JXxNj
z&^;_|;VJSQg+~olrCuI2QH`w{Te0?>AFW;<<yDRQVjwE2;*3Ojcoztd+%n3ex++^Q
zkJ1p`)ytzaMDO*|Jt3&#?W8j_JhcLUgA(r0go2V=MtRg$mFlH?qIP0XwvJYGs;F^L
zW7Hb;eQ0pTsAnAezWj*NGx8jTM>SQHJt;eC*^?S4HAby*`g(bkUbIR2N&2YiCtaO%
zHECBD1uY87TF@f>B7N5Mi>QmJS)*=pZE|JJwYeOd%aQeRYzAO60EGcCkK}@X?rBC9
zuWsCmx`dn`sa_uCRONbklvma2<xx@9u9ruV%NU6YkD97ny*z5G^7Znp8jmWX8lrZM
zYKUrx+BK>nsv&CEsD{^5!%Xy`il~ODU8C~y1CPq8X1zSBsNyBoaM5~GMU6%mIIYo2
z@8MBP6*XFSmq8R!Em4O?wdAsY<QkgG@(OObVMbC#R7=#MQ7uvJyh|#IsFtWhqdI!;
z=>5>%^S%w8j5>-&I~qN;(T=E&s8gdl2EZ`@QwPA&Xh)-`Hri2;qoAn;ISO(VG_@c{
zdPn-H=^g1E>8Gamr1zwsn%>iBPot+cny&@u&NqiD3SvEfmKNlR>WR94G^!`6C+gCu
zo?M<>OLKX0d2+3rivjQqz|sNWwHY2YRFOWAerfu^Oax|P=}ZI~9cc8{Mn{enIo8%=
zO`;0-eslmPT@@Zx{_k-oAENSA`~4&Kb^P`Dx!%9=>C30BeA2$Xum61=e|-Iry<X41
zm;VB4)3bpJWo~41baG{rodz*~I5Ivyb98cLVQmU{ob6V*4Z<)K{kDuqnFfi{Faa!p
zyZ|#mgJ_Uo1g}EN6s$nc9MsrOd?o&Jf;c3U7ez_@ulEmI0T}QVFw$Hp0Lql6sPz2;
zRk!q?%7_XY2@CBEtX-fB!2K&x7cd6bC{Q;L@FCLh-WaYF@RH^+b$+FPlk}kFV5`g0
zH4Q*Ba-hsm5HRmYLF&A@sc@Zy$&7o)LUn++wWv&@U#tXdd$RdCv?lVcmO&rVlvuMq
zSP0n?3fv@cr|l#{wabiFQDX8rI~KnekSbPYCw&+NzQqhNodU5Xroge3Umu?uWiTY2
z&J4^8f~d^W^%3W7CEd3t(0~E|1*(1zE~m+8cc)~wmE-f~xLmCthyAU24ljPfuRorq
zDHR5j;0HN>Ha0giK0b4Fa%Ev{3V58Hy?2yk*;yy}y!ZE+@ZS3jn<mnm%E~O0<xSgC
zcb8h#Qu~%cP0LG+3=A3>1QJVwhCw5SQ_`vjjbKIy36KFvpu@0xh8<=XkVQhcGc)Jx
zIkn%t??qNtNz5M`RdM6RtH{V}KJ)v1-*<0OG(}N=GWAA^rL2cu{cMi<OX@G+&WGXo
z(d$pX{8gVk{<SL<MXym5^VrK@`MT>AdGH4m_1@Z}k6e5BfBesLHHvwU1vkf!!VT)L
zE`5Wd*k6bDrAJ@&>}$!#>Fr;l=wpw+@`;D8g+Kp6xc?iKS6zGUllQ!ljlt)?4mWd8
zKK;mllV5&%_+5DaL-?TwDVqBK_dt{jtxI{(`cwdIK*4XJEXsz~rW|NBN{7~<OlU<)
zBD0_zwnx6<)-Cd#D*QxreYCwvweq>`o4E(C=WbHxFXwNrCU4T$t~|2UzDc(}O)=ZW
zod<W@HyOBQx98h8S-6m*n;cxr_$Ch*d~{QPfNKHY6yZXRZc1>i;hQpC1kp_eu4DM7
z3Kwp4Q-f;{-_+qE5#2Q4I*D(ZaA8C@Ex0!EO&c!k=%xeL4!((6H)-D<wQssD+WMXL
zO|M1a7r#a4>|)N@DehdjypYUaY2OT5)ZMpYt=tZtlAF0}@SXAS-OIywiB|4rta&qk
z2frf;m+|JOZ~Zs8PPKB>0=>|_nQrCVH#4nI(5daMPcUg{*bFpW78*VWjgW^%EI=a_
zp^;0_C}n8W3N%_38odUMQHRECKw~wbv0KnMZD>#j8n+9L*Mr8NgC^)h6B|GiA3~ED
zL6aPB!zyN>D-+z6dEAu++?7S#l_lJNl_~DZGVaO>?#e3e${Oy<I_}B_?#d?a$`<a*
zHtxy}?#eOTm0jGG<G3q(xGVd(D<^PQPU5bd!d*FyyK;cLat69W5q<dcTYru(ZV9*k
zn!0tjhMf5?_|7GV{x)?o)I8GWD2kiO@&2c&wKJEYwa;AsG=1xBH>vj|$t(STo-4_l
z)Z4D?f10MwUA{@*q<{L#Cr3l7`N{qqG~Es~ttK?}8Z?zMG{pimxhyp46xI9;m7&s9
zYP-1o;MQlTJp9&dbX}r~R3W;qQWdHkT{oyYRg13MREugx*FCCBb)xG5)u-m7>oGN=
zhUEH_2dCk;o;(4~-f?J-?Lf1CwF%Ao8Z;}*&@3%NGe5x{TcGBtN%SRCYKdBmu2-oQ
zYB{>zpw_9i=z5#lqBf)JUFsOM6J769d(`ph`V>s@iRk(abwHga*AzqLZ~ed2f1`d2
zEUHLlZ)TeGn!@lb&%s-cZ%}Ir#j%_~i!?_!Cf;CF9eBmj2S5JV&;HtfhdzWp8?Ks5
zU8cT8Jr3WY<8Po|qT!1f7Cv7bed`;K`#!uyxBia$F7=xf50)%}KlPHJi5er~Um?np
ztje0q!H@WXSgDGm;s}0^_p|M^m9EFG{@L|6$J0(a@y46Je-r;s_)WLIPyHSBC9sJF
zsz%L|o*O(XuqLul7UhtCfO~KFW?&{#$yCnFn*!Zf(?vnbq_d14k0t1!(HM)q2)z`<
z>Ua|PVlW!Od;F{2VzD~tkDwy~>CzcZkz7@^n!3k{_aRBF*R2en<gVsy!!@j5jx)mh
zp0`w|z9w-@Yk}qm=y?lq&!M)L(9;O|%uw2`?^1tH{SioBhgv3oJ$4v@6)eFPT)`7^
z*?d;Qy>?_;p>@?zZPigd+NUMxxl+g%X+Q8|VYdf|J;l!=p0H7IHVpChhy)RuH}F~L
z@!Z_@w!61iRt!7M#yD}s6;-PudLqmT$MPTZCNw{X`smCV)K6MgxhHV+??12WPHU56
z*nB{<EJgf}0^|69TNsA{z9|8tDS(zVsFiR;cp**KagpV_ft#?%h!S{J0y}0WQ<+pY
zSICu%m14cxsA_cMQ@Uo*eq$1KH(HMX21aBJ1~&m=sNyHQpTJY8hyf?^k}A8R_P<}b
z@~StvS6tz#r=I$$7hepXdg}i6hQKlDfEGUdf?-tBy%Vy3_8>w<ghptBD1lOMeGk^*
z>(KukXnPHGc}(3K_8v=+XZmK`OqlJt&K&f9%|UrLU$jeh)vno1yJbr@7A-U8$AVZc
zHtdi3ShO6cff{+MWR(lGLcP+eNM_?xFtsqYyQK`T8D6i^Y!%@-I(#0k?4}|Mt|(Xq
z0fzgsx%*;&ySuQA>-R3<$8&J`&UgNLmKJ{Dc~#WvJ3L31(W_sLP>SY#RCJtzZRZg>
z_$8Wu0m&4MTe|ff>W9=<sW~tn+thI|2^XlR$hZ@D+^VUWw&!?(7xOx;Zfj+_I@MtO
z#%69ScPzJ?+s~cI33%)cMq!nh5?8Y6T)LPq<*Vg?TDe(o)wjyq<=y=8{E76*^eN?n
z;+mjxz3$xF>N?|tRlu?f3ylSq4Dv_|D~%<0CegPg`wmGCWh0zA@~o178B8|vhTy`K
zRN>ixr(3f)QCnN=!DIa=Tut4qD6Rw#FmA3cU#pP^V{@X!Wc3TNI^U&vw?^}Y1kKkt
ziKCH!6_7vT<A#)Lt?>+>^=X>_$Xf$tpZrTt<Y=4C5r_$M`(5h4Q{MoDwojd=&Vfa|
z5?VP<<QP1OsT1iFCl5{?oN1qJ<4JsJeRE@z0lD#$CsHRmC%Pw2wNAIrw$8OKRW4T)
zm^fb&Wn!xm@nkrM=PzI2i1r6}$`iS$lJ@q0U6_<;LP4nle5;Btz?S*MwuPUs!W`oH
ztiZ>M$8@j*uA-_f(dWc-**4#ai}{>TO*Rx=Y&eJ$*$V3jiaVb2q9Vm?lNRhCQPi?X
zOuL+IvZX#hC=Y72g?hbZG_Bf4d@vgyc-~ap?kY^`I|9=-JlT~k#cjx<ldOZ-@|?_n
zGs#7c7r_*mJR>VP1KG(XRLI(nom)#J5;-dfeT@UU`#02=!Rww3Z9bOTa!?7nX3r!x
zKS3#uf)s3h3W;K(;#S?3+je`3h9|pJEYnyL^SJ_C)~fYpqs3#Xye(#TnpSr(=uakr
zC=`nYa0f1Yj7Z*|YMEIP$ui4fncLofzW<n*muSXgSZ8RbFU$M85C4p#n~9phvXY7=
z3sumrBq9#%;MoUNUpk2@#FrVjen|ZT^`F3xCcu{R#E1IT>dYceD%Hp>MlaF*AuHv4
zGbX7Hx}YF88S`23?N7S%_L}w9PSWR<WXF<X%&;%9Y^y2QF*)7QB+dB3M$)T)Y~NE}
zHhFqd1+ay{m;Md-QWkiF4JfA@+CsX-lrSMlP)RCR%9ldl#KhS+CLBRL7O%!@aqvwO
z?0Q1^s`g1=Cx`YeAPOEt6MDVhucaMMO;q%cfJ-hK_W!xsYQgmN@w0z={7k{(>5S)A
z&645XkI)#+F*IK%4I0DxrvXQQ{1x>@u-sdumzJQ*q9S4`h}#KUB!EItL?xjl6~HVn
zxxVKE7Fk0)C&Yp{<HIX*+*C5nVpSqqFd_yiTJ}TF?_zEF`Gnpy=2wD?z9L^mG0x?-
z*lNl=9@JBAe&fYY6&WG<i>}YT%`_7kKg1>)$mrjJe@s9x$JBO+s_KJ(#$c}5ZxU2x
zWQ43x$yf7@eiJ*7mkiC+a4&t3NYHi0w@f>o%9KkLxWR>1Gt_3#;lV&G7DDx{z{?nv
zyC??zN#KSu>JcFYhv^QqoC2E6c3IzRo#zgEiMX#PJwRT1T{D?1`yrl22>e9Ma*wln
ztxFu3G_=~S`1O*7oKhlxopu|k($Kk>;v3GBr}G)xu3UM6n_;l;QvXDK1^8zY5Oki%
z?V5r)DQ2yB@&QQlFsx58Gz+GGf|aO>)u||w-h;Io&ukbG@-J{qGQ-Aonw!w#uDLEU
zm0)BIV@QympCnLhbmL6Jx7Vdf2bJp@N;XkxLF4ELa>u2$6orX@gL&(30B8Olc)J9k
zk`}cd&VDje$zTUXX5XP4!BKThH+4(T7Yjv<uY8zmVi`a_6j`+`2k=;A8L;_`tSd;d
zD}tbqxu0N(iR7h9O!6s4@=Sr*wzRfbdTyB?G7so|TTZ?Y<Xg)yE|&w>^m@TjG(Wbg
zpwcEneEcVBo}br$tfy%HKbeSok>=m}&d4r&kNN?~kqRVWow`m&Qox8&w+*|PEF}pb
zfl;;Xjy-4h?djU`nuSMLz>DB&o)+`tekPaAl@jGdEm2Q&{I1{E2ATyUMle_al??VX
zAZx?H2x~+DqCXo}^-fcGL^ncUHgm#v!soAXFjynt-x0unYrDO&(lty@=8|sAZLO|m
z1<^7MhZ7%zf2Fz4)BNun=;KA2Poo4vdj{e<SFUVdMkt{ws#gFE`t$Fn`Jch_p@Qyz
z8{{obmBC6Kgvf=mMZm`@t<h;aQ_N=z*>bU#t!K4xr4?F{6j>=$i`7b|o`IEq3Bxw5
zYr4RTU<Md}-*bHeOlFF6#1_mXc08KQz$lor$1-zvr(DK13xvaBEQRIDm))N0_TFWm
zADP2r7HZRc^?{mc`?8XH)yFmK!>@ZC#tAB5u<ub{qvF6CC$Or=A|_x^A}exYTwGe6
zu7=zN;1c67h?!qpSj09$Gjs#@TLCjh`zrV|(&<@$XT@l7X2TH2q2oB}`N3F(OI1Dc
zbL3MW3-D@nm>|O@6ee*-IrfVsU(<C>lO&fGMA;H;K}!@faWic@w6OQaF?@b(X>l`V
zynrxuczedzA9t=ayxgUy{kW!@vZA>L&sc`3T8f@^pR+ADu)x)$GR<cX?7&1W=0$1n
zf8POr|0h$~h#TT14Y?sD(Lktp26Mw1A{+=2RS1VvjRyLE|GSr73cj$ayRssCv7DVs
z#^#Kc?-lfH^4H$y8(*DIsx0Rw%#;`R;vkN`g+R?IVmD-hjlT};2CvI1RSm6~;UOO-
zQ3~Zz0b!JH00RR&2KoZ#0SvPriGDTm(p3z9AiN^!T5)DG#$fqCnegZQ;%%UTUw`%i
z{`#E3E03QrG$R|gwF%EZwc+>q)l@dIBTe1o7X)@iV7OWuNm@p!bfo#XnNync{G@8Q
zEaI08o_?NHCB^kMjZ-8PQ(d!Gaa|*ZWQmm(yCw3>;|0yJGFq0ds7R`56y^gl81oN*
zK%ZRVsenaO%hV{emyLR}J|0en*j~OgY0ft>QdMY{VHenCmIHLEQZBu?urys-2CFfy
z!YJ=vlyF9><i<?wL^2y8%nBht$meC<dQxx%If#KX+$yyu{9@9UG*^?)8lo%d_g!P2
zty`S>OYXlgH6Or~Hgx~(Q1)E2m9zwZnWytE;sUU!VDPM0*t(*i1o%@^L#)HeND^-J
zV{ve=metRekY&1HOYB>JOMRdEZAzy+(8ZmIyRsT<8Ww<0*Y=ILArTR@Vs;FpNe(YR
z13xQBqJ$%|0#-)w6*R^aL>cdh90ZY#6hUt7KhHV^F3tVwTZ2jPNHCfFw*OIo<Z~Z+
ztBf8)ePY{iY~YJjj7k9~T?=hOvY0BSi(u8_g*dSZK7*q%Kq)-gm*a(0A(O}^6x=Vc
z<zU8L<biyGSWY5e1=B2uLYE1Ad`A#RV7<JsTVCIm*1q*GIqo%*A^Ax<tMH8YFxchC
z+<%qN#1YcuDN-2LXK9tsD%vl9<nv3Sd~hn%mkeOWzob4(Frx_;d5`qiXJl69WE`Sa
zWy{0!nD!K6%`n2TT-ychNnk|+&1QiR@H7@C1?=!)a06S|P|v+0q5R=>G_McM&$|!0
z_r2*&Kl>5)_ly+ha~JCM1@rR3Ponl`|KxMvKZx%{fCK&%d?!yBekj#{h9apF?nhaw
zNuiCUvrJa4YSpq>5lOEAchNq@(<I6QI0fWWj4c1?5OLi>uwZrH?{1jBU1{Iv-s5KC
zQnw|?+?YP`0eW$pjK_(>J@>pP;b{h4cvRNT*m9s36$|NBY8mK{%$Xd0eSwPl{XM``
ze*~7WN;PLbj@JR@>WZF!($jiAik{SR^&IhW2_h39l9pskF6VKDTCrBIG%A?y=s+L|
zs`0&miOBaIkq2T^iHec|PG&L-FKfe8Z`|vFnIDZdmV&lfM{c4cyD4|eO=;;NDxnI^
z=isH446@a$mpX}t6933k_umilk%V#l74^H3d<4`a90{#33a9XYiUh`9_YL3jZ6D*5
z&|72a;lVH&p6S_|qea{zhy+$Va{ci9JQjpEy$BEYOWUKfihBK#)USM2Hva5Suzbcr
zpT0$XA>uS;YBiKk3dc5Sk(YRtjsxIGqYNVQnE|}YNsP=mDU>3St5g!(c$n>C&Y+3&
zIgCe<`3l|9=r9(4fv55tzxu16`KtS??%M!dDn_-p{GMsMJ%00i?-T##GyhrEpHOsN
zSB)w{Rrt*)4U?eV`ZnN!KL!kq*Skv%!22vwn}7=*B|Yxos8XVkEMyAVLakHpw5+z(
zv*xT}XVjUWE=-rFE7SGGjm53$_S7d4TX0V4a=Mbn_Nrii_ncmxYEW&eL(SFtwNY(c
zTi96KSlL?L+MeH;x6DT5xdzoEhFJ`-$C}(BDDVz6v*-m8{KK!o5qWu|sMxw-E*dfj
zp~%VgpJv%DnAA)%2{IG}_tvl1>vgw&_2f18r2CwE@?#nX;i~AEGDj=c`SZ^?j>HAR
z8MH$4^XTM%RR<mg+^i$CC`b<+bKQ`4`~djXm%(pggx?H3Ry;@q*&r7Xk5$v_I`&w4
zGLa%7lxnLM#h&igU&60p2xJn-SpA?v6hEGiySk`3dBx*JuEH5CZ|?qf+HjF+$>3Jt
z3*N(3Bpr0F?MSwv*S7_ZMV!X6H~LdozxG@#p;_90HqBo&GToRj*}z{-z&d|NeGVAY
zH0(DLU6||`U_a<LMJH+8@6b|NrsYbWgx!qp*ogLZ%>e8{^ccHa==)u<YGB&qN#ng7
z5=yCuAGXqbz`gwC$g@6<Sj6V6z&~aA+?L;FbqjEp1%3Ge^;PhHRqA-?0kK=diN|y@
zlf+nm8aV$;#Y8DVz!-P}&>dNlb=shj=Xx{mqhK)V1DuY`_uYM(5Og5U^e2?5cfagq
zR+5i#k3OoT9(<Owh4Fpv$K3lc&(_hRg}4DqFbHurGwEmZ!z3eMtZ0M2{0-pe6v%YQ
ztPRPKja(+5DHX~Eu<9>W($#d>Ul}L_iKCl;j)|k1`E(&o`b)yHQ3@a!;}{~W_e_c5
zc}TG*cXZjFqXU-b&DholS9f+ybAwx1ESt$2_kzmb10Clx8yw4)9Q_(XWz^$PBX56s
zR47f-(0R<~z7MwjPhff%s5R<*Xp!QB#2{HsRdFaaUoMpA>is&gNWKrmK9x)7TAg-(
zr=J)k7U73*@8f{~NsIt^3tToEt)<23>dG1+tL~jXN&vl!LRW)3q8vw7C=78`Lz?^g
zd*p`g7?P=11f;19^8t@#(57?h<L><+^4A<a&N*C7>?!nzSi!Jl`VH4xo)<SIRkw2!
zmgQ9TWrAn=&!@8e49&;-r*y;(AC}~Q`&1BVFTmy<aOXe48iJLk@?e{rFdt#|z}FOA
zu?*WNC`F|;>9%|Ag$c~YOLL?Ch^(oh7mPxYEwQa$y9XZoQ$#UH9A{9S`LUy6V-hU`
z<b$o%nAq*f9rN&WNjLZGcy3w98t#3r>&T~)V7*?IPMLy|i@)Q(Co6I>tu_9CEl8#$
z-tV5yrTvY*5y<ihLD@HWFSCHdz)IEtjC843eBN~RxM`+)ahgY+(5E}F?mq;3<$=~O
zPz#~drn1d!D~rdqkR@2e!Jej4tJYe%cCORw_DI$TfH+M;6Bv)&$#-T8Ox{d>G;wu%
zkb|d?WvhO{$Od*&i-TizMIdK?ixRQ|(Sl`7rK}8>;HFOvFbSNWB(1nyOu1gwaZTIy
z(hA2Uf|wsy<H7rIYU_=lp06`eljh5~B!R5yx2b=mz68wa7<Ga=pw3g5saJ;<u9z;R
zFP1NrIUEMpI(p|+?{x2M?_5ui8!usq$l#oUub$LS&YkR^+#Q@4oIZ1ZaOPb1d{<E$
zYfkDy`a<PG^+LPZX<jN_E=d3w<A!d6_!sg;7W7U9Gk<({Z-4Iu4wd;wRDj6A?O6GE
zayvLSOE-kiBjly(&(tRf<KraH0M8G#xT-Bl$l*(xD+q#Z;~01#2I^Jca(?fu%8AT{
z`{Z+TQjOC%K{xz7-|*LeIni^Km^BqOo0*%!<Gzo41h5*f2#Ud5nl}^#G4{}b2!60E
z__2F>B|AQRW0wO!Vrfe%d=;%LB5U*7PYblKS%&voNm7KOs%hIMMRKcu4f^!^fOFTV
z3!xns4AD>w)fh~MlZDCRgv4$e#CAva5EI+DoRBMWRjxNW)9!SCsE*Xd{!)Lf;ezDh
zIR&``y8`@faug2SnV|vE!@Mpeyq-7;!+X_9go#Elw_t#Nligw%!E~JKXLsRoZJm{q
zCM_gTN?X&68?H+8MH(rs@t&LD#}eZkjwNyda~wU2aPH7Th8~za<G8wCTG|PaGLgA+
zMRXw6&beXS?>p3gKY%Y2!GX<DD-m+`i$N)<2DPARwoIHMm>(~UL%io$QHC;>jFAXg
ztQ@Pkbr<6+149RpE#S9|4^%%S10iP*)opw<Dt4#0JH*!_{`^ez<{Vp6f}HvjDl!Af
z6Nkh7W~pQaz)&w=zGtb^LHjsP<r=D5jD4&C3RiZ~drY8zBl=5x904drTcC8y<SM(u
z0-1f&%T3Xb4Z@tP4&(oO7{5l?e2*Feo1aoI3vCUKkYgU%E%u56*21}k;lgNPeqpIU
z?URh2e;e#pQq@$W)ok@rgjmi^`jgSZcwup{G!Sq)4}5*6-DUiGtwA3KriG*VD4eMy
zigX(oADN?nNr)l`I7gsY5+*0=f~%T*7FnDaq#ppNW15NUkNje}R5Ak2=5#DE_KoxL
zj>a;c^wuX-?TVWNttdHH<iPNB8`%i{E|`d$yYBR@+}X2XZ4_|)zXLymYYwthk*Wi-
zUM1N2z9=eeq>RPZQj1uo>Dubr`tru|*4p+ONzhGyy7OHO#xmF;xsK<=jJQ!SipF#c
zKD4sFvc0jhVc;oQm|vv*@n{0C1e`^Ik0{6;*_hFw8d+qVY71tcA>Ma%m|()Q6U+cL
zr`slXRggs!<l@>vQQiIKrc^i$HoDwbx8JHEP>1&e4qfAEm!_T5&W$IZwBP$)`$<hS
z6<y+gdD?MwEBK%lSn$^Y%N_iC;Ptjw2FEM`?KF{HE9ur=TGv5`Y>=UU1nwCCs-B}x
zQ?H03tTGPAnYLvI^5$S`aD1>gI5{{q&_doM(Gq5G#d4|KF3*+6%!FBisoZ1s8LUSD
z$wV;Lz&|(EH#r}=440r=AVUCRfV~JuL$8B>a5_eTM{*fQBYcMurYg3}m57rBhXMG}
z5fk;vYDrC=7In_`;!d(E)#I6lRFC<Z`2c5%vKq8?+m@ddvsqV6S}tpHJ`j~+v4~!B
z>$an3N=p*w@~&gQMs;;NP+i6Hvxw7qIu{HA+Ya8ySI|&$)DxhTD>9fWbrH1)#`_k3
z%;DDn<9RTL7o!<eF><z5m-gtqU+~L*#jpDfKjiNm;*o+><iL*rTghMy(5ubWFn>p2
z0CL$pgTb{dDPWV?D9$vBVvOO$;h2dy@s3Q!o#gHD=iD^Ct{kT`H9ha1{1=&wg;;~j
z@}(>;4asCa|A;uP2mQU|R@P1r9-W_mzbqqV9|pH7`_d2%X}*K7pErTme~0=y!EJNY
z2=L4@^#mDZgEB=^GI1s@Zx-vNdbLuk;Os=V&?^k;!}_=~sVr8ODlQ&%1zS6ur^O>K
z^~?QQp<ZYe+J#|n)SL9?d)PENFas7%F)(<T1lEV)(_uyimU<iwupdeSSRUbjaQGx@
zP`sU{m_-iobExV(Bj_<$Y*9!gba1d1jML=y^7+Tyf}3~W@K`>7sZc1av%D<$thk8U
zLKO`;0KURW_~>5sn11pk`tTI!Y<;m>4Re0q0bBD`Si%8VnBCC(;I*#$HNWY%{KetY
z5a(yYXjrXLZ}c03#&BtK3CH$-@hp&>1dJ0~k=ankvnak;C4-LAfd7oxhig5V=~8s#
zHw?8*J19^Bu3BS(#M*){2(O8AX&W&H=h2*)Po;<yEEV<C2(G5feOgefV!a_bqQr9n
zJze2gE-gFiDck2(MG$ytfO<6FK=SGNqLb)9Kr-A>UJ%#Ud<`rv&TqVboXkarO>#*w
zDJ4~;5szLS)kf`6XM_>3LC^^&@B)?!oagY3z`z+?oF^^77hya+-&^Rd!B=8*VlgyZ
zDOVXkpDO@F!B#i;5eMx5cqjd1A{*g!hV<Z<E$-~uON-!<aY}l-RxDcXPr)>CtXL$<
zl1|6@jOE<WEyXYyZUH5KQ5qF!J_RpHw1y3WsK`iOA~_&5l5K6@TDDDHH^N#GtV90*
zIut*Q^@MX&@F<_kw6d*ItK6!!>a9EDJIAIZx94E3NhHhFO0`?<RVPWz6ATj5*;(D$
zn%|zsZW_7B1LVT^w&lPjSO|9JtgC`}S5*V{N&m~KnH&xEz-+#MBh%4%WsnoMC7N}4
z4xO`MVjf{FJWbNfreye{^}&sc?uL8A-Prhd90(qxa;7AjylXjoH2;4Apb-_tl^0Qm
z=4)uEB4f|mOQnt}+H=!1#x-VSPdO41?EtrUn7TpTANuc;2lpJ@d+_i9harqYrx;va
zmcnr_zd39T`@_M1aCx{gJa^{&nQLcWb_N&K6z;qCe%hxvnq@dXD*(M}w>opZJ_yl;
z^A{g{;F=r;elf&5>V1xshj_)x>`g#|>W5jLBlR{%m|8TIw}Y(V$3wOLB3odMqHm@3
zoF4R)p=~ojEHZ*8$Sl8QKO|X_=x}0RmH0Hr8<wI}S^|rII8j(Ic~BNvl@l$o>Zz&@
zpByyQ0MNZ{rSz=Z85UJb6Rfk7Nz$#j;DS*Cxt^cTo08sI=Q+l4P+pOBTjuDW<z+{f
z<1(nGF7q6%S+2nefWZ@j!#O<n37T(Ox@Id*47nD8695EtHRK=Pr~VeWUyMqJwIeU#
zV0B2>XMyQ|gp`y>{*31YpzQH<B9%<f@@JLm5s`~#kF3F&kvwV?wcdk3@~(BILUB<Z
z^wQ!fp~zY>vsCG$3L|7tx1Kd)dVQ-@sDyd*?+}@B!8dKr;w(6}jPw0~KD?}#^QvAg
z%uEzW%t5h<C(0G_g;J$l=~TLveqm4;XC@h(E7!q)3z6!P$Swz9Uqj+EtG@)JTfDuv
zScfJ@26b51M#dH{{iAhnY%=od>5QB1XIu-JDb#2WcGNvw5!2F*++3?=#K9c4L<Dez
z^GDBcwkvR26aC~*R+iG!gz2~$;Blp}=C1^oGJL|29@T+;3fR_!e(CGf9(9U3OI@U{
zQtt?Vbq6m9jwxg8n_~9a{pIfQ{k{E@-BaCz?wRg|?#1rq?v<`iY8}P2l-5nd#Gz%p
ziXDnZvMb{%!9G2pai$O}+RpIUaF5<Ued_d?^JmYWqc74|T31^>sGWs_ZN8@J^OJ?`
ztsOQDVUo%Ln3pKaKKd~k_}fZ%N3sF{w11d?UIny>3zOleqSt2;56~=E<7mfc9D#MS
zPCA}Niku5HtUCP5(m{~#*hx9<sTGx#oUEL4IvKkfJzj6QnvDvN2S~o6uh)&@!YZoL
zeBN}*pc|HGxz=S%mvGeA;7r+(EbH=?>sodZA&bPQ`?vl(NZ_Zzg5mr}GpeWpWx<ty
zmJ%zo8mqHXs3MxE$&AA2l7Uquh<NiP!Yjvvj|5NPhy1z!XgsvAaIn0Lt6Oe;m-;64
zdCCGQk3}`O_k^C7QgQvTr8;Sp_R~Q+X{YQgU7$;JnI@h#gFUU1SMxZA8>C{XxSg@H
z#ayurUxG0^SQ6PZEXD^T32VlLkn@m#<dTvpF><sXNymigkx}t&*X%g!vkUB&vV5rp
z5BL1T3;6N*&)bL{k5axh*7~UV7W?0P;B;-NN^*%ogctY-QQin=ORC8=t)|yvxp)r8
zK}jv{jEfD7p)oP$4N{BSAc5Y%2<)*ljwcgIQXGS6zuHo}LQfcaBX7RH(031igTFvO
z2)-hk7|f8v3@>{BJc6hW!ZgTRz^Lg?l{<g_0lQ#tEjOE>w1dG;381yd{UpH0LSEKn
zS2wsNlz2dLK0Q4|2??}eq2~r~TnxE;sH0y2&JZV+)E%l1?ERIYo+^yWBnv5`rwPiU
zEu6s2RI}B3u90izI=QaZw=~RuS9#DAj3G<(95biRX>+M|x}9m~+l6*HQAt#@jcl{l
zs^Kt*jdQNRCupBzc><|N#XE|72A&YPJUre*5+9{z2?hum?5A6n2X24P{#TEPiLzYt
z>`RXoavxZ`{@07oKKm^5)Kk?~U?$3Gp<(%4PFz}a8CUmA+kUyWx2IWu7j-?Y@436W
zXSfo!S2p<jA5y;$kZ+a`dx*?K&dB1Z6^grYoSUe`tMNv%nQSLJ$zFUeZj#IwuJywe
zPZ$9tjF#CVV9KdFHK*xx%3YwR{j!D`JE=K`26HQH&hLz?9+ozRqaG2TRK<nLm}bGh
zV0Qlf)9v`0xP)}w0mY?%hwkx5{*MRt+zG7~4t`_gj^W{sVq)CWJjGOPQNbSix`&W=
zLvxWU{>uO!E4abDN++1`kHK=(@8VS*rpY!rRa7N4t!C7`T2RYiwCZYu!V%FqYS<h#
z$NEH{>dQLG0FJ2!OVBh{7N>+thjA`9>lRAIQpKnmok4fdr$_XEM3@&Ajb$TYhWk5?
zM2)dyo5}tWTuu1Y?P4epoisBT?L4!&vx5s^^ZD)L$6xWyR~$cn?ARlZZ2f}!jO#wb
z%*~Y)<y|-ip(U-9W&!8Y$e$;V^L$oOeqIHvqES)Z+jprSfX@o6^G}7=AZEp_R3e=y
z;tG4K674I%6)D(%l4461FC+^2a;aP~t0v*jfgdBuKPpEXx(TR*4YA!FQ0>m5Hjn}s
z(=r2Q*WTP^nFJ^DuYI25AF=}8<u19gq;~GorALNHi-99ZAVYo|;Qi$2@i-{G?<3cx
zWD*Pi7WGG<*|Edj5m=}9s5eEH%`#+Dj#*i&U=_o$tR<>{qsFKSgs2OIXsI@>t=86R
z+oPS4Mm(^Tm-E?ju3R)rcq7Y8c)(cM6V-OD-7L4t-9c|Kgr%D|7L4g&d4R<n02{7X
zVsMBYhEF7YR#Y5X@!NG3VHwygI44H0QK0Vb4GW~T0~`RiyiXLFp3&O3JjUc6&@9tY
zPZ#0w%CN+Lz7bEoJ(oyWid=&yi&832C%iMGoSkgH`HNr_7@&K)_E6=)>cE>vBd1_p
zwcsx{mH0`~WZ%p`keY~Tl<{L^Mq_lwV|*seonWsjvkD7b$4$9u7jq)`T9d~72Ma+M
zmOHXp<`6s_!t-x07wUDlT1~I3Tj@&=fGj_FrLb;)SC&@Mc#KxpDqi_mNa>bq)C_0-
z1NA3V09I-~%3vv!CTX%3XyNWDY?Dn9U^Fb*Fg71!%&_i~7+&bwXgHpX=effI^gB94
z_`>8zYuzF)VlvoPJyRKI)6$uX(A~=ig(Yde>@M;KE5yC>s<>a6Zz=tzuDU6`;dvm;
zv}!qjX0>elRv9H|-bDp7uxnfYnKwY34MfMJcvg0mK(`W>?REu@24N-4l_$B^zooti
zC_hgsFx%9FQBA7GYPc#1XRQM*rscG}R?^B^MXE~;sV#*ysT9p-xvZMivL<cOX*yHP
z7Yib;ys3(fVzWqaHo=K7F}N^u1`@pp5&Z~%i^3+EnB~Y!p@#<Ui*Engy_H3IHSMNW
z)b(s<08Y6Nk7eY`kG(?lQP~P&`Hl4o@~!HD>()HaLnMcQ_ci?^*qs516K_Silo%eB
z<sr$HhKr*`oI#i_E-$KNeJ#g!5>C<~wPB;_c)Gl>vasIVXc7(%*onX>Xx6sYH#fF_
z*iZ~{PU;RWc!)GeX!DK=g>dboNvPr^CMHJTYb3pfAWHzkk)9U|IF^-8J4(q`WZpGP
z3NAVtawc#1iE?+zeaKyEDqY#wGQdVzx-LEOcrrkZ2I??e4P_Kvw^UpAtU?#en#1dC
zDrT!U6yx5@iB9M39y0O#;5~Q$K>Z$ng{T(H&ME4-sB)FX^~i|b-aWO8vkN{>wWkX?
zFYk4S{qbPDKHeBB#EQ*?<k<G^HrX?k&StXJY%SZ(_Oc7v#VpS4r9cK?`2nH9jGa7j
ziuc2JON-Mm_<0+Z&1UYOn@lnIaVmvBN#Go|fbRmuSy(v#I|X<xXqGL-m86+}F8~Bi
zCV>jG;C0gQ22>_3$4v02Pk;3@o@H-=Bf|yDU7D}oqn7i!=Qv5rr+LegIK`pum=(~V
z;c*@5ey!x_KY?D?%$u1k_<9R`{oexKO_IH5VXkH^tT$~?CU)GqU<f2h7x+Qa#N}QM
zxhZ#qt}qaW!bF~zNs12Oxr@AiYNdu#bh9W#b#R!~oR!-j30(+cfHw=ka{vT&0?#ep
zmxXFWpx;fG%1pURGpN9%B%1!^h84hi@$dOLCw7^waRt84uK*fh8gvchE7L%25f_1}
zE)s-SXYqDHMZ)>1e11|Yl~A6dBnsX7CdkYmkUG2;_&{95Z~~YpvE(m*t#6&!Vu%4h
zT4#Ig`0jC1lE1%qf>Z?_7ToS^AL9>Edu6s~2Zu&~wCENqPBl#99@#V#a_``d!hQVj
zzoy%^;uq<7npv4Dj2t8w{-A5rlr}KBo?6ofi>sOq2Gh0P=UTpLJz*;r{9dOBRME4i
zAU&4JYupvjGy$a|Dac5F|5|5gMC*uWIo7sO1|UkOne&1yI;a(7)=qT{H?I`EmY<YZ
z)=S=NtDa(mRmMT)-%)Je)<_=9AoB7BQl(oVvp9x%T%mTNI9O(;R->))*8JAO))F`6
zR<||=n}eM#BdjI2X&e@^u|Q$P^Tj1;X|OroTo^76r|dGjI$4{4;P{xz&@A{(5GyQG
zMd7gc@o-i{nG%OEk6u*h8&dKx=NBPl%v{CDa(|;G=dZi#uA*0@$_qSW=NMn6U(5Mo
zU$O&Bc}ADwyt)<BJi~c+79KCIuV>w3?k76twy5j~j#WfmFu)&6I*gU6B|X)R(Pm1D
zyONX8;^;%|_KkLbH<K}ppL;KsISn|({{TDA0e?849;P0po}`|oUQ4|t^j4B31MbuT
ziz2%9Nc)lNxtHf2qhCosm3un(T<+C53zI1v3&Hp*bN3d<m!}_1Kb?Oj|LXE<%7zLv
zNnc^EVE!3b6Y8Zam#@51eU*x55@CuNMH+XH9lv<t5;qHfEn=y>3rrDUa`*1Xkr1X3
zhj&(e;7zi#eF@du0koN~s1S}inUFd?ahCS@4R66v&!=RiR04BWglDUz3X2PEc&xmG
z*V?X<(l{9@wxI$dQ)QSY!%=zPWHp5onB|gKOPOl?)vPXgmeuE5<!ZHB6Xc>M;49D2
z`TM;r1Avf!=1u&xG(%I#pS~<N13w#>s%{|7c5U6Vbw>@X-L1T@`^{?t5){?2fJoYs
z$Ro~vy{aKb){Ks-2C7Q<(LaK3{sLgFS&igs<bM>w5-r72EzFP$g;+6GiB)5bTC;}3
zQ@z%pHEc~<^Rb24G`1SUi@TN~JI<pGKsb<<jHlv%WTE4wI1Yd$V*P5r*6;Rv<GC^B
zR}0O>=5)L~22>qppC+R_C?a^}$=y^bf-N%`O-d%=^`UBkWyNALnK{TLlahC4etzSB
zJ24)Y?C0$=JjP%<OI1Ub_&}VX5#F`jr^QSfWfA;M>#u)}+{v8E<#JXg$|d|I^*Is+
zN)g6?^gt8^(s0gE;Z@$%0y;(~=@gv>WL5-ZW`z4BeL$f;?|TU_uxd(8Cvu6rT2g^K
zy@YKA7Jo~Y6y&%h{|IJ*33Ii@(cSD}hQxyC^=s?ylu293|6rx~IQO&D>C|0cUtc+K
zVweRDe&c5W_unX&=VyPz8X}9tkv~V7fG`4o@QyeFa9@NmIGUSTIgBw9mS=lzHps@Z
z@oe5HI7P4I)x5eFvL#%Ao~ooPIFw7wogH&xZp@3tGl@*j%3JkJBLhl0nQc9eHYDRP
z2%$jH>ufPG{`wl;Rs15}W4xO^4MytGM|)58uK&gBviiGd{-c`y>oouN3M@;mmrn10
zXI}NH47xv^CgV~8H{<wD`;gghQxAu>Xf~!qF<I<zU9Qg!xN&izxL8~&ZWK3*)*;Gl
zIc<V6vC-^zS9&Xh&agA?Ogc*|(-mxQEI^xEo7+Hl+cZX<vx2ds^>Bx2hrwvJA;TMx
z7hDe&S&Hgx0wS#RTVv6c+^1c|RR@)SvtwDXWyz?W5uRQEKe>rKhnKAB>Ga&(oC~((
zCz2UAmIA&k2=^)aeS(0@0@6iM(uF)@F^bKze6gtTw1>{SZpn2?Q&LlfLP8JoW7@4B
zl6YW^%-Axu9#xMkIDfj*U+sr`C{f+5<K25WTTE*AJ1gCl)&5$aGaH`*uz+`e97fei
zM{1OA*YSs;p0KKb1b~8KfXVJ*u?C)ucL{3RX2q;rv^c5g=cH2lOscFFe8Vzr)6|!?
zIa`o{32VXPKq?Geb>k1$Wc1X1zpZK+ooA9VZevIe^pv3`P4Hc+jKB_pAgLU^Y9(Xn
z!SvN-Tn@h6#sb4pebDKzP`?|0#f}j*2s0Rm(PLaT9@Xh8Vck4fPFYX{96^ri=8qO;
z&ldJ8?o;lE+^6uv)~r8UtX7w5wbfP&b6H#q{7vB4dBW?$z11#bvv%Ibb+xrhz0xSO
z3vy^V03&b)3B}@y2D;p;v>JtG0Y_adJo9)%jPC_FX@4Zre`hS;z0GNVN0UfMv3<0M
zx@?&l%@t%$T&?u`jF&c2x>_@aFS-qPrO~*I>W*Q?=LDA3Knjqqn>kc8iU}vaeDPBj
z`c3o#i7UIe{vPbfZ-GQ%dy=Jk1aoSR?vUJ+L(1Vy!^BA2^#V^~4@;R*Sjrss@OE(*
z^c){VF$0sIc8hjCh}(F77s|{2?EcF?_a9Q8E2(z=Qa+B7l`B4Xzwcjv(f8l&)>WP<
zB`AXDtZ1(fu2oCkQTHE4zB8WT8^wO9U#?f`HC!i}@8)~;x%x0W%7zhqY!UE2MiSLa
zWmC9ltCp&#@Loaez??#-*ujOQbGd$QlpE(Tu~Gol(U^>eV+%olMTp%*_vj$2M?Bep
z6eNZ2YY?V^2NyXpmQyqF_xn<^ZZ<53Gq^|o>m$#6eS7k$@z!gy*-5c@qi`Yn&__S&
z^0ez9BbMTQF>lrY*j5nwC4?puz|}bT8T1jBKQqeNjj1VcOH#e}2_!VZ@^^IJ;C(*e
z$DMEw6xF1goX2~AI0Qx_po9K^)J4O{92>=g_-Huhd;qfWuGgI-A{b_x?#{uEZZn8G
zb4{~45@IE0>E2(9NsgAZk)~;`fz+&8t~!n|jVqjN>S^c?aBlHz*YH3)#vqxNejRRV
zNR-}d!W0O$t4Y_dXI-z*L^+@ayyQqc%M^8Y0^G?m(FYBG#CiRsl%DfTYQ86O4DlZ_
z_zzs$SSM$8oS`mISEvt!l|^weA*RKQSP+XOj<P476i<m~M2&BJV$Nx<`MLf4ezVbP
z3>%}yS^a{3S-+waF0Pz9ar(sB6X#BF0AhP&zrlfda99;-C9TXs_8@mqlu8nwVaz7>
zw0-TOc0~(+Fubi*>+Mzt<`>kL^Wl{~T3~QDl8rFY>_Rv^qvl6eAzGzqx95OlmO%1u
z94l(9<aqP*old{M`hm@UKL|RDi+;RqtG1C<@&!{Dny?s>re?FQp()zEX?V=x=CiD3
z3Jk|umU-H;eDe3SX&DUt2ahBIr&6~HENu%4{t#1tvEqszGu4Wt*|yzv9Bhe6tnZIN
zW7~)L^Emb9@C<^qow18{#je^LJDWQq$<%1HhEq4a&Rl2IANLnl7FVY8%kv>V!C^t1
z#VR@_Cv;uI!Eih`nZt|W;LXg7%S+4C`PKQg_2cVUcYOe2S)86O;sXJ2^bl{|#sS^Y
z(Fk^b<&HW0QArQNFj7>|ERvAYjDWo2Et<m{+%->8RKU?PNQA3fN>(ZqER&myNsIPo
zKcCkZ7wvnWT>u=k;oi7kN8HxcKj0XqgaS+RRrBEolgO_E`)6o}6OB(w<BsNUyQSf9
z-AdBDXU*!xajfl6z`x;LJYgNo=@9EhLtkEhTi%?<8vl|CbPX3`CUE8lr}pZ}MzWji
zCFiG0)3t^51sv<P!`Ug9Dj@Daz4#z1O+B)??Pz4}cDP`2cs={a**RC>l8k9L;KbCv
zSPCAF<=*G{M&fwP08JNH%7WnWf~whXKGl_YkC$xOHYAr5ue|b&?{i=2p11oPN9T}#
zFYAVGD|t2M*gdZSs%}`SDL6*VoLH(Z*`}rVDY*UNV$nLK8q_Qwg!hSyR0F)jF6jNa
zsHU0hPHiuC7RQT|MN-X+2@2l+wKv_LlFHT9^|f`fVHal;_D3g1c#oykYPL5wwvM0N
zWBrxo)v&s(N;bcY#Ywbz854cHRhi&_qX;_@)x-r4Mc|r8woV+@Q&p;CLidTWY)eR`
zT}i4H>WXQ~4)42Vn&XfxT8<_Z07c~hI+>hUi^Z~zZr4GOdRmNeSlQ46J$squZHY-`
z<T403cc}r4(Dh`6ee6+y%7G?ZhRJtTo^I%lukrMapp?Ae=sP!YE!syc#Ey)Alp(sC
zxd*Zi?}qqWA^8Kmw>#9`Rj{E;q5Z_CRSl=3>Ed{4jL$pTUfWqazP7hUDl`4j(s*fp
zxH{Ze+g#h(J+^zWduA6r&BPaR=n%Z-ozpcde!lbEmT+1EoFxkhVfC(LidSrjB9Kt}
zWQ<HzAc?l4z%(LGQe4B*Y(X-A@)cgRP0f`#$x*rcr|!e9-+8<>9FpysYYbON$mvXi
zed3iYuFaDT;KQi^5T+Yf17G3jc$raT(a6f{Sx-QDvD-z)Ll3HNz@)N7^BELk6PcXt
zh35);8+?+{CF&mP0qP;@^#ncPjaK+Pqe=(Z@pQO6#D&mX8`~SZJI8l_&JNEFFRol#
zxw>)B#{InqdJY!G2VZvWWmp(1bNBV{n~dg1%V$>3te@F9vwddg%)#K?;QZjy;PT*}
z!M)uFx(*i9#&KMfg~PqLsG11sC=A|3a~$FM!!7r-Wq=$0Y<I_xIjsUet3Hv_+u1Eb
zSFwdmxST-CHZKE$=A^WLnXoyzRbWJ0=N;B{^FTlY$M&9#8~G<6cvRC^ku`12*6p%l
z(ej(jme$Y{r{ZsZbGF1Vd?}DV%*W$8OE=V-$<b3rQ3NL`sLU&GzzX?+p}ZlXm3qfV
z&dV%|Ep*^9JZYGYfDA279>+W{k1&o6_lBH(WlSc)^CpYCySux~;=VYGySqCtGROi8
zEY9L?i^JmX?(XjHuD8Gc<t&%nhnsXV(@Cdly1F{)R6q3;5Tymq*txB34p)Ok1SEn}
zt((REqB<-Vni^%px+v_2MLX<uzG>ZW^i!o8LT)xD=`dYOzjF!&#{r>AXjO5gtz(OR
zlYS<jNZg<+lcpHvRZ;wAdoBNw>oc!l)~7aoHKwU&piO2|ftUAd>OozzEQN@(4L-(p
zlKw?7bnj<$u{CX|3FqZf3)QWg5kR3!nD#evxZO^T=9wrSV=_3bs}*k{k3%_e`KNQ=
zptTZzf{N#wewsWDZ-gwp7<}!v<y*O-6Fo9>Q~#Tj@mC@imP)1_vjh}uXI|X6H~GKH
z;EO7mRdIT2#+2tC=g*l?WZQA9jh<7Is?vGcS8w0bXTOJMXesQ~xNxJvUI2vCbH|*W
zJpxJ3^u5Mz%$B$(1A5HKK2Z}`H(5KU*G<PZqTErXdp{Aq!k;w`@cNh_Lw@Y4Z{F^2
zmd__S^<S4q--QLp`o<d%a9}Qc!}QXQW#bs?zhSGXGFQ!x^&>Q@!={nLKv!qQ?IRz{
zzWxwXP17Xd0V_ttPAZ+H9|jD+jF1u_1$y_Gy9!~(_NJ+@M3Bas%#6q*<iDse;(QQc
zQQ<nj#nx*Qru>9ww{q6Ek{hGQYgKfeDH&H#^WF(>ToQ_0qFF=f*bk@K$aeLx5-J&%
z*|Srx3w`sR#pXi^a5+0)K<aC$ICSJB|BAMt<jYhVR;tV}*H4R{)CF)+Jk`<rMu_1l
zuhcc@3Fr$Hhs-~6zm*;K5$e5bUPXTNtnI9YS0w1Bj1~oS1>y0#-*A=)W@j^YwZ6Aw
zI0eTX8Q))-p<LzGQoK=nrVtZqwg@UUMmh`%gCc$JpxNWxpvDwtq9CSE()Jx1Pj$G<
zYV{xWcY?$sN5vEhw1F7YC@PqWNCYv3E}9s&2k@-5zy~~*N}HOY{sAxs{PI@IRjSpj
zHn0yi!M9ZW>?<SkibUEKJ)`AAPd*0fZ^(xfukhnI??>{97ZsP^0r-vps<@v|jL4#V
z0cRorm9)oD11|N%4`)~%Q%+<^j6w3R!^u}4@3bf3D48i^u>ekL(qwx82@>Bx_zBb_
z)T8_JSNgH!Q5J0PD~(T;1%H|`zMYk77IBmwcO<2kzIr+I<y}R8mdfK_G*0fYm7C?1
zG7ls_eM__~e7iz8$}uuUT+$tkOlhK{vBOxX>eNQ|Bzx8M+Ef2}RjXe56~0u4X6~7+
z`6vw1pMt+j^8jk=3U1pY?2{C3$Ye&KwO%ve@e|_XwrtL%4yNm`gzm3ojD0u0?*p$s
zy)9Th>-iYaSF*?zY6A0-<NZUaNM>?nhcEBV-Nu+GV-;Z(pAy~C8mS*mV)eb^fY7F@
zqIXapbM-FSsEKRAT_nt+hbN037+<rKvFGCo)E6)+Az%PyIVqdhvG}&Mf}sX=H$D0U
zpK7m*#I9f%>W0zm=2zkOL@~0O!?T!t+yU_LIeTfsdmORymKp7HyE<-NfeKS5QE1r7
z#UDDPgL^GYsLsnrSxqQE?(1aemn>E{U)Sh965YNDVF_Rf&!eV^*@}^8x%M`P4BPlr
zwDT>e5dyl)`pZ?B#hDudOOapf$^X(4mgzuh1dJ!6n27G84>(P#kY|-AmT5UcWbnb|
z^Lb`o&|soWYWKRY^G3PwRz1NuT|pdfS=Oi4{uylYYkB*KP{z?-F!r|HOANX9(VvIT
ztM<`Z@XYcaC{feVJWCdKJDICp<sH7Co&0($9{|K3PWl8vIxM;DWGZ=U$NJ?Iz662B
zX>rq>su~=QBX$U+CRsf=nJQ0fwVoSGNMbo&`;LA@nH6LY{OTPH=tVHWtjhOR+^SwU
zO3Tgtk=}K$hQFYMixu5Q<UK*|9C>N?wy4y8n|bMLc%^prT}kl%@|s#ejU0&lqjt;q
zEeuGRrhIMggv4Lr9aC^n7MK&dcPp+ifYV)&3O}ob__Nwq?p517OX-7xfO$T%?8O{y
z`c&}4x`s8CnTe&MqO$5@X3+Yq?DvC*rH`wFE%NtNFCk5^zMidhvs5?i4WiY}b%Bn_
zNku7Mmo2R8&3P+BZBjx(GNoT81xxVq(G$RzUzvNyS<T5%-;F?0a#qhJzv9DF`CDls
z;t^hsF$1Ox&sy49Hi7Cul3ma{o3|pn5*aq^H@c#eEbC|bc%u#j0TwbLM^97p!FX35
zsQochGxC@am{|>J|1r2n0i(*B-@WermZ#$?uetl~JAKL8)iu|k*69ItjJ_Lg89M-1
z!^@*53aV?QUXWlAdbnspwSG=+yil*jnRiB}I+$YcT>b)a`N#3_&ikt6rFz5mHYWT<
zmaex#z5z)aL?Bc+i!W6?ECLpMNSw#V7)fvJ0~#pn!0^558g{6;*bw|O@X^sN|4rJ8
z<^ryklto|Ac@oY=>ZJTnYxC~5Xe|KcG8dmq5dEV-dw=|wvmU?SGbdWq&fl58L{Dfv
zE>(IR-;kwS|Aor*q|yyoliM@fh_~Tk+j8kwe(+&D<2gpU6dO}-9dRnWwF*9nn^VyZ
zqzu^Ntsvnl8I{_}d)zPBQm$Ty7*-=Zz{NS^MJMrx21>lT&zAUK=S6!4o`wLk@w87{
zP5RMX3=hHIbn5qUTX3a&EEGNGYW!ob3(f3&Rn;cT`&|*o_k&Jrs_-Xl!N_^97}e;1
z9<=5eU1uFL1}hA_qBz^7QXT3P=6m_`p2qxm$mKXger*?xi3MXnuQx$b@~NGpkF%zk
z>p|HOB~MkfsChm!`bxNaUcCeen)4E8XNy0?jYgkc&r4NI(>FwZ_txf?ui-<}#cI1w
z|2a(w+8N&tQ~J73p-O{lkT6EzJJ#fO+?}nrEg*lOFG-iVyIK8<<W#_;M2-IzK0~4|
zQvM*n*i5@5&>X7*Q>;}YjF{g?bx!qny-y{*P0_Shj*N<#Q1zQ16Mq;$JH`+l?zd8C
zfB`yEW2sHkKgVndads4J6g?S3Vfg*;s56u?cjfFWQQ!4_N4#9s_PBmb$G@U_;ZDcE
zv!byfZGDLRAB5-+=t&KSJXXY9x|eM?OgAd!XiR9jl?buRl~jt6la|<7-ZQOiS<x0f
zi<}+g?q2Um(zwWCxS$EVs=K?p=h#k~Nos>L9#Ij_X`W(fUu%itBt6F1!q4o{Oe>Ya
zy!OykZ__1?UP`fK2(^<_{U~iGIE5Li6t*64t`oUFy|*7%7yKPDG5^NB^dub3`8ap>
zgWYs?ZH>1<VUA@@rqU5l_qn2HLCS-pH9;_GJ@RtU8Kg=>V`~kR`kQ=GigHZ{_Ir}(
zGOh_V@_ubt68zeLOEL%>ijJ9rDIsq$ZLC-5Qa{WCJ>#pw=wA5z7G%P(uGJODlXXa_
zC^72OKux8Zv<1_gwW8n}xKmm)z^S<(Hn5v8du$~eU!<tdJS3wKp0!hKpqRAoMMTou
zbwe-x3L!b8Hh2KwDJVc+35Kd3;%)4r!yCH4c~blcWiK&CF-_mhIV*l>#L2AOO{krg
zl<P}9A~)PAb5Wpv5Fo?s&(oMMYZ8Ky=9AM)Et7SJV<1%Qn&rS1NGEWF&WAB+LVFlW
z<*NP4{MSJkr8Y<D!n;p!7uyi_tY?W?c(kMA$m?i#a3TXp<!?CF-ULeuXju1C`IuLV
zIN|3%C0+b2lsIlMVMcuKuKSqJ0WG#^MkLk6BZ{3B#l9R-y!B0}X18(OHl{Y=%*3xm
zsG@3NQ3P9TBK*5UO42U9o8G`L1XdY5SNp<_86E2?M2>_pUkf@8BBq!HsZ$Eo0mQ5*
zyN3cseBXb(Em^eQ?mk-u9(-f}5})5w6239alfpj{T44QD%T%&*mPM+8;CcM|*oKBP
z-L7<7l%wHZVgFP&p}rR1x)>Y!`?VXANrS#KUd?XQ*(4Ora@^f*;u_F2LfW~(2zsas
z<W;NS-ZbMdO899k<~ZQP8im>@D-m<`sauVp^W)JJ5X4=eYX5=o_7{iI?9lbL|9R$X
zC2x;`|FrH+Qln;rCeI>wm6xU<!`eA4G0A08Ki3ze#XI@7>p*2v;mhQ)n(#@dqq&y)
z`UQ|}S%ZG-p5gtq_Ze&v`V<xhnW>j_24zyF)hzGW5hbUP=O4!&(;w0Jw06Jfr7uHU
zbi$*9fh@w6QebCOLxe9sC5yx65$?%oRzhgg`!7^y-$md(<_@@Nt%dd}O5-ayhTPBN
zzWDr_yiARQ(Myrg3JUyw_Q2M_3DD)-(i3Bh>7iR$1w1`QK2zj0!rnTSoCtXy(sv`b
zerV>alnb3`*&XVa3P;sX3|@R8oIE8#5kd5Gpi?1*t1Q&U!QS5A&)@Uo=`H-0W|AaB
z*i}e=g^@`q*;#w3@O|`^*C3vht*Azmy3km0lrNm8BU8W!d6ZE{Uwc(+^J_!xs0ne9
z5<1^kJQI(DzqnXvMATH|L;MiNdvm{0qX<WCrz<XN;VId#jb##jfh07$IJ{f#QHrEa
zK#ln~qlk+2?7js50liNAV(VX3y8a7}F$Lk=ef@D`t_dV7MY_IFnDlgk<QW8)m92tT
z@AVp9mJ0;h5Z{R*4#rlh%!c@yAF56K87h8*cbq6q107ba<c-M<_MQAtTtjI|)L#ts
zz-Eqg233BsZ8IEaKm{!Ixr5lMX*MDBfvKOFc0^e^H;Og*Of~_Jf2|=n><beNMi>er
zjb`w{zONVzrsu!jrDRP-&KH)3)k-uuU?&Xbva3q3$nXr^NDO)u{Nfa938q)^+Vmbg
z=I2G^r<+Vp9+`C^WWjY}wbQHC`H>OSZo5jLm`qgiL?7=v<fVp$vA5(Y%?rJX2aFMI
zx^`ljqG>W`m+c$MfO#mg>lY5)zg|T9aHY3#6UStqK6c)PVee#ZKq;dDe`b@y?%rB6
znms@JTTT9I@+xjL*w;uSUj`3YZiKLH?XP|sO6FzSJ*o!Jv2w}EZqwz0GZYM_I@_)h
zKgPStz8R{~{sVP(hj9`xL1!=G0~gNVa02C2<x-Y!gi$0C((>{a!%MRrx=w%UMhDOl
zF`mB89K)b!X~?(Rbd9jhZet3t(ytV4bH}H!t|jPw>;T(t9_=ag-V+f_E^HUBO52~T
z{iwL#9|>7}UJC9QtP>F*zxXF-AZUPRH$y)-KXPZ=KNPj^Z|KCRfyLek0=}VOV5Qs-
zT)eET|FG6tS-PndmXC}~AHaDgT&%fz>fvSkWk>7fX{)0l`{t;hPqVtlLRS4>ZAN;C
zd3N?3*a*Zr&Ry<0in`h8iaMED##wgupPZ4f{n$Ao!K!s0u)%$}3Is$R(qU}t6mA42
z5=voQn|zNQ$*I4!CDm2b0TzzavQFVd_S+5D$(zheyUo<X>!U8~ot<V9HY=<>uh-Rt
zEhE`hIg<rOB(3jqV$UMAuRYb&Ub#rb0VGLnNEvb1>$$8!9={1xq-%RE%%B{a{f*5*
zD-GTp^~S+8BcOq?QbXnz3$+V(4rA}#51uWY<!&QJsPjMD(A!&=0F2T6Xu2NH?!>Z#
zO@gkHtBTPJ--!>N+sEhNxzOXtQhISI*Kb0n43)()f_a4#4fphKCWS}}C`z-jI`F9w
z7sGcJG9=T5)%0?2iwk#P&6vhR=?x3IwJX&29Ia7Qf50m$b$Bvw#}DD7KuQ@tw}*wu
z28)I@V|u!%-b~th09gh@R0LhM@JyC#V|O+JbJJ7#O$zV&)i+m@+J?h;9fgJYmgAr@
zZqbjgOxp0_l8%9ZQEJk0s2Q`(yZo~2{ScQYeT2#h^sQ^IHTDpiSmqNA^g7M8UrQCW
z&1Km#_F>Zc;ayz)E^#eSIMh7n?(OD6ir@l2UrNQ{QBk)6kUxoggm*@UfyFu?pZArf
zI~)Jp80o1vJT=;9qMB<JPA^?ELY=E3<NFPgaHrqdNXOh=)ak}|y4ydl)+IV$AA1Fk
zNaSuPCoz{`JEl}G-qsG;m63#KTk#~33s9P8ku$v`2iZTt&j0xVUV){W2eoI^o4`Tv
zupqO!3WZ81Aj3FjqlMs^(QsR*@7j7eks)Avan|g5Ag{x~ZMV{7Jz7+eZsn^ylQ_hR
zjA&5UIHS4TVL6z!Ui)V}tNv85b?5>$GDXTtw%IPr0UT-;mYTADYizIQ`-N!JnJl6U
zDn+=bgg~pp^*34~;?VGJ%DyZyTSEU3>rs83;LFoSfYRCOC(_r=hVk-v_mg0=R~NzR
zdnF6Mb%aA+wunTrE(8coBsy^)rED_5UkQUyCG|U{ZldHrBD|no5fr5u^P#*)QK~!e
zD|#{8G=&)Lcw2o6zEI}yHYQN~GmQ4)_=c0XV1Vjo;&YHm2|sU7QeSQ8M72Dm`}x0E
z!4=sK@XEh)DIl1@HR@0O@8*%ZqpDyGGnK(;Ez!dFWPiHsua#$iAz$=)r0sN*=Zo4k
zTJl;U)MWe5=JxknGycqvuYAWt{k1&f;gO2jE$?WLr>v#-$Zr_8<V&F{M|_RcJf2o}
zIYyqEj{_H+>%!kG`el8IRCnkTw?dbrC@XcR03N*fLOUJ3geZ{D45D5)|1WM`G>>?s
zi3AL@54>-G=wHNer`9pWo`jKL)+$SNX5^#GMjav=c{gskw2k@3hY*oLmKnJOltS}H
zI=kxbVt?&JxQxwQ>$frG8Ym#!O0gJbL`2b}>QIYyQm)17zZh^XOMp|+{G>2YmVrC0
z0nE4!r}aQMh%g@z;k-|@6ymlqa>nd-{hFvd!#5yP!jCYLA1F3D^ztQX$65J&@s%l9
z+(Z%O*XBn@{U(J6){Xag-uk;wk1^4Op@ZB7DSH!@fLVvcqcJ9SC&agOWEtxX(LZ85
z;R@V~lG+^lDKgm>Rt<|)Ty`9HG`U6Qz*zDu_^C^1<1)9)z5K?_wxgUr9kciezhAQd
z7SGu1UAa69$2Ymn;&gYDk;k}taN2i2%6NkH<O*9e2zqIY7V@KC$2OSZ?AgD-yQyeo
zBfd+YrjROf2gimsW|km23%>izD0B>>$*xUwdE}{1^IzisA!h(*5$S&m?0G4F1ENGw
z^*4>Qc?j_KE7SH{ESUOlg7jovWz%HwV((KwD1oAQa?~_RpfpzH?gLUru>zmwryd4}
z<Rsghb^jft0+-L8YUBQB3-g~@-*1>THp3&O(Zi?Bm<7R~7L(-}qmmwJL>&=a`hv+!
zP&Fz1rtSPS>AOa-27B;i7*#lN0IbDz+HW|G8QF_ExrGtgf|LdLMlVdb_qd9s88qsL
zf5~qWmuQ74=5G+4LHP0yf}rblZ!-@1X7&)om)?%2Iv9mNw6ScOdQH2rrGK5S1E-+=
zi1)1eZ3KTQwMOumS{Fzqrqd}hwWRnSmwvCdsLa2fzFotW_2?yZSd<~J12n0?&Xi33
zrD7g;DMaM#rRC(*m}BJIcdfC3oeG_W{yH6MD0khGv^ID*IkxUr<uSv*0#_Li877M1
zlJpBk_FOk*h6S3gbq9N_nwY-kxN5i2!am8poYWETKqPRKM}k#hN3d=5HmdE^rL?>`
z9@{IHdDH}|le9)C`N5Zr9Pp@p?OGiR9y4V1$cT9zno3z3UqG@m<CPoxvdknMyuCRF
z^RiG=`8SL45W>DZFQZq-Vv*#-xL`<mQ+A!&b@A1@yjHX*OG07WMK6xQ`TE$vWXx4Q
zYdg2?s9W76>%9v{$09I|)I>I2)MaZBr>MAsN}X{{I5`N-Msm0`6fmJn>lYOgNb|k!
z-)M3OI>wNQF%5Bq7BAIDVsEKPvB;?@FNbO<4St6Q`LG1no#f%B9Y3A5f!}{x>wN0V
zJc_tPO4@n{Kw?nMGI!v3_5CU)4{s_A6%EaJh)5PaV5ta*M|>|}f$iSmA@TX_(x^Sc
zy!*$IfYdZM*!UEy2q<!NFB}SOx8z@>*1qf^FFtxNwo`z~*=v{P;@u%WR;7fI>bp~C
zuVKvT#D^&!JL8fqmg<`sp?k{I4~R1T{hejDIjqT;FfQpQ)@eChn(3^*Ivhcv5FIRG
zzsYoD{6P_`ZjKv{pJqB#%FOp7vtCcJ(YP+wziqYtyL)D109b1(euRxrZXBU)I9bHQ
zP9F(tf6EcSF=UGpsgy&a;B=h(RlOM;Sai@@N?mA&&JCAU(No(wx>kF&d{zCl9Ca<#
zZl96fxI{LHbvu6d%kgjNju%y}CNUSnhG5a+Dhyx3-w2_(?;2Qy)ikPl6ZCVB?_;KO
z6Z^ZZ$=JHhegI_`iW^?cfN`a+lw*Y2#IpyVqEFbn(K>uD>(B!zWZQ1&#NvVCGfL~P
zP)rp2e1v_VtsV+HU&6(F()RkRm7O12Tl)Tn!T@gH&p4#R+so)zGZicDT^;poQbE-w
zl#LBRT05p^Mu8Ud(FV+?RkYFTky`hsTG7d)+;caWU7&sW?WN|pbU5Wm;pz@R<lYF&
zvLuhLu4RFJ6=&{fNTf=Dp&m`h0dfAU`363kI-Gm+JTfQLiOc<N_91DtymWx86-A$-
zuS!typ*Esa2!grKOXt}5&KzDCzpI^8RGd-r+)+tTYPlSmIeJ=iHyC(&8;x<cQ4n>>
z4%y2S0=!vhyHibTnoC~mDPX&8CQ#L4QM@dUJ$5A|9H$1*T2oN^^0k8?Z{pWpFoG5Z
zMFsI$GV%r}^<uLn6+G4JLBrDS-}jz+ChjHI&E|8jOX#e<+LnE6Q8O-Mmmt5?d6{gQ
z4fSfKcA810Xcq~Df6HVtV_3FHg8Y^1<2WqA1klNXO7k6E;(}q9#R=#tMu*X+`$o{J
zAWGX<Vk_bbh(tGpvQ^EZlIvY?vf16847CC!Ah`vr%&dNI7))|AwdV91&0*Oqpv^FL
zc4L}pqB3YtPD%6^cU@K&C4DX}LnI05!BbDdVM5`zZ+1qG)8)Z-2v{$k1Og!$zUWc`
zz<I;J0BAFpDvT_IOv^(<<7yk%?x{x%*Jz<{tJ<BfOtx7`DPb`sVeW~@GtNu)kYv4!
z78n7~^kIq}uDiKgz1q@<z7|qNvC6pT^i5rE)EiaZ6k$|C>eK$74k!9<RdV>d3wj0l
z>Hg6;JAIR@V3a{|=~l8*y^TqH&0nVt0Hf;l9B-lIZ%H2;Y$x%P^2@P~hNhOr%-7zf
zhVin+PmHn`qrYyBV&hINMc?vxD_)`t@15M(<k+5wE{=-JP@?2zf@dKJ3jOT3#>EyX
zMy=zM(Y0zw*f#^rSRSfN?B&-+hYt!(Of%an)6jn;mbbQGsX?-3euOrd&t$KY0<en8
z+<Jh<_IFv|A;aM0*I+Zu)}aS#6w1OnD^Bp=Lf4Kv?D;q~aAvF8;;@eQ<Vp9xf|6$4
zib<q~T;emoSrhVdw~$+Q2g(+<e|4Tv#b}|2R5Yk}$G{)VOxm2q;g4rImcnj9NLtrY
zxK)gpJZ|C9qT74wYV7*G<LhZz1hB?(vkaTbE#vP+`Ujk~`Jjz>IB%l0#$oK%+c44f
z20N74d@jDXKzu|Wc*UKqJkt-#Wu#+g`jU!oTWeEU%EqTB)i#vtw9v}|MYzooB}>uT
zr!`2^4YMmD`Zv*dqPJ>)6LB(#sm_B)&}s@AW4c&cao${9F8p&1i3t-YfvAEQ1ldOZ
zWx`8andv?Qr#B-#_Wl^Y*xbCGK)%Ixx0OS$ai_Lq@Ac&0nMoHsb`0l#5c!<Uk$f9j
z)rF!WK}eFa1B#C9D6Er#j=T#u4#P5uDG6R&k!}%`vp<%^AtV15&t{V}!ID)RE8ljS
z^jJ||$x#uM){_go+vF5a0RqQ?ag#Vvx0N^eEvu$<5nIybPjG`1hkn^ySiK8sNd!Eu
zxuy6n3u8Eu9$T+S+crsMt|iLYJJ<Yw!#@#p9Dthi0Ts|(mWC6!OBH9Tv3-~=mznIe
znjo@D7mQgpyLP@^ROeAx-Q!FH69wiM#GGtb%;6;S)I%zaHq4kcAR;+<yQZYsAK678
zAG@?=;#<wTu^<z!&bDw?@;zfG55`!=_9*n=y|0$Jby@{Pr&*TKM+BbbfE7#18Xtl`
z37&jkU}{*)Fc<l?zag%U8bkedZX7SMYDxi{2f|Lrk7(8v#SxQBgm}PJw7e@tLxZY&
zy^Rmye!kc>)b=U~AUKI43xt?_8@r|KhZoy+p-L=_BUV>cOIL!bIkP}qb@@)08S_hw
zshSC$ZWAUfiJ{-r;km1m)zHGh1d}zH>qT;p+>Rfa`Vl`Km;YK&Vb69)_NCz4VviX^
zr7r{mlUBubXREC|QIqVrR|j~*Izh%5uIMId!Y}<#ytkA=U|2nT*hg>v`>`E@ABwh5
zq0jZorL{uR)MKA?&b^OzZ}ixg>oS}a3+-&sT69pGacKT@i&$c9#@Z9Vs+4s#&LW3r
z{L|U3Ii%qoEmIs+A(&F<klWoaeOmh8YnO*u!f)*;=18Lxl=rtx2LLMzlfNS9`OtUd
zx*|{Wa^}?rcvQRB`#3l)YdB0kb{!Jrd<;Zt&=nLGR4+Y(Z+4f`iiH{mqerIy%9Uz&
z5E9|L2`GoPU*S8Zd%kXUvb2Dx1!6OWGBc>ni#tELy*gP$KO5PaeGvH3K@^49)^6B_
zD%%t?jxr_`^(KpWH9a7=b^$nfX~PUgWl93FgTq4LLM4$lVFG*UnlInvXzi@r^A&6B
z4pRSc_42&7-FMEuH8|Lrz#HM~Lb9=1qE>IL-4}F%@0c!gl8D*+N*v&(C_qD7+$JT|
zj)i}%TS?XV_Ty29P~Ovskqy`fANnh<BfDqdJ4$?-xKPXj;f;FT!PFIqazZb~SAyXa
zUAh1`4)?^W&DY?Fn25hgVu82o+R)WroIP(+Y-YFkwa3JQvoLHhis`q>F{Xr`Eg&@f
zjaxDfYq!6H2Tn}_!$=o-wPUrWe$e{)$5#mErg};?VKVW6?)~q5Q$kk?C$$zktLTq$
zv3hzwM&%rPbN(c}?W_Y1MEr#+p7D>&@?DRB6j815!uB7F-@ou;7ymf8+x9jO)%>IR
zsk;A>WQceYC;cAAbDV)O9Ldh1xOpzx%{UzCmCd>wE|0MTDqrj{t^7?ACWDHHuAVGA
zH)<x&-rzg3<8fa#cFsEUJ9Q?=8I6)Ni;Wa#Cw>dk_iF+{)z-#^zUR6-%K7a2Wb?T%
z@Gew0u4gyNBS6Vu%}eUSA(&uZ;Poj4CkhQg3PaD;3<twcKBJtDAVjzPiP{>CF)rZa
z!{j4#x;TDrP;p@Y*s+HV&7nOztJnC4m19>?aboJtFVdSTRlJOf=MNtx&Txwu8Dl6`
z3B9Zw`>NG>@;8(BnQ6nR37czHI3Fk%K=<Ob_FS}Lu<k%+=in=UOv5}Aa>$<AkKG5%
z1k8A@x3fUQ`om{8YBTuDud_IPy-GEQKR*OgXIq>0bp1bc`gvMfxFgfcl9RqN{5nc^
z?{yd4^}|?ru~9&|d%-I@hXUEHZkT166FZD^vAqtFx$MlxqQkyoLq`{RhP(pkfJUSS
z)2v_xSJ}Rt@O`*c^9A>N_|R?GtIx2554!M2vRh@iuTtGvN}3&#j)i>to_WCme59dF
zr=?@Q+GE$}P~9f}Vtr#Sk}!&W6OI2LCjLAW1H5+WC^y)<5$%=rcrTC}0=i%Nk<a&v
zW{bE=g3Iq`HM3No(XOH|c7_Z1fN$rcWw*=*t=d}TP%db>85Mu`rDWmhUGjkIrJZ~3
zt~W7jin$Tw1NxMFl8HlDqU}`49zKh^Q|k(5*>9IhJ5*o&zWOTNeaFRoZ;Rgaoh+Pj
zm>quanrNyfB7B_si%ZG4$E|^X_;7~aPBRU4LP}T>P*x~QU3DNm{<qi+U@#C}&BLxR
z;NF|)D4>@!(7|)EtD^a%m6lx<p6^}TvC3X^O}MT*M#9z@i}Cf`S$!vy2U~MmKlH@r
z#ACr+&{2)VeIj1r=}|W*L(j$1vI(iava6xY@?_m*IMNRv<L2I4Ibv;3u`}L|_aAQl
zCdr>_*eJ5mo4riLl=7h-xS&nF+#|?-Q9B6C{0>r7pYUEGf}<zs8f+Ys54nKKs4Cmj
z8=~}6va%Q}Y)AVGcUNfkj~(CtMzw_vh%?rDb5RYcYQGur0JnO-Pf(NLmW865)V|v6
zfbvi^zvDgOz1G^2(`7*IQ(5MiE-W)X0&M^uZz8Jd*DH&%cy^%xyBF9A_%k$5v-?s~
zM&bK$cNx@PE{ezt^eT#fT7g6Ud054tLH8($n&&TH1ycE_GxPhG5iFt;kZ)A*olR60
zQy{w@vR6%Yu=2}K53^4FHpaQx`Ff`X8`Iny?So-rx$nReCGbZ`t=rRb5OQPDtWNJC
z4S(KdVY;;COf7Bz>t8QvsBP;%>$R$DsJ!QxefHBf4CzuyRuA-zBt7=B2+UlQJ6JgN
zd4iNK^3NZ6&V_oQUwu*@2*y}OxQx8!NC$+F6fK5yi%#2;k<yr%wxW7_#Ye7&v}E6x
z2A|3%oDzIef!?-}He{xdGg1-*)_jUS2qykd(y`8<UtLxJP1di@qnrbuEsbySMRMqP
zT6Ce-e|qcS908KHH#DK~n>O03E1LHf%HEh^*19=N*%kh;8;z{8p4V+6K=fO}g!vPU
zKhph?WEzU`PBIz}$XbpxUD(>X&IE<!P8_nOhC_5PtS^{`>&$nT+~2XEz^?TEoFyI+
zG;scLkg*4N6}5zQtOk1uOWua=$=l5y?H|k)#YN5!o&MyrU9AhgJ<nMr&T!n+%Wz!8
z#rgBN&}J+%J)uOxzv$1IJt1t6Vazy3!0zu|&E+rqW?l`qN4y`4oA<CIJKmJa^t)*6
zukSMl3N!}<M4+RlPf@BF@-fqa?9&6LAYOwWAo~t%sriZ;HFYi3;k41%D2Xu}esXyY
z*RiEC_&&JD4?}dfd~|fxwzd@Et_*yz-0BwxY8S=OB{cdDV)y%7WS{e2_)f}vpjonH
zLZ&$mneEaM$-!KMpi>>lgy(!ku(dRj=Gc9=ygHszPkC`k8eQneYv>HT)X~h*q3wu#
zn=JuP9%=}Ke^p4%V_XxUlvHJ|Ia!bcu)MMkB#)~Ft;<pgIsK$>a#_{|?9E;A5|o@7
zN4>QTJrOe(vuIM$hb$do>HP$~<93_3$rkB;Xs0HLe-&;bIWgklaGugji5;VW9i6~~
zM$qt*iC)7w{0W|oSZ}>v!x3RAn*F<o1jP`@-l+N+@kJe@MkUy{geB8KUR>ka`i6w9
z|9fZLFNnuk?p+S7qHg*6w>!O9ly9PZKhHVV<q0rlD4l04c2e8<^{cEymTp&x%VWJH
z&M$MR-gqhDgd`~JrQ<OLYakegGQ5jmK9|R#^d>qZ|KXAZsM?q#ukfaPhs-wjf5W*0
z`pw7w_hlDDiv!<x1z#$ZDI{hVAOrp3iEP`(zxKTG-LX~Fo8ltG(vxUPx6I9+G{hVI
z%kr&Ehr`+&GphxqWTSRG9U3zyKZ=h=u=C9>xa7Bst|<ag`!8>AUd{W6RJ8|vG%d{+
zkaXKU3f2lNC%MVi(F7MTY2p#3>Bq5v&u7S6n8%H(Q1Tee8^SHpRhsUk?uouah+&<v
zd|}8lo$WvV+p@y)?hs%Kp<xt`TF$|r-IgzUQ7|$3brE7La|{S{PD&{MUFTqNxJyBM
z4P9~C(g`911|*Bj^-cOenBQ(C53=_CWAv|l3<<n<PVOWZTPl6p)5pv|&}V>8-tfeE
zgG{nc>mV9Q{_7<k#kb;zpEVk7FE)otL1#@u=%BOvnAUX%rDlg`8!Fw%cP^AHABel1
zJ-2U|ixTX=McSxTF-Qt)VIvPvWE%Z~ZST{OMwidqudb!2ZJSC-_Jx@BT@}~?DF;*l
z8PT@rUcP3WVUB~}&*IEqff{h&;`)e!VtHz?wo*x)Hd6EID3uCju@<-`E@9o+-9&$%
z%$OaLh_-DGxyooFj<0{DA=9kyL!n@yKx@Em-{zimDXm8nJfm;>vsz|(8+toNVS{<t
z{b_m;%Eoa`ZF_B}G73UVX3k>zCfg?AQpDv_M6*O~<LQ&^y<wg#cn1_83ceI74IB@P
z=(omrBf8Ypa7wQdP0VCaO}4S@-r@OG`ZYf;Em-g!K5Gb_;PJi(Q)Ze)U9h2Eui|*0
zpMUw*4FBP^c&NTvx^PgyG(WgD6~^7ExUN@%AE*&EYsq#QBD4>0(!A>-#}iU`<mva=
z%@73UZ*kNm+@lox+zddy(p&wJU*%YuC(`CpRZ|b2lbO8_WB+y(wy#G$RPs!#S-QXD
z>3x+^izD>MzF0>fr6_;FwWhQ((whs%%*EU*CH`Lu5V{|7ubK)iCVYrkuJZr(;xEBB
zl=4vtCl<i}t3BsDOQRIOVPL;=Ap|O%F#HYr&;t5g)ecEiA1fFOBL{Ovk#jrw+kQM&
z@CrIpqBmBG`uWeFG=?SL9p_IWL{c3l&r9zo^D~%(h3HVc9HE_R&y|qf2dU@LC>QVM
zZBEDud=?zB`5n;SXC_eO+d`cj(qf)GjkXm8zr2c%wxEa9Kw;VhUg*=(xXP@*JM2BQ
z=L1<0`{$y$3k`24WbV&wrxm6uPM@NnT`epJ!7reXC%RhO-$zh+M|HhN9lZ=b6QVDd
zgW}CwKaK|KbA1E;O*U-)d#0u_WQfi*2rERaLJf;WIyc&&@K&Sn1KWK^ZNpj1@9?R_
z1;11r<Xu=clD{FUnWvbR#ZO#1UP0de0$j|w-)_$dM)F&~kiom(l^Xih%*8I$8AxW1
zobcKHKDCt2-;j$AdqJEdtAqJ3>&~Ukwo6xjkeBX)cD-zKK!kTQsz}jp@|{`+;+jl<
zj8W#D*Tcke72TsCrAufuvZRE=#d0<B2DtMynhbOaY%X|z8R%Q%f1=t*p56nBHap1w
z*RuVei}=5KG<ur`QY;E@=i8jmU#2ugHnZP8)KX7sN-Y13!W^Sdkp%j)Rk`oxOa@&T
zK0;5+W7l~egrsgxym`FupI&CyCs|p9U*x>}N#aHf?5N&8yj=mjR><y`qhcK1HVHoM
zcRTIztxi2fJp&9@_11j54}5q!+n)ECMv~fdRvX%?e=qaPxt}lmL4Oaj()Cz{Y48KB
zzOVXAaVGy+;dpePnru*V+-!YkSOq%X4+Ta9D)V2K6_GeQTpjaHJvQX;&n7-=%UWzt
zD@R2eDM2>j{$2q5NyR$x|8QIPygpXOUNuxm(f@Z_VBJ95As-SwqCrIx)gT?g7nfAz
zMXxz<QY0S$k1ot+CJoy+yC;%9g-E?bhwzr>U*{pE$yQuV|Bm*oAI~ScblEjMS4O`2
z%m(lUk-`QsQhI{_M1|D;?gsMrt8gY?9Qvm}I!SySN7ojX-E;Q1d4GOjSZ`Km+^r?!
zKfksobA0z^`iFO+9V7E$8Vyn#&kYpA97M{H+<Q*Kk8OCqe(~zdlkt-)M$sSTpN1Jc
zezpVQ)LZ(?Ih<(sfHQhBy<9iY<d6<vnk(#EZhEEIxSJsR=P)8B)RSL0Fhh@D5L@a$
zip<<+kKG%8i~V`5A%_hrx8QF_LHv(#G$=B&4y94|=5l9kbN--bW^Iban(nWkA)Vf3
z^yMD8`Km(lExWa#=pne7RMFHl9Jy_Vk<tWFv|FB;O&zysmASo?54VQ10GrmI2%?IR
znOV{j|0V4<jwVR)vR5)X)6?e?HHfq<S@CuA4}WGB2Cuf;inOQ(NiXbwO!nVfxtHQx
zTR=Fe%;4l2F<j<`YoqGJMg<jrdl<N=20^An?SBn)%fdK!bOT)u*ocb#m-T)gyLCp9
zmSrN=0C`7u?Gd)Aij$ob|3m2il>YzuAtP;cVVXy=11duF8XRM=XHOJ1=N$2ua=eAV
z!r0;)5N1T-K;D-vO27F&0O%#X{}Ovf@Iu*UmI?(lSKH#R5Z~Sn#SPBFEYUxZKQjMy
zI35IU;3<f{fYP&>dwXL$A>*ZPF7~~m|3;_j9$g-fDahmB$QJqH-0T|>hdrVj1a6Xj
zMcn)#AJ69<N9mnJ)!D~LFgM8Q%x8M(AQ2T3LiFy4O~<(c_lq6|&P*-H1k<+<e{)xL
zT{b+?U17+u7?UJEb0~Wf2Xy*GFQ5dYce)x2C0ugTRZY2BMLuEs4f^T~Z?21-QV!Fo
zCVw4qRTjp%5iG{Ilwi1wtslQ1L!Cnn{jxh;kiSa&@gT0GZ#MCfHXPS!l!D{<GE~3U
zX-Lp<d<M}I*lCQ6%IetFDTOHg>3Hx7fj#!AkRWcx2XL~n@o=-qn>$##S&_2wadYwg
zZzYn>+r51W`kz^aY8y2g-F0f1=x&%+Z^)j1X37X9@Otj>dZ1$nI4ffAh`@dkOGpwc
zKJLD!s#BKH{idrU!UwAe+s&eIdoDVnU73V!1)mrnpOkO?bN?}QSzjBuZu4Vf^ALF7
zeSDQTUC;c_<9*?Mkjm8qOGdF0qE%<~vE#&**Xbj@HPsH9?TU5ro22`3H9f!D@X~qn
zlIbZjaEWSCSTBCc-QJe_tS!^)CpXd3H*fp<CX4!qMy5`uh0zsD*(I@v)uq8uxjqV>
zHveK3YE6RJ^C^%0dSzngB=|iFK*e1}tXx@jOR?u;Gu!n*_Ub?ey?;wK3oLgPaoN1e
z_+8|VYuc$-K3<SNhA|s*)NNl~O3-eGqJE-~DOKNEJ{>j@>5;sC4f6ce$?;)f<72}*
zKe`bWv6U(?9el*fALt)dx2bZ6Dd;HvI!*h6HS*?%wjM|<qLjZl1#{d6v`)1j4bsAu
z2*$P`SM>`_F>yZn-%;GL@&`ocWaoVzKY~xFe-}1C)3WZ)jtlfgHVo`U=DHMRs?Hqp
z+M({!hOqmD5&k+cW@0+VeqepTFlJGtIBZ@SxDiz|St~5!YD6H(l53iMdxdi?d@Ve!
zaYqxd%5n{`(M%~#p-dqGQ(3yXi<@C(<5oN`&@BZ24s$BTDUB{bb|P00vDl^<+?{T~
zowHX^0UV`c$gaDL6!G5f>wFDL-sMO3-NWZVOzRJC%p7+Z*LZv5Xm(ldF{d*XUxukw
zz9jMY>U*)*LomXHyk)Q$m?@ONn#z0>0E^aE_=SH8=Gi{*T=xiIY{~LQ9We~AG`ln|
z+uBg!M5^dnG=a-<5DB|#KVqswY#_UX1tEN5=AbCKNKb=u8uHg{^K^YlDkKn$0aW1u
zq8%W(BY?ZxpU^&{s@eDyE7=im#do==uaJPJ+_2GOy!3bSU4>Rhd84K5;*KN&&RF(h
zZJm$o;#ko@2@=k|d;PSGg1fqTQ(haRnvSZTnpP}H26{rQB`IJ#*<r`FhXe`UzJF40
zdE*|>RQ)CxE1{hL@6F;xdl+=OhERDsvv?anlywH%&=42#m>b=gFqG8yKuPY{-OzkR
zeV_Z#9o7ASG<>$u{o(JG$7FR)BQWt}zG$lD@pym1=oG)X4e>nTK6XwVegyfvmuQwv
zftBd|`y-nSdlHaLRVyZ2l#_WzkZ_&;N`__^oVFEhzcVrPbfn4QNaiIkx15Nn2wx!^
z*Rj}1hDRckm;U}bA{ExjZz5XuA|Bekwbcb5um)D=Ok#qtvgnD%+mO%>v<nZ5?%!>N
z5CX5DPp8;`d_O;7!eINWxx)kThT3{dPouf?u^?BU836y=L;yNRCEvbz*y=jL+n$S;
zSEF#Vr?Jw(IvC%>!$V7Mckj7qF)F?7<`THRbJ*x;qEHDK?%AfyMzeE3U9Dd}@N~dc
zS7BIapCh@t2w?*K@kh0{_dK}!p*ye}yYOMbtSvH2d9j9gMHEb5w<@g=J3xT2eRgw!
zKsi9r2T)OBu-0<Q886Eb%$%({5Rq#2m{rnYMWB~?(R@v?Qc*&USV-ti197&sWT7kN
z;Pie+pw9Ys1C^8mJeel;y?4)EDox-iyZ!(l9sEft5JdFe+e;)03_5*YbqzgLs*83~
z@wPcWoNebm_<NlO5qsH~y$y|Tm<?+BBqV*@177r9S;``Vd08nuM(6X)I9AE9GVri+
zO05ve0iD_>a5=wPK;ZshbMaXQEL|mG1+AnN8E|A@wih6x)vM8PD@v4t|EMcKga6=n
zBo5D4cZyr9ua<6p$XDNZrzJ-IBJ?txsd64|3fEjK*P7tpCJgJy_w%RVj?A}^W8vC<
zYrxh}m@7Q<^WXu0-+yLdr5BWHK-KT19Um{=b*vz(2|LrDYb?@J+g(7FxaT9)uF&ou
ziA4$4y|J@(7BUKYJMXoo|Hp!vh0YJAih^8DqM;p*`hIvgVNm`hLz%JqZXE1dzl<Av
zx@)sbGyDk-Q8%6_8?r6X*p_v46O~%Q9MEY6v2T{bQ8)eFa&?q<ARj7B@)Px)?eTN=
zo!v1P4C~&z-kh7S&F+@B1>`O}e47?smtvGN4%jJ^&EgS+n?-8jIL<67bvAr>qo<fb
z$@zG9pnF&;PNkU}Rvp0}T5s%q$&foq=e{l?#b%7fZ?3U4bl$CrGyOK!a2HxbKqdw3
z9b6vI?@b{I5sc*LCd|ctq+fB@7rm6W!h3{)HT=JjajVgM9z`=FtsY=E>XmRF>8U(K
z!<%M4(v##l?S^ZzAfO>*rYYKrL*CTnaZ|RJBNOz<0;}~de{-PKaNb=yybj;W63SO1
zI-tZh(6k0?!jN*L+`VeviRAiO0aA*WSJfm9q<7x#o-r<zjZWIgb8`rg`M>WE?w~oC
zk*;We!@#(}&K7KXR6I0{Zrf9`mA5lDzqoEfS19f5@5y{x-9FCe<=psJD*GK@MQodQ
zi?GIyQL$*Oen~FMFwlXh+hbmdCq+~5?G2WY4UC9@h_?!IY;We_6Nb#x0<eN2KntiQ
zzhlX!<~QMkVt;lT4T24QMGa7UL%NI{3_sFUDp+%JTG(=Oa#l*v#1dNct|H?dBA;8C
zcZs_YPQE~yO~bx7n-bnT|8^)kO0yKK0eSfvgIBQLPE4t!G_`p_B0qq0cXp&NytXMP
z55K2YKnNX?5gjk@#9yby3Q+EEr6m;zEs5QjQVJLCAy673HUxmd(4EnwnKlW-u29lp
z-;uIFqcc<oB!<wxQ|#{MG$?|U9-&3ND+7q`TAAlgVfI(x_AO%DNop)9Ju8Sw&%xfM
zvak>=DlQbh9mD4il@}n}OqFnngd@KoE}`w^&WqSWh^GCpWA*a52dI6-_X-6GWT5;z
zslqLw|4@gB6)JYbw$ZK$WMGvSEo3UkCL(wwBp|PZicm}uvgq}Ug0M)#p{<@zNY`}M
zFEy>qoRvh(WtPkK%C%*1-I3PKt3ViW4u7FQ`5ANSA|Y4OGcWMPs2_bB28GvmHjO%9
z8}_m%xsoAxIcg+ez)@F)b^+5>BSG4?hz}Ok@gB4~+9sl>49>I#%AWHAG(@;q=#g8{
z5Zr<-inu=dIJrBari<i^D?}HOM9<I@iim{yn}`Q$Yw#4w4KcKoB&qd3cs?@>7PEee
zZNYMHZ~XNwiSiZ|-mGQXFlM>p%j;rKDk@=NqtT&|g~87(fK3p^Gw3E1-HZfRzNU-!
z%cl_w9Tp`uUYyBi4eA7~#4kvl=juY0)}E8!K?B=+EyKyDv&lqemoV{V%JT3>kX*13
z!%-V%;8v;(VoqPsH_$V_{TeK}+s6Ah<gNe@9G2uLs(Q3?{v%60A_L~M*0d>Ds|kX>
zYmSGC1wo+{K<5RASQe2i5E#}+czbXE@UK?B7E^{Z*b?V`T|}nb?f#MniB0>i4d#KB
z0UZkGOp&M8CW~e_Q4e7oWb`GjZNmWSr64L}gmp;ZD<PzUG;SpXy!d@cms9N!+()Qb
zcOX}Q<c-j07ygSK3}>=f*xZ3V3OG(xpdGv%7$IyspuSfP;)SihzYoUJG9sG5f8aq3
zzB-3!@5ZXUxPYOObc@T*19c&2g8k6mE5)H#g+GCp5e<2gwdD?ZxDSWI;Jb5lm7!yt
z);Yc+YZhS;;|r&3=(3ttN8yn@ye8+j$VHE!YP9^~wJV}-aKm}@!aU!gmX$3@d~XB$
zoj5oHFc^1%nOM;baMXz{`K>`&Yr&#(0o9d+5v<cwV(??EQi<ZQl1)%r;cRRZKHk(n
z*c-EX`aY)&*X+wd3mVx2%kJ(^>9G#xxr~siU=wWK0pm_65A6P{-&X%Bmv*ZYItnT4
z84!?kr$4r~)l+zle(|u`O0q!N09VrJasF~94peW#ye3qCe)0H{x{Vv`M|CD(d^jL|
zz4Ol3TpvdE7X&0lQ6HRFg%^jvi52^91XBN*e1kNI77EA=Y-ACLJtuQC^yu2oIef=P
z@XLD)P^88ax48|KxgCn?ct@uCYty-&OFj3<JcEAv5N137qa>Dk;bIZb+C)UIeA)1O
z89*H&H!o31g5PY>NwfL~GqY3K&jKW`V8+0L%WITBPQ;tT6MsAM-amgg@b<nwn%EZ@
zI<PWgL6e2jo`IsAfiguLw9CAN_v4Cm%N$j8vgaBpz9;xK4Ei`y;9>Qw{#(zn8U`3r
zyw$QJRgNGs+_Hpg(WPgzwaJRVAf*!(GB9{Q-{HAIbl3jsTQ~_|@_-Q&<a~s_m#;1|
z?n>z)_3iY!J8}2$MU*|R`fXc4=$Yz8+Q!1UP&hU8Hp4HTH9qY~I|-sH`}q=^ewaSR
z$ls{9J*xYTmOU+NULTd=GAFQXwX<yL8gxx|1V|f_CQr5#-nQS>3^tzfJn=Z)0PVlR
z3<f&iBug%nJFSX8sTMxl&JPh0Em7VTEh{oVzlNHvHFg%XEYxgv3U>hAAGz<X50~rN
zYoBKyJP)J!uajq%4!C%qr-8vx9JbN}o4ig_=s#`^cZ-7gUC%`)<u_}Sw|N?-Y}`E2
zc9y~Kqknx?H962C#Ma}nN?mv}1GDDy$bJ}ui`}N;ww@L1t=!E?K4#+ywlbzWg~3;I
z2dkbN6LuX?D1JnjZzq0+<{sz$R`WsX`DIH_T~lDD+82iYqb?qhj!`5Hny(A1mM_R%
z1`drcBWF+@vF+WOHjU38%5S1<xAJU!fBQWmFAadQNz2LGZrIJkMxN&j;Fj^myN$!w
zKq+Ao;+}VlFTH&^+5GXTyc%WMd2M4&Clb<b;0kAetqt$8FJ_D8n&S!LYqU8>j|HX_
zTOHoHL`)9NG{+GHXSA8N<{<}%MUr=@cPNqNfcAuu-BvSnl66;cpni40AjQ>J8A8Yg
z&`judTa$TqEkCCKUsLfu5L)HO)JWw`!`88^-|C_Z>XyhtLPsv|s|xOxf}Y_F7rSaT
zVR+O3%Qf6U^KZvP81Xmgi!#ga^<dfsOU%g692gNOuB<N7oOd@&VdajI%>8qB!=G>F
zYht;?L75HGflGe&OKaz+76&Za%|A+jnz_bjS>Mfsn6JZgL>^B-Pt0!qpk4<}G@svK
zmeW%-p~0SjTT|cT(zeYe>{(boQU{u^q_0i+$|B@z-4f^KomST({^)&uANF&aaZE39
zq{eHhEwmrk^iLN2;~U95?+!}}M~MlEB?j^A$JKA!V68aNkaqboy9ECtkw?M0?Xi)K
zp{Q=**m>=1E$(H22W2Lrbr`2ega3z5Vk_nqS?t33={6YHpTgl&G@^1+G&4?ELbPQP
z3|!<mLEoGEgga$*ylUujD5oyvlQm{yzi$(;=%mTY<Xl4;sAofgNmP!o_kH;$YgQ$_
zd!#yUE=1HYIadDE0tuZXUcc2**|=qXTm2m3s-5h4<_kpt9y2T99=US0%1i$t3l=~q
zu`WYIk?I=vJ4R%t^=9+)ypW=pxM6~$`)(~M7y#(06G(cS?O8QdsI^pZd|6nV+v0dy
zB>hYN#4|Zmo3-X`fAaek$l$L(UHNpNu|NOOu%Wct5?*)DS`!sR91vRbLrW|cRjd2J
zh^RqKZwMP$fhXd)LLBs1_sAzha1AZTZNx|$Irg(Mds}qYuEN2Wtr#*7X$YhC?D7ft
zn#Z--^RwH^-d^8cgR=({3maR~HbZ;tord^%cFm_q@xM`aj?KAtL7R?tj3>5j+qP}n
zcJ64$wv!#(wr$(CjW_dUYHB`A)l~JWzN*#_xO#P;eVn;VoVM#N#{&9k#fvpcrZb~g
zJ+1GNt1m$}2mQF*a*Y!+g;b;7-O*Za6ff9?;v1BOfRYCOzRkpWd6R~)At~d{(LDT#
z4u;{P&LImFtT+5fzv_fYXBdtc=LDQ-TZY~_5v}RJz@xshB|^pyr^2((%Eq!K<x~L#
znlw)GWF(Aq6GTp-*8O-BV+v1_^YQ+y7H}e<%UIU_vBiTBN<`l$ps%^J4ic9`KQiHk
zMH6XMfa8nF4FN^NbtPOoLpLM|#B|SIgDT^GLVq;q+>jSs69?(QfS2G?n0(;l3uAd^
z#Nu<s;E^3!TvI*ZsJhaWWfOD3lSSsrY(tHZAwMn4v_(`Hb=B)*YN3uA?&~dt7NAE%
zB|><k<K(&lexr4;k2U-VUIjc_JV4^Y13nN5Ac#Zk!d1kfpc~iyyr%A68Fx;gq=2{g
zOl){&(3XtZ%7pgtl%vuZBvf<l^YvBywi0jTpxw^77o<N4IKksCZ*G)DXn#^LD1c0l
zt8`^y5E}w&*D`Py80iE->E5zAss~1EDeRyW``=v;5hzpXnR~K2PGI9o-b!rm2JF^0
zpjXdO#h<Wc4iXch<4;gu9$6C6w_Tr52BC%oHW;}j5G5^3LcRkICLpp~i=dQ2>mv9z
zIPa7j&SI=nsBWQdA+Egq6107m6Q0}!7Mml>z!b=y0!_(+o8vEoxvVQ%byc(&bU=5I
zvcK$~&@Ct%EoI$_v!BmBa{EMIoTK(FfTt&RJDUFag!B4mTdEs<chZ})mGe3EE6gjI
z4|g}y)8B_suATQ~_MHq~^Y2ej=k2bmoD=jJU7p<8C2fL2vDZ`}331A0o=-x-**dS;
zDkY3P@jS@bc)6L<**WXkxr*63mkUx5^e+65HC+Kg14M;NK_b+ZMD5A|f7oh%Kt2a?
zcx!lX?501lHIr5YmI}qwQWjZBh?P*F!F~+ukQIgE$P@^GLJ&K2EgmcdvNL8t7Nj0%
zFHfMcy%~Nr3>TAnsCaRw$Ft(vj%I79+jn8UVun}Ls{;z02?qd<nvXxXz3fqp(kj%g
zkQZL#$_jRJi(9SPN4HYndrxT%(D~Y~s;=l<d3TqqTe~VIUV~M30Fxg4`6=C2QrDo6
zovm!qh8}b}K4IX*o8QAR4`2?3WA;eu`)$G!@6B}6R%bY9kV2hmy266t6oEEu<=Ap1
z_^a;*5?ig58!O11VIevvj`~M*XIPaC$kpu9_d1@iSIW8ZwiZ}OIf&{4T$EkUcv}44
zFDi0<dq{c=z80moEzSL2Hc9!<yg#R|7U=Jejy$iHr7j}7hgWhnyu>R#S00;sB9S5C
zqI$-<A^wXnX8t?tR8pp(zE1(Qd|uvA3{HGBS9aCjTsdu^?YXf?+HN{++DB?iU5+NN
zTXn%+#fD&J52;s%&1B06(8ry0U9~O<{kU-S^%bCxI1S68q@dtLinGQh4g4C0dL7$}
z2DYx+8b1ytXPVmD6PWCnnDEF3E7cR?4~`>nWRrWFq4q5L_Q{eLsAOM00=2P*45lnF
zZNuspkTS>wP8yT5sJwAe69)a$hOVWK&zq%yRU$5qROlIyKpYMPI1=$7E95~A6o*uo
z3*>Pi1nwRvD*_|r_)A6DpN)J9Ew-m5d2qKbQs^WW^Y0D8digSadH#Kic2Am`s<?S1
zL%bU2ealAqawvMCnwF9dE;U7OuD#IoC3d_RrFvJJ7v4Ml>aT&YWa)kJ(F)!e+u69#
zzb#N}zs1dEMeSE1fT+5n=GyRIn3a>GHoR3=*)O4%5jhek##yg00Q?vM><(EgPXsKG
zHWeI#8#XFm%!w-~$pzRPye>0j{<H^%ag4EOO7ef?SQ)nK!~_CxSXLHX$!PW9fe3*_
zLHNWy!A0?RJIaVa;XTTIw3hc+NcQ|<3gnVvggOOb!`&Ih0LJkLS^r85fzC0eWfNNq
zg7(mkX{XNe1O!KeWlagtx;qD=Eg^PVKOPqyQN_4(B^~1`C=EvRb#^W{%!jIY-!l6`
z6YwG+iW%mElUzft;h6ulc7Pkd2?a`VzJlhxJj+;A%bVCu+@-3Xr!P&FQhha_#m=zC
zc3)2L=;+Yy0kL2jn$38KhX%9BWQ)RE)dH~P#O1Q`PsxI+YWSAp=LM}X=fxm$$vJ-_
z9)p94G!R_SU%xUAACW;y5*A`Vzql%iAFG&`&rsgs|Aqy_mNZ35?E;0>S&3$~etz$7
z4nSEr65yX=uG475k_5BpBIj2Zm-`^?wbSM45_nkm{sJ4yka#`}KOR>PwCR1#V#bzm
zEp=F{&h8Te^A#jd+uLAnYK$s|?Z$3KyFRxyvmfrP!{e8mJ@@+2D+x0PP|ImHnhn0!
z1^&@%&qVPjtdBeXb$#L|QE3Oe1g8gJq2`sfh8hu8PwWNJNxQ`muPW%^mgR6&w35!V
zHKl4=0W?u`lK3%jCU>yL#!<)NKfZ)g7S1>mh8FSBOhPkflLr*j0@8$PNf<zg_!15O
zbmo#7v5YBsob6y>M|29d8LCvB^Xj_08q^pr_F{}eV!<*56=T9-*}+9fBDT0=mjWB+
zfd>a*{dc=q)|&I*-vBk+G!v3V74=Z&>i$J5AiyP(BUo6mgxd-9cl`j=AIM+(hj1FP
zQvOOK%*9Z$4zho3ap7Y1=T;9;Lb!r|MzFkwW}28go%gE{V5{H!Y_8}3M4}r#4xC^6
zPj|ST$MbWVZLW3vYV{(~KFjNyEnEu^CLBZ3)$p|Nw!ZaWW7T<<Hu(ywTnX87J)qfb
zwgC0Y%lwwp-;el9O?{`2#_UzAipMRfXx!31?)VkZ=-<JUm;s%?JLAx&UP2I4UW0*A
za|%NiXC9{Pj2btpuxf*~;vOmSy&Q0i+L*77U<VR)^B--xI0&GGwIpGe5QM<@rjzS&
zY}TF_s)MG3x0mr?Wg(DBaZQ4(PJP9@mjGjKzX2W(zM<=b@9(nk+<VB?sqBNE&=kKg
z84C2$XR7&iVR(T8fm&!bc#=mgp=Bg4qCf2t<%?RBsu@%b6%_|cn<z7OW!FO!uXL70
zuA0kI>gsOl*ZT=WtiG;6_gLygv-+*=Hm*koS0N#|nj7QQrH`nbu!_1VaU*<ceE<*f
zdy}LxvG|_y@@++&_THQr44S+URPA)j;K7Haddca6;P>-C^D<V4flJS6MjKQvbnY+#
z3cjP+WZv!u_TLtK!bx_Umi5a=%Ini5O!T?)ZhVFqQX6kc%?|^}g*wQ~!Rq?L1D5`-
zLCGeH6&NgR3T(9J(Hl*EYPGSXRDd*|8wnzLQd<gf1{A`^^8d;!nwQ1OTEY_OW@*U=
z^)R9rmqpJcSyOOCG>O?<4pcMkau^3%nCo4<rYBvMn<q6kAG)l29MsRZrb74Yj_LKh
z*M=8=iO+Y*slI2!i~6m$LF{(=8*R;l>n65e>#HfK;a=LBdRy+xS8~^qU4T`luCov7
z>TlJ=|9UR&@w@LbA;4o-pce4H#}g^@?X*UIM$ZgXOdz<<^5?7KD-tfURde1G0xc(5
zD9dvvCR5g*bgOd$O`j&P>8j*ebOvB$>r}m`LJQ`I_G(js9dIcVDjF0*41|HDfgs4B
zngv1(U`!yJ{i#+#G7MlW0s*vn|M(T87{wBb0+e*u>sS7S;B?@4;}*bA|C3}7CELQW
zJUezsc*k9oa#nzLC@jhhipj*?li35mr=i^%7Ft>wL{URYBiqnf+Ae)_00G)Xg(ruE
zjOZ6f5=Hr0DhHWR3Kxjiv<&!jUO^xfqf%<hc{xe4KvN-y8vNI$vl~!uqj}ZTqPmRs
zyfSoCI&g`>-QoEjfO_G_V0)b~1k>@;T;rh`pVd`&{fd43r-e?_NBJXA^s=}kCrag*
z9N;j<YRV_>8PImVO&!zJ;?m4cFXek*F;FJXZrdeh?lFJZH<`YE{yEw>5}xw$-(+-4
zE8jUnhTK_iSO=!w=`ny5F&Rb!TX5f@)Uq<12^910G)c%Y2a*iIgo;fLPJ@&6wF+T(
zWZ3b#WM`o5Hika-1gdBMCxU8@<q^wwM2eUAf}<eyZq&5xPxtzG%=~oyP>5*}cEid^
z^;4DIYI?^~OV^}XEH{tq^9X14U7AUQXf8u~VZ{FDXYZWR%^U!lj35862eo|_Rnx}S
zQ<0Z%&Ig51U1tHIRZ7}9P<jazvNq*+zcCz~VYzo6wxOtb9~{GkJhE8HDV)>u2r>>i
zE1q;OjO-ja(m8b`s5tTv>UKfzE!fgt+`C7Z#?!b20;mwEC`x$VIAlVB!F9ltksvUC
zeLtc_FYrq;3_qY>En2{zD_DOjJzgtktKD>0d*sLMW%6n6<68qm0$1XT=Sj+nd^?01
z4NqhCNkRR5TZQx+^tw;j<7PGXg1&5xsq_2ZQk~J;PA;0XnXU2rfF95%<fnJ^Cd|C8
z6=1$=Ux-#LR}5dY%(<oCqJ6vZ>eY#vD~lSn)eG6S#t&F;dFd<5>*E84dqJ|`KpgW3
zGdKkrDb*pJ$XF1R4vVvBR)kL(o+;+coRM(W!pccisYYoGh72DlT;&S@6T=C40ie7f
znhmN@NHfuk8?Zz(Oh`%?apEEgihq4G3WajT0WbP^+!Y=TCFZdhql6cv%#};Y6grc~
znlu9?_XCW%H22+|(;5a=^~qs6L}~h8K_4{Ca8?IU_K}KlUH9FJ6T6Uf2e5)Aif~c`
zm`o?@Z;kTBak#8;C$J{La|z8>Enh<d*s&R)U!F9}t`<<N3541A!8dI&FR*cORpsU>
zt}n80n>-H0G{Z>p%tR`{k+|fr<xa`MtR3RuY5@-7!?`}e{GN6%tAHD`?)&H5*OTeL
zciSrb%#oaI%OE`M5Vw!0y@{Yl1z4ZH<I;ZHy9_9pSmj(-*{afMb|WFXtZPn;Pame5
z6GWbc*k}!!7Lyam&csOCc!;Ft4X|dBWO><^$v8J|&|na9;%b;oBU3Pwm1~xDkkMx3
zWq>{z*RnN%!g9@Db8Kc>yJCCh%%MQZCp3$veuDl03T3W~-Op`7rSx;E0<+5<R+yKh
zW1f$$-($L2%%NX!Y{By`lQc!WV9_A+@RdZF|0Cd@u8V`o?;h8Pfn<K>EpmQM_!KFo
zM6QF+FH(*IL7XB_;WtW9laa6T7C;&YaQg`E<swcAFoG1gwq%k+FpNWsp|RG}Bms6v
zb|QufN1Y&sQdE)!rdW$J+y}1=n5=6n#}m*|8ZyZA8S^c&7F#*hEhBwB{<zL;%5#1w
z$F`I1%GK9tv;C@L|M2QR`iq;~(4V=|{gzF?wWfgI*R%R*pev30lT|?B@<56Wz=M>2
zlV=)Uf1|4*WF1LK^&VSwZ)Za_%N*8oMn|mzr*1U;l;4zpeF+HJObWpwk!zGnwwpd^
zOby9;D^kv8Ey7(+-!q+LvMcLcv}&7dUKn1r$q5TMqsON*AD@6BmS|R0C_G;3dpq+$
z1GW<VvkR43(0w{i0dp|qylD0Su%>t@iDvIPpaO=;m`2OWNL;9f{h1($^kV&5tdK-)
zGaw2>l>w_btQL4E^L~JfP&Bk1yjL7Hk-!(s>aX}m#)WlN06}#@%a+-PEQygvU&@dm
zfH{pSfX&ZHrYKJ6qH(|G2)U_VLIrmGw83|MrQ77>c_Z#^_Dk|^D<0nmXfCcg7|)DD
z9Mr{3zdqvY&HHK#Z-Jz?S)Dx|Pi?D$f_jY4jnp}B?Shvq>0E#HZlT?x&SWy5TxoZ|
zy=P6Y75V8mT==S&ZS8^aLT}Ebg1#VMd}r+=KMj>NWvO0dr!Vd4j@-%_IG{7MdLj{L
zFx%RVc)6fH8J4u&5J!IiwijA&c%wh`!nG-0svgpP9q|w5Z%^knW{T=^B5U;`mPrz*
zSn;ARD3PryU!0Sl?o~t-VaseJW{WZ~eA6aVB<04{s-c>do-V<JO~Vs4L+O9Mr?kI6
zEzZR~en%fJTTVAM^!OQo+hJbsZXct$_NPg1`4Ta;$<o8z$fYWP%-7{nuFtBP=KI-G
z5gaZ6yqaL%m8w@g7O!O1Ra!AeTnDA0onq9ckLdM}ngJMZo#a#@_PeWC1L6Z090nI0
z4;LI27x#Q#AWLZ+Ch)#!KvHSo8znR<i$xkq+%8DShHu8<zm(MI)O;ulwBvlJNg`dA
z045T6|B?_du_Rvr!bevf!NWlv>Ey+y^Vs71;p&8B;WG=2SGn+qg?yDylA#FB9}Vd+
z3L;Sr?eJPZE<4r3n(fM$Gt7_`t_kbxqo(QmM2X!7qgP7Qm-_h$*fMEyS28Y3vsVic
zEs{Npz~=BMzol=(B4<Hs{|T(jsZG}AZ!m9Ke2FTFm?Z%~YN^Wy@vju1MXEFY*-ne~
z2q_)4vaNDN^SrV_Y}`yE+~y*M-c{$E2~GTfw6$>1-)+5?=rB;EJvj-oIbSkLC8<wB
z)J?^T($paM7jcP9Z7MM%&B{il+G)me*V!*tRJ3$_?!lT^5kQA7@WN5WiO%u&UZVOy
zDlQT|Y#<!Knfs$ar$rYRshUfS&gv^(Z3WbBC}rUfJ%nGy^sk|iBZHuJZjcn(s-Nj9
zwD_J0kbpq0tVd+6r7;gBN=2i&x4qaVO^2!DJmy5R!|lzX=4<<}$>4jk*gK^w>s?%2
z`g4v}7lEbFZ}br5x-zqgwgs?cl?AvYnAUBuDp&xR#jNu|vdE25%i+rUdYoWC9MidU
z+@a&+ZJ0%;Wy?hm=aOzl^@x@3DiV`|3>|OIh!r(zl1O&a)MJD&4d#~Bmc~ekJ1L8s
z-9U;EGRoCKg}+cJ^a(6QEEpnD#z3tl?x*pH+pfpowIl<R4~qp2-mf$JXtCYnWcU4P
z2+jbs^4POjG|1J&7N6wOkS`%eL=TIV5ejJxLF&$N<r!ztVs6`$1v#X{s>2$Khctey
zh`RcRLzl7=Ozn$_8DRzq`Bo0ERpMr(a*0UYsYpbZ-Af)B89}jAZf;124O7(hwpsQf
zIlr_@Q2_7iFv$cP!@XRF*A0=&F(70c=-~pW_j9qa4b6}?pZaDW`69THaidScmSo}x
z=PngTFbdtJ<kzBD*!}2u;SI^>q4y8Kan)&SnY5!xnFwFqBcQo%%t=cPXkG9aLZ^Xa
zqIzD_nBX`9;{Njo*r0qvURsk=B|dtaa?f0L{oR@%(@bHV3l|NLV^XRUpdy^rH825u
zERMg+smEr6&t_ML@I!OB)*8%1>9~Se4cj~oW@$Gu9f2EP{uV1hCfC^9ZkHGfPM52?
zo9@@`7YoT)OFa^VB^qwj^{!hUe`9EumoB(mFI@HKy7G}tvO*ium9lE=d*Rwk{m^oX
ztXFD!tsl8>o4A+<YJ)HiK!La<PeK8Xjn_a0shXY@c>cxtDB!pC`6M*1i;PuN_3SLR
zcl>cksz{y1BupNCdG~=v<hSWqiVd^Y{e!wvP%#{)w{{b!r>w?=?Cj8E*2C|cCXY==
zPWC#fcGY45a3~=fg<y~ebk{?RudA8T0buH1wwH9rbE?J&z^HU)cv#vcLWzJcu)MK?
z?8VgaS_3$V#vLZrm=Tm^F^R**7$+@pPVQwcDKJqTdD6dnsL)bBw|RMw2qFwuIEZ}$
zTCt2Ys<#nVCDCL!1Ab25+~jHY{jIkMQWviq|6IX4Gxyh*Xb-%Kb83>=nKR$~Jjojp
z@e^E=CM{7QN%mbynnYG;=@$SE8!l<7hBlK9nmSPEN9(P0*Gh7SpM_I6<maw5Xr$Sd
z=AJ~F)20%?Y%8^T9D+bolh3c#<Or022n?|%pY0`@+{e|MEGrO9m2pq)CYF`7$>Kj`
zA?Pg311xKkVcPAU>74;M0YWzE%Vz7Z92K_>qlrvJ-T`-(D&Y}YxyXR$k_<yv%R|(V
zK77Zo{q6}w6wm}FMgJnh#1xx|6Lb@7cq5}s1DsuZ{`mDe-lhizw!JD3+~&K>H{Qz-
zXX8)j6TrCKLaS@is^P0NO3=fjili-ao#11{n~{hOI(is(8t|Q!StLa!Ba+W570Q0t
zEEx?N-OyJ*JP()>xHABx0hS&Sg9f8&Fg{<spI@NzY!AzZTM{TD0c<iXLQJ{J1sadR
zk?fYz%mR8Y<ddp>+5+-ZWQac5VYF<Yy(k(-31Z=OQt=kb%^2rWEQUukW)=soC~BBG
zDtbY$&r;)XUV~(sf<s9vU=tZ7GRsV?Tw_vzD7&G_3>u0^>sK&4ANpP@Ss*=NoS>t?
z2w`RU_+p%j3y#?K$S{-5J;VQUhIMVXPiu<_NYo$66{J%M{75Qgf{1G#3l1}W+iI03
zFA&Sl)VbIs$wqf%5Jk+sEVe^>A<>@a-D7d*ZVp=7vI)j9)++K%`Zv7IT?$^_`A@XA
zvqrSC6QH1~)&q#_C~ek4XA1Q($h?AeJpONbMP}-=u`C_IA$s-<VMNu;rkH|7xnN!<
zT8f#Kd}=X^Wupubij{2U!K)f(HpRtiy<Da#T<B?g28Kr_wtLpu-AMgcXAY7@T#sbW
zz(q7Zn2va!VnHy65x&J#?$102$@Ol6v>J`>_nxiycQ>HXTU6iuCDeWUNm1Cx>HuMx
zyqmd;@p+7S#^=|SPU`D>w4iLKO0UQ3Dr3oG+*sUkdVT4FEvBmdVDXo0^y|?0@LW~4
zQ|uRTk>tp>0<9wn@{jRo;<N0ztgYdy!5KZRebRbz!@2Mh5{Y)-CmvNao13VCYm5u3
zZ5fuXUI}2lc|MAv;>*GqUvWRR;0R%gj^!Vy(2LW%mS3za0@s<ZTT&MqBjH@G>=I~|
zT1>0@SJ)-!cZ~sm!o{8vBQJ<{$QkN@mJvH-m1x$IMDU%-va{&5#sWzA*v4jEeQBM~
z_PXKa>lSSL`G}YqP5=JF!uGYj`@`M7r=YwttpNbb!(uz#S+{dLldQ_hb3gQJ$n(Kt
zjDV_|YG3%7v_4JlpBpi!;uFh+bOl`rrGse@8Tmk5$tOR{8K$Fvc`3t_%ar!_Hwp)O
z4W4=pJlTN%Awh>FNQO~J68Ep_?%$pV>n!^;p?i}vX0ivZby78WvYI_uO&*h8OJZ#a
z1Jb7C1TJ+~OziFhlGfG+(=#1VM9`kxMOmvO%cUyHxuw!+6PuVc>866?<f~?WqSmnZ
zQ`feas|6D^<&+~SeYmDv2(FCIJfilE*!U9^2ylyiH2C{M3k$Jg{xR$)QTD-X8EL}9
z5Em1(Sgp?7lINComES?kjES|_&4g}Q0^qN-oW`_A-gHvk?W`U9uY3)e28yp4(qs5K
z?Oeeto{`byz6f2Ft$k}oQZs2AyvgsbXB@lEiJdDtwWTP_yS6rSCPq21Q}@a&uyTU9
zuO=L7y4YWoI_LaYyT_fXwkjui7z`e?;zS=s(m4A58@Rm=>m|~w=gSckQwv>#1Q>G$
zvJ)%T=>>`tXWOvNw@MRNO<6SFV$%FPv<fn!g0B4}DpsyXARh=Vp{cE<J20D?aRucO
z<(zU2@yeP}l@VUz4G}7MZhNGNni!nIZz1~kS%#MGXQowwWqJhmg-5=FgtFYoMVCbE
za0R$ud0A|C9wGP`+lrc=&F&u{0O;Gwm{j^{Fr@EijuusRypO(mBKILOR$iTTjC-bG
zQte39rZ?~S9cdRgK3Rq&#8)+p5dLDNfg9V(HI^n?rgFnwaW>p<M5HioIn{WkdrMA}
zzF7xHHwPP6dCN|(?|;`nC2u%6RWsVsnneh!A&2s~=z*G$+1(%gefVV?{?4D2iSW!|
zVm+Z<d~xMhT+*gm!($Vjc<4prWbkVoj*iaA$DnxA1TuP;l|RpLQAdV%q$mDDm&z=!
zT~JZ%Q#by%3vIN4WK>3QjTh)E(J4CwMv^n-5HS<WgrnYTGN{R0J(Vy>E%^pAqNhGT
z)Jk*shmLD$KVO-aj*4C<3DB(5XiFC-uvqL~#>iJqBPIFKuDdt3@89Z7w(paSV~tkl
zAirQUM2JVE>02(Lu$Os~jwI=Ukt05Da?`5H==K&~Dnv>n{T3<4WbCm>0ZEG#U-os4
z4<TDIt>^fI;QhWqf0N@a+nNvV?dQFPua;r{`JJ%`0iiw&&+2<|0bt%|#(!#7%hs(s
zrWWoJ*6SFt%+=F%9hevAude3U;<+7yqYmX+R#1Cgos!14vAHJ5mB50i`uZ<@K*bk4
z@R<2OavyMx0eOF>d5!^df4&3eSr`r}vn!AIvBy2X!YGY+{iR*NGL8O_wf}#sU>PgB
zgBRoy{s>Q4howvDt^h{d0ebYSNhg^50_|D7LCb1Gr1Fw>i*KpTK-em~2D_3NNpA$X
z=xidng*wS<P~5bpxnQo5(s$UfnJL8DeFSCj>%F7^1d>FTPmh7u%uPgp4LUuUxB0wD
zG8xfq7q4Ais{)LqGvM_)_vBrR)KRnmDral2F<D8hMMbaxHNX_CjyF5=;MaeD6DwtT
zvB>3l@lM^=bqilyT=wz{U{XVs_zh`5oKugJoGppbC49UTjzZa!?g}P~CRHRdqLNuK
zsS$5j_6)7FB_K+OFeeoxsWZsrVIw>-hv)x%1{qnoRZ@x+9G!)M7z9qrTlvi$tb-{T
zqJ&&wGK)SYFai2~SMcp~(fRi%X}-tLyR{==I?0V5%z5^#?K5A_eJ|aoYjj?k-iyx`
zGO<D+)*z;9IzL{VH#Q)XbN^8Nu!f5cJS=Ij_<j0djrYHjYhlo0GUF;UFC^Y={#CyD
ze7!-ys$3+zi$AXBL3c+cU;t6&q9LxOff7L0h<Qys5Cfbm9DlmN4qK~1kE+EZ9ZRm#
zkkh(YZD$n0cm3yYfi-iNuRu<NYKOuRAU7DPgWHnS5r1%s@`bY)V9r=&!+vcFHpqNf
zrCwl5Gho1lkBESA>B^J+(T%|I2SegsnlYSJI?dG9hL44LQ=I(ceRQ`bR_v0ku;h45
z5KEPF$QvNx8-P?=F|@Q~F!{yxS5N96`W^2p9@7teP!H3!=q?(9kP+QevrWOhD1ymO
zR#gaQtZ6Wgd@$()rqK{ksbU?$coGr*g&A#qve;oZrvwsGox=?&WzLjQNv-Rp)3cHr
z1hrIF>5N&HPT1H9^pRJwTF%(yqU$I)@p6!yp$7myY;yp$K~yKaTEWhUNGF>oF_Um+
z{)OQp-F4p0F0C!z`|t0@wWePvK>QuzJCskJ9&^&wOLGRpW|mhH!oCisQz0<Ifl;5r
zC4a3o+8&)Ge5rwlDDZDdbxkWghXuV9)rCP)I76@upYmkm{2&sR;&N6n>hxJbv7~b1
zxdZ^1CGHgR3FUkvP(mj=5LM*llSyAZ^kihImP;TmkoXnZS$O~;!JF!J)U^2212R$l
zh~A2miWKZf@23SWL4Bn6&Jyb#xr&c;JK0hu@6wHATfN}&)n^x?*aUXB%2y5Elojrt
z0Sv?COS_YoJ1~uC4ua!dX!_ptS>)A45)Kd;2PpyV2fHOqPbR@tAt(M_!q?m71UBaH
zRTGCdne^+ms74;sfz5Jdnn1#9_>UjX`oP64X2Fmo0jj|RZwzGxhT#~gmV{V<?oPQj
zKL&X=n+do(97tboJW7!+6_Ya>Sd$IfooN##W{(Bd0q9d1<&W<_WtF259jjnUC`Q1R
z?q0Du$lF%JQLD>mgZO4Bg<Yp(I-5Ab)jyts_YMjr3aM86AI2yBGW*V8eOb|+{veNm
zi8AP7>r3*<+;sO5JY%zHS;G4Z<KCfIAao?V{QC*kJ^OcdK3~a1$6rl@T%t8nsSj!-
zh(X<2zFPbld%8p<gI3J!s5~Q4b2z|yh+5=7@q7^reUwXoMG~hpW6zXi2_4J<?lK)>
zx`|eG-EZ@gDJIPUjKmiw9&uKdl0P*L5uyS-8jD2!7pW+QV~+K94V}tz6?XNtKw<`j
zy|DRth2S3;h>G(Rx1h_5aQTA0XKu1Uc*yFgsOtPuXL5xuJp&!L(Z8j8E*4;8&?i8b
zr#ZbXS-}rkz#BgM#8=|qr^_zWsp#MPgP|?uwbI40X6cF5qIog5Y!NdZ(#-a2xd<ak
zlLDR!P}a&2gF2$7TGV_sp56RX2rW~w(_PFY@iZ`HD&-ETIF2Yz?8Q|x*Ey5TL4)wu
zR?(bjG7lj&LJWJVfq05=M>oJO5c|mjv(0tdXt&chtJ^tb3!&%k!bYAsLSZvALJ%6F
zV&wkEajrq_E!c7cBotpT?P@H#0sKN!F|uPMcnE-~&wwJm_Z`YSkxPG?hsP}?UWvcA
ztL$o@cjxsa6%tmxFOzMaeJbCc$x%Kmjnw|WPXqb!NYT`l!V@3#1_r>oR2pRaE)?%g
zL}=t;a1V2qUklXWcuCWF32{4rwew&1EnGjLxe~ooYBcCwK0&r~F9OpoUI-9#SIB*z
zq%}p`1m73Z%iqOFeUNY-*H77JpcdTLq7=vY6INOKw6HS|d0l4z==v%4=<0|WQWWbx
z48zwoXk*l@O`D2j8z(^Ha_DdGCK0I#+{iDU^!bjmaHgs0$<?SiAWdQIQH>3^z+|B`
z%Lb!BA#iNEx+XJ?Us-u3MhUwwKbXxwm<x_w0*Hrby^XJWJ?BPoo5>2QkaS!?9nZlm
zvA2L3;#d9!_2#o^QZ=yPQ^?N=Zk#=1UXi9BAuTQG9tYJ9>I+D)be~pQXhx%%g928p
zn6e+7=&<Hh#9(KNR&2MRql#k}V_z}XmPu*1fq|tJc65Ra*LqDT1rr_g-O6X*ki?rR
z_RF@>5_Cf=BiJZ||Em98k!)6Gm2C(;pMQ8TVafrb;B8wM8C%g(PRz+9H!Y_UR<VEf
zI?%(<Ng?Q>r3F+`M3F8|uOA)<%QA|OHDD?~X{7tB@5|{5dHn&0ld74j$<#1OtSg+v
zGMR49iJH<&*4Xiuo@8b3X|Jj96>sfyTN;*TXfNR42l(nb*NfwOS{<Rj3>UNV#@M#1
zIjrhXr#{wXa9d=j9F2tsQ@hP<zjuu*2#ninp1Pz*LIZMGPEJCp?KT*O5dpih3`Auh
zdd$6Phkv2Yqs^i0nujJh>x7YPoi>Sx3)plG7KeA@Jfh*Dqt;yt;|FyW&P-U|?>F<|
zLeOIqkl4h%9*^_B)mpzvNmWA!QcI9dFaFJikG&+CwCaG8(c)B4CBCmgOZ%!I?AAOE
zLG>^7Ap@!z7c<Nb(1bh6xXo>+lk=~cZ9@f>sEp%8BoweovZFUncW0~%MNC}E<;YCy
zG8{#s)7aUxnJ8A$44tq>c9hFBuG#GF1WVw&{+`>62W#<kY>1@}t@FThK|9S-a)q*K
zkpcZ<Icue{Cz2^CqfF!zPRyHwIEU^vK;P7BCI$R^S|l1lMjNsekm_gbViIbk8X$xr
zG9gbW(-1P#ygascoB49{88)SD+5AyCPt2wNF`A6y;W`L_lkXf>`T0ywcQx(^Y?J>X
zeOg)kzV8n+!1rd{PR>W<k3P7m)jz2QnQ$ctva%XTN&8!urppM*PP&3$3d<0%i7}sE
zA_JhLe1_Cyu?QJ%g62#Nf}*5_6q39%sVmy|9e?$H>M8&VO7zu)%UhFsMwGO-pRB&0
zo{I7IPA9ErAhoL}sE+}jH0`RJMhXo|*IAQQTeMKbLWPu3To<;(aBXv)txYCfEs#Ww
zMYB3mR6D^vfA)}6rVmR~DU{$T(asYg_5fIz{FlrFf-49kJd`*qe&vLPAi0uDHJ~kE
zLhp#GH3_ax^Q*jaGKQ+frGOuJWMHh8tuaXpi%<cR;=-uEikN$T=6ulB@@qC7iq(F4
z*6^GgF5h_mdaXu97<}T?Ri-*InMvb(XmQ{Cp0Ct=AXe6^O=-LItogYgyl~FYV*sF?
z%9s%$VhQGEgM`OLL*ETxwl;a+V~!owcPQ#bW)Bd^lcdYZt(T?t9rdAcZPAq~a^hPm
za+V+Wx3*Fk<eSR4DGiI@vnV1lSY}L^P|>|d9fPzvB*+;mmg&GPY75`$YgIx5xn=M(
znOg1n05*~;oJA0bJuRs-o799BP63-i!;c)sdbrjgK;Hi?;Y+BUgnyUQ?QZJe%$5@8
zDT)ge#Q3iiDuzlHz$<5P$s}>fH0mK2!T-jBf}$7N-lI8cY`%9TRmm^!wux`;Ap^Nk
zeYPsN&;m<zO@p!lB5)4I6^0bU8ZNW#Hh|Z)kp_?I+D^mI-Bx!YYuOS3P<6RJ=l5ta
za(t|P^V2_-?XIV%VA;ZXJbCW(WZlx!X|TK>NaS<A>3KY%%u|!|x#nC2o!mJ^Xa_MK
zG&imRp3EU6ONLC9M&{th?$%M&YqQ2za6G_lH3un1ySr3c1x}Wr#&{7md|w|IE+cxP
z$Ye-4RjXoCtLbviDxVz=_{zqjRnbc+##A6eesmU!6j<)Z0X<rrq-03-COUR=zDcro
zLU1w)z>Z42lnTN`)O2}{!vuqR4C3%=uyHNqj}3||5iamh`=x4aWXrZUPy07C_!=zA
z{Ffw8+z7hG7rU2Mj8n?Lj{+31u3<ki<$`#ca<9P&pU(2zs(3U7D5;xZcgUjswb6*4
z{9lngSu7BtGNEK-Oc_v@w5lQHajCHO=iyOy{P5P26;dT$l5lApic%!h|6Jx@F_?=U
zMOsQ8uh_C=za)%sVWhQ6<`817{(t{$C&G5o(q+qHm237p-Is4{ts-*y-9P`GsjDu#
zv_1x?in?~WGkya)d)ql1*n_1ez!2z0;BAJgWba=0uvfkxS2*R=N8RQ%z(Dzq&7J9}
zX=tetl6AR)W{t{IdH*z82(Z4^U^ZgV963Uv(;vo(+fAcdTiM*z)`59a@Ookh$>Z%C
z!66add*sJk&B@>VT36pMNSg2`EBP_FQdGTt&5eTnK6n9{%j>CstWM=5s<@<z7F-C4
zSTQp?orB#hQ}(!gbd%}yf(Gmo+w9cnrY#Ipto{fn<KzESSSh7-G`VF~FtYe2;5?Yb
zWkZan>~0=Vdh1O1Rd!4YQxrr&HrQAVEZnv-Nuir&7A!60i#g^uW9hQiA_Qn&tyoOg
z%w_S*I{N{noc;cHXte++j8*-aK$#fn;gzc8fz`ukfC_;w3h)L0^-l{MD2)ywgHg2^
zC?P`z+un(+rse!s_K%zO7sZA(t<#K0Y7|#jY-*qzo$Mo3R7)|A=B~5!8vRl8abDRm
zBDcyl5T7$TUs3YP>ulF?Io5LAH0W0kFglxV_1jsy6Xm}iG&Gw^+B}K<{e@Xs#UHX_
z(4vx(hCi#)GG+xGW$NefI_pUq9=%bPDVNFfOdkv~wTFw;27J5h&%tW3oYN{rMl&1I
zV1~=z(6B~I@?2nR@my$5;btvom7oNK)oqwETFhWXSt_qnloF{h7DbD-SobFZmP?Z?
z<cv7jR2B@}miJt2oNLhv)^Q33XA!t%XsW*{h-Yb-fv#*eB|sy1!uE5-@DLvterbQy
ze^lM69^Nbx3}j~R2VJ);8a9~jo-hc%crk5@BHl4EW8+uRlR}~w&DiGAF)*zPte=_3
zRFE<VZ96BE(L5stGfkotUo2z*n)=XS=8YJ(O434q!Cn1_7dhAST=y>^GUhH_YIAW|
zxpgAVTs~K#3dB3E^}oM}Cu7>!QBqST?YIE2QHO~Q=$-G@anjrYI4QS1q}053+~ct6
z!={}n2CNiu2%;?5{GiW`Rr!<Uly@;&flEjhM*Xs*xBli{1L;vL-;=?B%ouxQjgS!}
zak60OG6c9g*lgrfW}@OVXqKFXPZz+75DfX~TS05&e1pi8fSjgD>2FyROL>^ZDC^FI
z!X=2Df}A9m+*FNO#p(XvA+O_Ab|gB|q4Ucf?AV^A3-(SdMH#`2Pu5_;tLCKPlCs!A
zAJkb~nu3v(Km-zEu}Cn0Q%Izc_93~(>T)IXLJ0X=h$;0Wp6g2_b1Cx~k&5452ko^v
zcwS+jJgTg2nboz=0xrk%vGlGewY7T$0G$UQSc;4VBIQtEE9T4h$WFx~^12)%oNQm;
zth8;<Mi=#sVqNz&(l8N870{}g=36-OtNzFW<5i*H$j;B60`Ubf2vTcewi8M}wVF^W
z-m(1ZSr6D7cw#wfgMb#L^mZ9cD_55_Rs=mW2ohk`&Kz_Z7YOdKvg@2}p5?+``AEwb
zR14Dn+v~1vkKyjB9ldsIBHgUqV&fHTA3HaOS}vvCD~>z3Lib}04c1lGz~l3rWp7cq
ziE1}TXw5#>-^T{rNz=dOezp;O#;u^DoanRVb{*gWH4^!@3B`4Lby5qzXK0AcJ9kb-
zrimya_fWwdBrwhsMOpY%-kYKgCMK6cOC~OXo-7Jj3c|s^9sP|24{Ib9Zcn5~G~_Pl
zO6$72G&)B8)W)qC;LDnLjXLrm>&CKQh)0XUBXAa6mtp{fGfb<TKhC#YV1^hP@(2a?
zA<T0)AgNY0XKNC?OhnNj2%1lcMMWW1ykToB?HF8|Q7YHs=^_8e6E-}en(jbmN9=Jz
z$$Xmx_c{Ta{=TNQAkLrkZ_v5i*^A})!<h7t`-<geV_uq!YJN(&(44E?ndrRZ7QZYx
zTRe83_@)SuALVXVu2Y-46R0m4UvuGy`X76u&tG_TMM_RdvTtd@7kaSu6KQ$bSzHr_
zXtE!E6dj&a%GT2r$UeDZSHBz#E-)htzF2Z;qMM!s5uWr7)xp`p%D+e!C=)3B+n|qs
z$6FA>I|=JU<Zh78(a-ykstxRB^8DQO1g701Xho+1DFTS-yG~$Ci5JOKdAckjc_8VH
zg=3d<33&8y0(nY6l2n~a<0XU&WmtiComifTYzwpISk~f(=57_hl`~X~uE({h7_f!@
z>|L(|(wgHFrFDMt3;BBXrW|lU6;91^G-Hb2rLw|VYbgs1&r|uAYFd(}RQQL|xPs!A
zhPAbT#y;}#H_<iE{DvY(u4&>1b*h!uBAp}jwvH^Ln$4h6fEQ8VKJiqXnB3AlC!o(f
zdz%<pE^eLp#9KydsMuwQOcJv@Jsiam5sP6VV-n>DOw3{OH6@gDra*OH(z!ugiN?ET
z_>W#ReJ_FP+Pbv(DvJvfDm`({trC8FD&Ga5$WQzR&!jo+>sWhIlG&b3J>)Byn>v}Y
zzPpj4Br=l5QhRKD_I57#2y7qdP;fzGf#fAPJCK6_Jc~A*B`KT)NYR1E#iyT_(NI?L
z<=Nz5{NL&s^0mERXrI|llx&wFxLNG{VI#J&c&yuYyUP=MWU7z*(WI^Ek?Lf$a}7O!
zf-Y;$3hrYB<a{Y>_+g~A8#fy!wMx6KytDndntB){!xVn=?k%P5wubh>`DcdK`Ru34
zbUKJOf?V^MBZ!6G#Sl{!efh_9Vw1x#UHZHV>Oy<A_#xV$(fkLd;7e$t^PRt8^6jUO
z$^8=|g;N2Hb+V7i9s`j008Dxs50eWRE&L-Ml|0FaYc8NEbc_`Bf>4ZZY7wugh4J>_
z*h2)e1>%Yax#&rtAfCLd#t&Wo*3z(rF2%;`BA(qzGg-`xy|(B&YZ0MA^elE_qnueZ
z#kV1;4NjW`mq<oT_Ukc`-5jgk4yQ+==#-W}-;cc>yv@nFJC#2xWM*oS@cBFcXM5bT
zkZz{OHn+SEq_O=>C{hv=bWc&wTP$fCEW_SRtaEtQZ<|AKff2qQy9l7uz$*+4oiuz&
zKq$&EhQb};GD_r6iWsd|-wzkEG3lr5eN!^ues?}Mw()+TwedXP-mvSr>E5vKiY=4q
z%H|3$F@$kDSpVG)y6JrHhp7SZ{hZsQaQ1cfKmDVzDR>Uc(lf3m+2<5EKr7hMusqCT
zguFWJ?qk%+v^jP?S8A%{!fGiP#@~QLUPxIN!cp9-8fh1m)Wvd<W1JC{_qsY7+<$I-
zD+Yat&bZ<l*XFX~K1Bfyq7#vz1d%XTKqvcD(oAzmr)9RwuE(o;IDH4O|99&9c)&G2
znZRzB-^Ju?3sod-M>Jvyb!0q;K5lc2x`qfp+1BuMI_J8Rm7bY7v`tq_J9V<N_l~E*
zmuU)ITy+32qCaXb&?=@3+W9pF$T6Zr|MP1d;>;PdATQ3<lN<uBRS{N8lwF>G;VD^C
zewt0SPg%^@QC|Me)w~KAPz2y*!@bO|fgxOViW_ssk~_0~z6QVY=G^fr3>ocI%LJ`Z
zPpoVStsb}q!we-DRIUDZX|nFyB~#Ne(L&G}pn0IJ+|A{~+A#HEx|13-ZR6csF{rn1
z)yUos)-mDApkj#dm#P|e3#Yv;5KguA5@)=N)StOy{9Tgo0-Xn-HXe*Dtx3kQ&V^WQ
z`J`5+?^34p<qtih7M&}JUX!mCNht6hcJ5EL|Ji_~RhB=;4Afv09T~|gs9z~+gXYaU
zXvfNVPF6ff6M?&b_G}Ul&Ff;dB|H+DL!(qgen3q3Pcql#AHH7p>$w$vwCA>MIb?cu
z1CF@%Jaal7DqjFVz^?BR3>aZve#K`h7aiEQ?}Re4@uvMNlEA{p;<UtZZA(YnbLjED
zX-#maviq}2wWB%5EC0qqC#TI`bEle9x99@PO=m@6rEz3~<>-&LXtQ&~z<z{?)`kvO
zOWE%A#4}C><aho*)9ud~w~}qc`>lH8V|40r;=yaTsGbo3&*)BM=lO~-jMKs5_RGbi
zYl6vP@dVM0+lH|O`oxf3Vaw^4ms-sl^5X^CV$SS^vuS}qr5&y+j@T3iOL0j;w2BS}
zZ@%U&lwS(!s?hn@iVI&wm6gGn6)Bgck-|zvQ7MhV&G=lBovVK0JrrLg5zKp-c?#@i
zcsM#)JfR8T(k_u?j>2gHxe<M|dJ05<(`viSImx6`&sdc&Bp$w(v;pX~$^OgaWV*mZ
z^BlO(E_*>|&UQhZofF?Pu<a3VGt28fr*1)74Fw`dZ!30E&EE_!sy7$n&APW{HjI@T
z?kMZ^{_>5bDe~aJ@+PfPw5*6<wt}O9Io}?k&W;uE`JhYt`LN~TU;GFpx!rr=5nxV&
zF@p6NDB(+&pTsz0vS`gDTEp(N{sLtpK`}s-ea}ftDiBSUbQe!z>a(0d;a9J%hmhUa
znS;6JpoF<Z(H|D|2v6+!Nz=4?3gn6{dB)hNh~mQ4h0YBYdOB}<G2uX|+>3hurX+#i
z7wrSU&Y7Yg>iSgr0&hgKHvw;Z`pj!oWT((C-|5rovps2%TsdtXSHFn-&)P6jV|kZQ
z(GxEKUBZMEwD&&`J)(b!AWJ4_*#+=~iRs|k&zT&8numFV99m5tT(82uDzX*AORa<r
z?UNQ<r1gs-*0s?9zNeB<W&FbLXNB{s1O5R(dq>?7<jTw0%WC(-&cXZi&Io*5_H8;W
z+UJJ=rdQ|hTp*EbvjDbMf~*=dXq$*4CRr%K$fIiz3a5`Dg+p?gF>sV%(xGy2Ro3JR
z5v2&WAES)@(7XoJYmq-G9Npfh4}cUe<?rr5wEmcfWGs~_$lpkIArg@K$TL8gKJE$-
z&z9MbuTps#9j<jOa%_l4y*_NLfpFfNrF>eDa_MtH4!{3fh;=01FFht%&mx)YTv>j3
zBym6sO+vOV5Nbto{_<*WEVK5qBl$)9bh5KcU*gsk6utVbbPn?xu*g)LR3@n#*u(vd
z_4Xs)J+oCULZ6TB2xaqN(2=3p&oc#hcBI{e`2;}iAo0a<WEW;~)s1<*A%HL6dLOLF
zR-QRMB&Q6eFsCpt^DehEd~dkrezA?fp2S&~dn-4`eTAHCY+F0+bN-CtPJWTu%=EdD
zy+qk}|I7=_BuNK-1b*DlphclFipHYuXenvGH_Xyc=#gr_J)r^+0Esrq2rA&ZevTcj
zx`}vYEP$U}Hm1L^823F&d*<RaoQ4ROASB1MI*m5plbG3+-TCESR;{h2jmrwlO8-sO
zz_6i&T(X5)pWSD?CyYOH%3fbuZV!hwcuQuQK5tfTo)x!}mly-T|2)SE?-Ys0^q$Bt
zznvdpzF$eV9`AA>(27LPGO^%Ki7+dW3&_V(DF9H*#gr8>Pz#7uBCO(plmDTq_~%pL
zFa0C168K92R@+Pn;q<S_g0o!ksT52#-;D)=m5_a0Y#|PvH6PL`->wm?i4Z0u`Z%8^
zDYBRtIf58rToBg+*j5s4H#Q&%2>TpMqsMar$dbPM&)uQ5&ClFTpp*G*`kf@E26e~+
zcLM<CYa_cU59~7A<Rn*ohm8AyPD{*fndjU58mSTExy4`y>;vd>sP@L+7wWRY@Fut`
z*%Q(C)w5$YpnH;+_Z#7wu`%?6)oPEu?~QA9ViwPjQm01PJMEz~_Ht9OG4u=N3Q_8;
zi}y2D0j5Qe_Xjkm4QcAgFYrHnVRi@d;U56yG9ki?FNxzz6rf)>IwKDOq4a~Q-Z?eu
zC;FPzf+|&jz3xMSI19T?%a#1h_LS_CXnl+&_Q#)BenB5qY*v;e_d*bEeY*3{%ntaM
z4<u(}Hh<9ls(f7K?Lp5QVkad2kBk0&JTdi@EIx5f;Ap6L>|xvk%tep$N=f_!LK;F&
zBG;~x_!*er54KdYCr%<w1;;NsjpP4drRgsA$!!Y!2R7T$(+{Y1X$m0t*Bu8FDnhXb
z(fN$==D)%;K?sod^iD}IDx*o}b@m{Z#m~tB@X<fC@pjsj?Add+EObU`zj65530uY<
z+3H~lb59SnHBWeZ+^ihmK33@K|5Ozn1u~ibZ1toL;ClmFed;!uvxe{Mo`u)mkE&Q=
z+1c+nWapAhKW|pHY_B=wR*KLt`T8P87tiC%nj&SYTH?!|=$M+e#fz8me?JMCnx20X
zM!Ht$=pvU`@iJ1nR>`OdYtB%Pb<xrxtCp-@!T%%u_kUj|##Uk^Mpt6l2~r=rYU%2g
zEFJxSrz?xA!{5{0)p@&;*|qcK8>V9}#_eOLtvQ`4>6}jT0hXS6&l|P8(0*f;ehkA+
zf{UDZTS*GW!Nkm*h*?DdunlWkb0jdUq0zJp_f%&lwq$v?l3bQ~v3NiC0aWfs+wyoA
z8(sLm;O76C3Cy##UUs4OFuMKmhos?nLtGxrT<v%#gq$#nL$m2O0)uf|{bP*n{X??$
zd!Y##GIYTYd?H>hxAf+fbF%%h+5OVCWiM|na8tE#QZQZSHC+ZMS1vh6mm88wR}T0&
z!cScx*Z<u3ezg7>lBDAEJ+UU2s_Eoabvr6lFIj=rCRAI0Tc|)bSEI$)lv-0h09~ec
zu=8`hcdp4EO?FjymgX7W`M#?%=D}UUaQkqXJ@yJ)SrAOTKrEJrAVt<K419laL<oW|
zfImE2k@MRdtSkgLD+D&!1N8NBzfUs-{2k8K#In2JoNI-gNOu9pk3vF!EY<n4q?+al
zM;F*@<o(_+y=RujMJ*@S^tpQ!sB3gMyl2`pM9q_w&3D}4Cy0!~%x`$vUnj;JUJQ|~
zvp7G#ouSe~9G<^F4}4G5+Il{Y<+D2Pj>nJ%(0@S5;${J~boL5{s6g7Z21etOG~OrX
z@ufz~lZC-$Q0$DXv_!i;RK_}<=oWVJYA5In3CxPQyq>TNFw~Zv+}`(8pUoAewmjbV
z;SYJJMo|}L>TXtBt<IzaQZUz_5Dslg3S?PbPfrgpnCkOf-p{}qP<#2D9|V;;u**XY
zE!zQ1nP`B!wg;HHgmtT`89c!P)yKJzh8{mZ;D+e&w+4hhCTYw@e(!FV+0VB>I^Ony
zT;6v&5KR$`GF5DqfmUi8;mYV4L)$vQtFYuzhx1`k{K+8J+Mhj-FJ0lJU*lO+|J0Xp
zveXt^l&BF~Zx9Bgu#mHZmbz-$Kn~LtYEz7*JWT;iMFvv`c1is=Ll~aVh<Qo1iXnC$
z5IfEPmCwTR*`BV7tO}7bKvsILvz+)GV4u_km=M)mi6f$-Ys*lLCl_S2b%9+N*aVyQ
zlPP|bPV<4A>R}Zb@X9>)deznEEKe{+F;TM{q|NL>P{8{6%WnhzhpTh!&Mextb!^+V
zQ?XI8ZQH6?Z=8y4+qPA)ZQHhP_Sxs&5BCqOwpyEQjk(6tM;|>Jl$-o>HDTGGp&tT%
zP#?gLIA^<$dA8R7WkToj`Acb50?}HjWE;)(!yrp1J{`IvI-O8lgs!rc?;Y%yC6W^4
zW^4({b%I|Pi0iz0PCvXB)ivdLA4IVlh8gxWe^gIo=>1OP$D7RS<LaGt=jVm2F}-?T
z$*uPF$5liQXNrP3E^?VI2}w)UAN%ezL=b>IR!xEJ=<1EnyPE;A&JlT7M(x$#j8twM
z;K&dDUeP`T{Aph#<Vb!Ac);>am<!Ly);K|E#8<|ZJmJsL9&d4Hv^>=5zfA9sS*`f(
zuhI$z8Z^baz*==@wc`?3=|EAicN|rWtm|>_yMwYLH}8k|<OqaHGDu}{zTG&S76B6A
z&v3cS^yjdUkcK<5{pGPC1ibF{+T5702QtirKPAwv$Ku@c6pU`YsT2{l6@h_AOi#~1
z1*m-;F#;9l`ygO-s`Fj&`R=9U2(w-reRemrmb3U_XZUwNu2x*D2u6+g5_Ey~B~Uk3
z3+%h^C>zS;Hn;wsJ!X_Y8nE<#0s#<Qtv&r;pf+NUoYvnPQGX+!+zJ3^H}=ZZ@^4-X
zfTa6x7{Q;A0$%U7(?l81x;IBCTh3_M<;U6+O6>R`qP@F|xm=vR&haRVlE9XH;e*6d
zE0bX!mdoaPLWbj?`xu4g1QK1dy?=~-FPm5j{#zEl0Ps}!C(``{XD>tbK7d6VtmP-&
zZt45KB_I1Nuq1(F9%+C;Vofw4q+qqI=&qo~=cvU@nPIguo&EuJq@;F{b3S)l;h4)n
z&$bHQ?KvZe|LO!28uDCW&6D1?oY}|YQvIc9NN^U1wmUr%eMxHBr!3~XHM!^QXH|sy
zTHi#!{lp%K@Wj6)7iA21O2F>IZ22cqj~^i;9A=dD;cbUOwnW0}Wd>ckmi?dcdgTi0
zg?&q4N$P)jg@xbcDEIf<{5^jwcF6F)<>SRbNiswTXast~g)0Xc>l*aDQ4U_J%wTXj
zH~&GpR$x`(r!!d4&x26MDvA(IA<6LwHW~(C=GHso&^Rk;>0K7Dw*wsUL?5K)x9nj<
zJ?O17!|hBm-{PcBm)IZCMOJW-9ldV)?Mb;GJH<NeT<_D&S9eDfkTw!{wOocy&Xq{$
zoiEU~y-oI;|1zB`WAEg|+M(Qt<edi(=#cjcwFj&MWvLNo#0q>~pM`$;e^<TE7;~fN
z#~odadhK#Z;H^<akO62`hI-9K%tktE>@+5M9sE9d8IKp(e((59(HeSSB5})T)c6D?
z#1Fa`d{CUTxiWe1&RoH4z#eOppE#G?+fn*;!UOwnps39(qxh+k2#j#iZuTk`_ULEB
zNmoljS0+#<ud1LJHYk^P=mam>ggOY*1*T9222_NB*e;6AZ~zvITt8pH5j=W@MpdaT
z&Dy)kYB1rolTqWwdJi35u}@+49%n#<?UID~gv7wSq(ns!b8gT|Ai2jALuIG?wwAHp
zo;KbEVV;J>0Z)O`0&kFi4s?h5U;>{Pf(9~mEjry?yh!m{x;Wi$=9x(CjyJl9)y}WC
zGH(stpDFx6=K!0yV<$%jM)V`WFQL%~2`zPMQTE2BdULYl{h;oMkgJIx1%Ym~mND+7
z`0B^I;3qF66<zK<nP@r{S&^ET_=)jru)-$RZYHBZjk|TfL<psHrw3?%!+`x^J4m<b
z1xbtmh6R`}uAb#%;FcWOL$Rv05a$MfpV52cqGHe)&H~!EKz_qwlnR)w1-M-B1s=QB
zxP!`ZvFt=4dKVFp5Po|-B6)mFPqirKc-=RL?{7XC7J`{pf4(`wM&%a#sO@Cr8rF?{
zGALgoULccadb7HLFc%?S{n5hx1@?CPkOYTBdqP{#G#PNNQNdk2?li6gd<8Lb?#l)m
zhk@;o2!JbW$VVKtQn&D$6n#wTErtLHfkaAwazRfQ5Pp>%C?qTVkE=^EeYqo4@I;Th
zy0?a^+p;unHc|&5yRv>Q+Xj#W9V8-h`Y9S-L>^nKGOz8zD8PxYP{IY%R>q7WooKoV
zdl3He^FM83V3LcI+Ddufvki#C!VRfW)_!0rE&y?Yye;@6+G~GX@cb}?^fpsGGP1mN
zphMSUvzzYN{QF8<6!K51!a%yFg!Do#Xk?H8Y-{c+f<0Z2RLX2_d9KSlh^fFaJ)Q&M
z>q}3X%b^gcbK@6pwyh9u9wkScTuS<z=Q38S=|gXPi}}t`TJ>vn38!;^5DYHaI%fFb
z5Wq}2gpop}6Y+Vm(o<JDAhtkD2cjuAp<7B@;cF|EveC_?M|E_=9~8Tz9K1`YCD+tM
zs3HKxwgc*{mjWBYr8(IFSOQh0D_XgOf^$`EqrA$1&3LSeMW=(2oR{BCq4qqsN9L*F
zovomScGRc%`0v3$kM$-F9AyRP{GE-yC;-KnxmX8;DTBC6%C!MxARx}8IytowrwB4t
z#VQVh2&e*gVDUbOT>bb6oB{M8K2rFKxL{?%FLk$j5_*+*#o6bGOs|x>J1CCkCToqD
z!O$S4zl8>avFmV#QI_&pyl2rtFe?|)#p9-*CjRI>(K+C-;}0hR$$O@xcIH9w9$;Wl
z5+&~OMTykUCRu%;Pp6<#y6(xoHX2!g@A$?a5q}1<BS}PGHVn~7jpm}xuMCx_l3L|O
zqCHq?ww4HvL|lYTM|0tFuf6DE^CNRn*V<J`S8BD`5{&ii*it1v+NMUzs<}(dG((bX
z-C770hfa(K3Fg6UEl#<3d6fE3G5|U1t<gfNw)k-*Q>Z*ooMH*r{V#pR7t<3yxTdn}
zDj}w`>-LViCD+67;QMo#XCWn|LfI<e@=GQ2ehp)?{wD>J>1THhs)^7`x%|^x#JTS@
z>loh0Ui&u7YJ5zGhKuUlV*E9o)*Yjui=X^#Cf}FbTc?oaygB1%j$~nr9ALa*_#0+y
zHX3yTz8P6~B0z*>>0&@TXS(mY?D!9G_slH3-=ouK0UgP1F?>&F_*(7meU(m;S9iq(
z`76WxZQv}Nmn5!O7wIJV;}>dU%mGYY+rJ|9d=DM8<#;z(;^aOj@pRbgVi<!5*<Agm
z&(OY?ya6OgIMU1ki{f*sGk|B2;knb^>FEDfyCv-lNSIBGVD5lOC^h@K6fWUYhGqfb
z<ICXn?Nq1Zwf(3dn`*LpIx?4=TE$yejLxa|GzG}*>1YO-*#jY`DAT*wBao_(gKFF?
zgx4b@1t|{9sWtCE#I^vOgWv8KE7;=ib<VJNNSo_d)WXV?(|}GW+4+;wDOZ{ToxqV1
zM~*8|y)CD7+02&e`u9FDBQOXl3p}W@-h%I_^Rokzi;*zHtnSi<(;?v)l?Sy%?xbA<
zDYV*@7p$7%@?0h;9g--S1Za|CWZKMTjSW$0$+ZyqKZyLEc0%(;NVtCwwzOz~NEepC
z5~rXijFkt%wE>~LtG})mgSM*4#CdA;r0*Q@?bktlWXX-iBgc|D$Ic-)ay<7?{B~iT
z{iiR%QWuB`N}<u(NZ1-*BN+$om3ouoLKx9))~Ku@v8z9i<9T_X6&$VOC_`G+QH4YP
zLOfdy0BaN~ScFf4hlThkDvL*+|5c(Ks}^%Eg|#Af-vmIZF<^8tw>M6gmZs+AFIT{b
z%V)>=KXroO=v6BbwR&2?f#61`yqh6ebv(s5EwY-FK8!OVp5sJ%2B89Y-xDM<f^x5Y
zK>3zc9h-4LmQ=!;2?U8~DH`2jksS_9nb=AsgD}uu-*-T+om?!=J<g>+-#TxBC3a)a
za=__L?EvEr^BxSN1%D91+aMg*u&+i{2u{8Q0m1&<3S$0~z&w((6_El44>U+e>Li(C
z2D8FL=|k@`EEx8|LfSrg9ta<&M{$OK+P+RwDnd6g`Qgu!XB<+&0Z%W8@vzB_Yngnn
zVQ(_L+jAw`jMEBU*wVqC*HHro_?)duUfMm(v4Gji7HTH8MkNzrV=}H>LkRSaTQ7MM
zv0zfzih=kFC6f7aTUutEnv=O)ph5u_DeO*OY&0ENG_3X}ZCKCt>V4qIGjYb+DN+Qf
zYAH#UX?XHZEnYiKSrJ;$lz}4iMp`KSRZthZ7;Zjhv45UYqS@SqK5V0FkSs&FsdCpw
z<pAlKzJMXeW0=jZ#l#q9i)6#H72lRmUSj#J*CYi{^@A+^Lqy#;`xiBBY)2rwHKxPX
zJ5aOygn#|{^NPFg=AZ}gQ08YdA8Hz8RAECMeD9h|k;ACh7G3udoAquBQLR@>-JJKF
z(lzc;PY3V$&SW)240*N%jMi2zK1DRS(|`mXbpLX01oVUqSj!f+p<2>R*aN-+@;Ol<
z4eYcHLl~L;KtB!X5&YtZUIJAQD3CgT#04Vt8(Zsbx2yHKKLe54p}eEB&sM_rEoka;
z3A8I{gOpa-$Sta~{FO_Opa2+NEh-}CbiD-H8BS+dsdPPRhv?|{1&pCU)6*e&SU|}P
zr%eWoJE&?pMXvJ%5q!ovvl3_~qvT5)BB~@D5YL2QmM|^8!n5EQ8ic#cutKq(jGIv3
z-hD752Y!>GLAUc&)hdNA(ok(gzSsCu=(jkuw)XdiNM(kn&P-5YYKci2mDbyS3BJ}S
zOQCiuN$M|+!k6wH8qCJK>-GS;-+)lH-st>IZwC1ga&={LcbDqs<Q2KZmf``DK+)K1
z*lH&smiZ>|PBmU5O{t->r2Y4%8u#b)CD1Ut7!lHd$gq$Mi^M2rZ$Z&<=sFlPV$ld5
zfE$gL$DNzhY`qmD{~D7fubme=4j%P^vnI4Q8>R30zK%wPZQp{rtFzSQEZ~s&Bq!NK
z{xIS>p`9g#&szBLE}E6XRMhjJ58M*+G{P#YZc9}U9r?s$X=}(+o#|sLj|y8wDJho7
zvne>lei5xkB5j1Pb%q)>+H|zs_5h~a_VRtohv#SB-0?j2`mx%JIj;rRQ{C25<~od9
zDq5vMk(@Vz!WvB#JSUSa901f?Oal*R5*#3?#xC`HNhG~aQn@aG9#IE)px{MpmfB%4
zND3M;$7`h3WhCLwrG_H$iWRhDQDSz(vZz)hbhdv+*zZZJcP_EkJx69NL81>yUp_yO
zrBtHH2+YD9Wy<-1#_MCfmPbrww10Jf+h3PQBbYxuG+qo#oLm>a3ea{W9I+LnRkK<p
z8&;06E2O-QwPR^r<yOsQj?s>=PJgAvR3D4`)R21{&xQ#k@vFGeIWFB$H8TW~T)hZP
zLwUAgDvI3FYsb(ZJAs~&ILUuJ0ihGeUopJ+(%Ij5spP8QOuVLc?>Hgw=WCvu_~Rp~
zM^DgFN%3<tjr-ohlI}GD$!9{oZIJkcfMFwDSkmM&T%d5ESda{UsMZEo(BWP+CxrG8
z033AsO%DCOLV1o`|1=KCg~VQM(_U1#Py19muntBX14^*003l(gQ5M5YgtqxoJ+mKM
z%vVg$QEKTZb@phY1YAbPiNJ-E46jP8`&)Bw)kk)5{_tLtWjT|nuOpRf-Va5|9Ql4_
zQrdoiVFe~1_ytT-s@#i`EWvemN(9zdz)8e8K}A&?Sw#~wZWN3T!o1GjiYm|Z&WdDA
zsKa1H%;U0FUrUwGcANe1Q3!Yo!mC<B4<)Kpdj_J}2$FF?P1S;uk1hETTKR!)k01Z)
z8Eo{7WEK#xsT1@B>anYbV(WIh)mDYwB5&|x^(D4l`!u<S^HpB%Ql8w0Lrn2Kpcfu-
zgXw2+!2{J$Z(sa{Scc7;7dRGGo5B=<Pt_3S%Y^;nHsja8+q<&;R5+&CUqcaMHhhEL
z8owl=_<cBTA{GvN3~_8{6_xHdHAOU_I`&3H2FbKv#Xd(XyqA}xVUZ!L1p2*k+Mf4!
zv#ZXmiO)-Zn&ojh#w;7W`h<x(fFu-WP6Ix--;xKUe}~c2W2lBAcgGV9M;BGXmS5b>
ze-c~+-RDUa4RpH^SVS_V(@%dks6`}0Owx`~Epl9dlBiU62!bLOwu2VppqR<<Y~W>C
zW``3l`H`Yg=%&;{QP>ML+5<g#pi0Q)X+Oiygm#WG6AC>wuBtDLuRx--0&Yq#OJl|B
zJ8TsWLdQU<;U7+ozE~-M7%|vhZq}gHQF9bxrwqJVippN-aPv79D;K#u=ZUPFBHrr<
zAU<_suMbFosao$JfvNmbbDcvSfx^K-&hU89g!EREwe1*zg4JQ~Vx23PcJfks9`ACd
zk;7W)yOUkHww9xU2oHc(0OtkA4rR=xuF{&Ay42rY2+j+Bh90L{6qb9c6FDlzG&N%5
z@XEkZK4kDgebBI!$Rj-!3?|^{?)#xGPRQjH{fOreqD687$#N-#vMUhh@t;QAR^SCo
z3(d_{@JzwIBmNjLI(tlsC<ybte2G{HybU-9ef?l6+Wu2tYeFIC0HiiDQXxK8iRK0(
z-D}^ei_0-cxuN`_=vM<BNSDDVHXW5J!Bw@n;@V6Zev&qkJ$z{PIo?4yT7BnToqQ+Q
zGa<31U|0gp0JL<lGbJI`DpUm?@!H5qcvw69I~$Nzc~q$lq%QkM#O^&=M_<H)O=J<6
zs0A$$y|>2;7QoXOU^~Y}M3Iu__0S$}dJRt}^L#Ff{bIGe357&ORJhllejZYswqdtM
zem4e%FqN)I7!2_kwhReXoPByj86<)A4@=y(MJ3scG&PSk`f$J|^COU!AH&E3@PnTt
z+Oi&^-+&LG-0np!U-PvH&41xpi_Z_-amS!QXjw96JwqT6aO!?#Xuz!l%dwNKJrA3B
zBYl?$eoOqs`#4wAbNBo|EKHC+tM1tdvhQKn&%Rk85!}MK*ECt<gO66$xTV(F8Cn+~
z!Pju081R;~EZ5^305>D?0NrSlES`2E>C&b)TdQ8_aKSB2KFaK>pl03F6=z>V!N%dG
zOG~)ysSB{qgOD53QPPQ3g?or^=neU-unIF+HarsoU*<<Jt#wplK=)o>d(L`ywXxH1
z_^JGz)z`y8TXs}-#t4sWqPJyQTlQ5(3b`5O2O1d?1#KW8NC`@UvsGA)O!)Dv(!i4M
zW%SX*N#ifhn}s4ynAPY8gk`cnhXhfJU@gf;4Ull*Oc;3VN|lHojLM@l)9trP`lv#5
zrZrc++q9cgou2r2A}VR$aOxEGCLWqduURI}FKnwcG$n3ftTdDvW}dCx0Ih3h1SbVe
zDKuJTJx6Xi+Bt3@tFnQqa~SZTr)5u_+bG3}_ZKCRFSu^>=5Vz3z^WXK#h}cVTyfFR
z25_N3m3!b*&e%EzKFPX_eh}QhJ4W)0T{e2JuUtLyU1kpPUmN^hqy#esrk%{_CeJa1
z^xdidT%bP{*xHby)4)+3$=`x!dJekjNh6}w{lkQ0HHJY<gg3mqL1Gr!W8fvTbciJQ
zzZh4x#g=-0(Z<=YmGv)9zD68E$7aMjjsR!5p3&J=&9)!M&?liUBsTx1uHROWm-uyv
z!!@XhU{2^J+J7nO(%OSfE2BS1<xH$#Yrs@-sBg_;j(*jsj=-|QWy0}Ro2|*7Vs!oN
z_Nq->BNTp@+cd`LwNQnO7`SStq!uhTjaBuCP5_50SLl8&T!&JA%^XHzPYXcl@1t$L
zL_zyPT%h|Kc3HgotU+#0W*gEzOi^>@N^L*aqapQfui8Q;3uW?_wAJ7Pe`8s$>^v)Q
zlR1coft~uz+02o`+p`ISy*f$CLNqA};y1&D1P;Dhp84Mdwvk^Z=*KY!bit`Sq%LEc
zaIiXecuOc_K^mSrGGVNOl7#>Za@woc>0fDXQs;2VS8YTwIT@HAG;iMcJ~<RY-n|fY
zM{CGj<V)jCJ~24Zt!4h8cl&^T!^om@!1t^N)DQo44Ao)}c{rUgnPih_qFJ_1)MX&z
zE9x8>N4wpVUKCw>I4+^oE1vevqm}TMgD`hL9voTnzMM17m&_wD1pw?DFPex*T`sJJ
z>=A0`aNV*0;`9qY2W-4{u>3}s|FY8oyPBj>ES$Na&**&P+vPaI5^uF_KNz=dxi&VQ
zQ|+*`vIX&`m@HB5VNdk`j880rzI59>c4_I+I|g~^piy@?5m<jcR`lmE(xAi?61ad}
zTEIq2;{Md|OjVM4cL7ir{insdWMOh_yxZeb+es&*PC3AnYM$=>H($<Rvxe}CDUBU8
z;gp3bjRF*vqq23?QL4;~E$;_=R87h`qmmIW-#STy|F$d}QuTJ#zL!HA;mN9ou#|&q
zyHHFv9CQ)Ifuh`ql)ir+U9J7VZfHF+J9Rrn$>YUq8ZCWr2T+s?G_;n`ZlW1$a4Of_
z!*LzrON^*K_-*Dv=npJoj8k3o5j|@wWKL)228HjE2x(|rOHDIg&B)!g3Dh{+ZhIbw
zn&XoM$=L)f!Pk5X8s7A?T_2qLGkcJ0L{aEA_txQ?oj6trq6MKgBRJpxtTnFgGf|1p
zzcItHd!a4m0!S9b^(RF10tZs`Q(rR+=9V61Z6+Hu0KW<2K5#TaUOIbJuvfuQk>#e?
zbwHHOeXq$d4Gar$Zr45Z0DjqZcAQG2C0t|m@=$I|{=iX>o<5&^ZdUA}LBE~afEp_?
zB|HtN8vCex*0|_=9?1TUbsO88@<K`l86FD}mz_~Bz&tyyU@E5<h*dziAF7QU)(I{G
zIB5UC57p1MZ_p|cYLsww$JoNn%A0D8DPj5AJCjl=<~s|-$sYAHfeleDBUaI4>|tOB
zQ(pb9L)R;Udljk@{5M0e3f$1o4fpu<^(PSo-zI$o{!nb+_|aT@U-?+5{e#ceyDn&-
z&`<RYz@fihdDE2u85w<ZLnCWES)zL_OF8IYU*-1a0%_}g7ep`jL52O4dsu1(hi9zH
z;nkm(p6<tE!!2F|lRCI04$s*OJi_VtPu3R1h2^`yZLrfL0wsllgEy=Sp6KhA$LKO3
z;Sybwr6VS5pVpCfvhO4e<jpUe@pD()_ahhpU>k?#X1lUj#7o%2n=+R%WKNao`i%#R
z7iFOO`W|@9ltZ4Cdnv*1iP3WO=-99*k(jPRD^@lv4yIjTgR~`UXk=<_%33XJ5A5UN
zT<EmBgrwnmU!2rEkcr0Kb-_J=^_;&YN$CRT>M*>#&fVS|WMk*E>QYDI(!>Oe!VTIF
zm`!4|{3EG?`aB=r(JM1h-ZnKw-sBPM+>vgG^H7iNXTK?hn2O8YS01b^_BivQnJ-%2
zJY{g24SV-eW-C<vJLkIWdNp&-r|HSJDe2{$maS1=e^k{R2LGa5TUaVVB{qnqIA2~c
z4KI-OaU&X&;#oTx{`2=*u;|5FaE-$$fIsD6_75U<6M_r->Q>GvufqT+$HNBFNuKMw
zgBE4PwP9pO?Y*JO$CAI$H+m?K^6tg`c6HC7TSlzKbsFik(y_a8Ed`90s~OhDV>H3r
zVnkzM2NilE)Hw)vln8MrXLbLr#Ji@KdJh9y`bC#iBWKho&tIzg)9ITg>h=q5zzK@}
z`7X;uykQ1vU()uUUp6IIjY8WO@HHOfN7$l<jC_Y(^RHs_K|7$@ul~%rI?L5{_xK9?
zkV9CpCsBzl(?wu@^kF|y!d;St<hqF#A5<A&e%n<`0mA^tt4+9$=zoa}Y}mU*Xs9DC
zb8^FJX)kYuGh^(HnM^zTS>D#>0Iam;6sEV4bqW>>AkbfcJdt#|Fmd6@ufJklnSuXW
zw+4@-k1=Pm90gNAe+l<HFpHH&a~4!EZJ=05e4p-o=Loc@(M?jcg0zfNu(u^O+uQ{M
zwEB~G)?Z;e&r+0fez@STH*1CdY2TY?TGUodEsE4B1!dtppoFfs($jlH04gCws+kXR
zaK{Yp<h6HHMC1!MU2yHzN;m>iS1#!0^U25k+VuW6P|qzo&kaPb+K|u3we?SelX~ym
zJ)CK?`KH~v=0MzIewATc2v-L``v|HV>s+Vl?kz?eb|WmHW25p`mv|)Z#3O@U+wg50
zu;8%kW`$+&30UOMc|Rlt)H2a8#%Z+HU8;*wAq0rm?!B&?O>ibg#EhkGOO{9X@t@Du
zluUbhrz{-dX@`H$h2w>NyN*5>55&U=raxWY<v;%h2l7B(8ReXu&{(**woWaDps9(Q
ze8AzKHz)jV8;fB4PLa(@`v{8JHEC>k4Kqu68Fez50WOow<RxMREGneoQB$=aax}0`
zubbu?gp?2VVU>;qPA76oz&e3#d8vu?H4?Rq7b?n8vqKurZCewle!88K*FjK##ebNw
ztNo;KmV^=F^OFERDw^i@0a+#@zzetEtM}XK1G=mUqz=o8*E=SA4R1~scOGE+GwBvM
z#v6&W()c$C$8vOl(O64(`!wPKsxw35VCwjl9mn~%iyBM<)M2r8-uU`?%i9oaaU9E=
zl@eBZVcN&boS@rPo`HFq4F(P=L-FJ{ZKGj<f1G5g2ZmQ^IlQk;ork}3)EzMO>{z$h
z5J9f%WCYKf2$!YjH*Ix~1F&>uFIDwep;iUDmbyJuJHIOcXc5}0H+#Qeu`UM>#k*(g
z_rEjw5##hqy-V9{UgdL{+i}aBp-~T-frx_qM8(p&H-eI&^+E^q?8cl5B*l4(Y3((v
z>K)FbiWi+01#aYy*#!7B--k;mmr4iqd<Xc6CpiI8sI74_d`}+>ui$^fiC+KdD9ZG}
zd@i)zyN)sfq7)Eonesi*!*k-t<*Y%1XTx=pPD13YKgq1RjuvZZJQ(<ueIFB>ef7C*
zUyz~%5zjODpo*KZcJs)<iEDmqw54_-fWzF<Eu4|IMzW~=e!F}sUk)Qr!P{Pcl-9cj
zpWjjk8@&eE!+FFHYYD*o8}84yyLeqThCWliO8D&#SjR;nz}Lz+ZTXPPFQ`wyL)VBj
zf-Z_S;_x-BadCl!6w_`x#_wAyzjdTcI^S|EA)Qu$7zYJcLuWoT*{0kiroq#^77I3x
z!3zz7ul0Ax=<-@JzvXw32rarJ+4FhiHYd^vkt3N)ePIs0Qj0TkJ;-!~;|P0#AXles
zlHHL3l;TQd?uKr2QrQ)NktJgNFNV~><?x@1oku|g0y`0#uANL12>rn#g=xoY@%36B
z8=dLURp~}G`fri0DKNMG+$~~R*;u4Td`0=>KD&kbX~BD|3ftFH-fo@MSa!`i_yknx
z@I5=*<lFcVw3_i@iJEQMVR|2-Ii7z2uADmyyyRWDWV_yC%Eot|jsLbaS(Df3rCDY)
zLj5Z_J4@j50Lr5r8V}B{9dq)!Zjx}2>AZutRxlmcp1T~gthd09cExT1Rz0%UAI`Jv
z@|3JI)77)0&m~vAc5h2OJ@0#zW<HTK_3voZdbHj4=e&cEF-H)uo$QWJC}dFpKB4n$
z$ysOglhFZ(cF0J{9W|@gwVu;2XJ0+Svpnrbv4onVavTBsUql)(+qgG+?N^?cr%c$8
z7q7wFZFgrEO_*1N>v}OknbT}n2aMTXJ$z<-Pr&uDj;g6b1N=vam3#kOSy?9<PPPeO
zByS_`Nsf%?cazg)1?k!DY2;u5e427v+()=IFMQi3Sy<tGpv~>E;U>r8+un!rX7k)G
zUMyOOf$#=hE*!KG_dxX1mzU#Hh~$~@hUSc9f613t8W2AY#{uR9Y2L|BW<i!ZZaM6)
z2o+Z^;{4*4g9!PJc!}}8JLJk&2Df}8KNXhEt+v53+;P7dMu2BqJ2?jMTs@aXQgB&R
zrEt@<^!Fe6AVfm_vI5l*PF{laPDYs{3#6&W_^M-7cjeNVxU+7i6sj%id)+1Ey^ncj
z@jLbsj8Ripd|1`0C6b3<#qh}KTrSxvpj8m39oBU=F0Q=y7v$gsdEXz{Goo763L+CH
zEu(#tdvmE^H5}BHhbeG?hr5lo!+G3sE9kS8SRxFQW2Bo(>J@Dz8f1H=-?VR$;V^vj
zEt9~vShwko`4{2hc8qV^*H?c@#(IT-L`HUFt$ku>rPQK&{EOGrZ?z#Y!=*DkEpr;n
zjiL2$3Uv7~<#}<LGkRAx^y#(S-~?N4%0x$?G3>Yps^Zbg)C3}cRdFw78hCXb86WdB
zxfG4t8FNJht)NNtc`q$Uk#NR|=Zu9nO^!J5iZZWsKj}aU<qy3dMY(48Cw{d}CKl%L
zEp6R3$P;IKxK9VU4=)rtvjT>}ZpEW#+}9A2p?eh!FqNF4e@P{gFPkX-Qj$6RZ7!Bf
zR91B1?sA+a^J@vvesV}=tlh$PrjzHFkk$SMX3TAlnXxfDqiVZ{uvg5p<{0RDG}=Ld
z;*fkQgkyBdXHix!BS1x-wgo8=r&GBl!a6#*mI1Y*L)okb{&GDjb8cSAD${ga#5X{%
zGm^{XJ+O(e-ivxI(e=kqZH+zMhrKalaX$T*Hty(X?Q932kvi`(|9`Ok?pAq~wX&J@
zOY?w&(v)Pn><$ti`2cHD;>YY-VWuj4=Dk}o%4G-K{EcV}b}_ciFPW784+<-rZAU<N
zZ7S(-b!G1<H|cnNR8<rnrqg6&DoAFaU^)W(K>$k+Qvt`v6EL6PsTaC3&;z76nhVy%
z*Z@oZR)35kte4yTAmwaXr1+*1f4%F;kTC<Xo}w2e^7j!+Dfe@nU&W@+MT{!p(m_Ce
zIr++q?gGZH8MC~so5L`J(m+(lBg{3d%XQg>2ut=p+4Ja+sTIPNJQjX~FBPF~B}pRq
ziE7b1An*PM@fITgtjMY5B%9pF(9A%xE`06Yu_`A@k21J`kWjS31%uHMdHbKyiQ@LW
z1f)e=K#9r$=0cwz(o3=dHhv^GAmz+}_m!t8u<S>%UqdpZ6ivKNwRGs6!M7u~U##Mf
zVS!z1t5qWm1lL%dO=}WQ5#IqBZ-aSKn!c-6;y7yu$WmD{*Mn8@n%W<ttSP+J7cWUj
z4p?+m#bZ2Zkx%}`6KAs~(@|o@km*cBi>>Sf{Nr4(%)fL=r{c+?7|Z)nL|&Sku6dp>
zS2k*QmWa2hEuW45qm|U8FM<u0Sc%p(!8B}`RON3_5mpf71sL%KBu2uR(-$VzrVCGM
z23tB3!Hd7jfh)DvBo#xK@}Z7^zRMlr<jRJx`J_opz0#5vzsOo<aABtNCgwwMQ=0+2
z792VgZLdbHPbpwn^d6w6yBAC(yf!|*tYm$g8K|{hrmdA4r*oz}#l=&xJy+V9sn?t-
z{I1G-W&=iQ7y{0c_0E*t=G$03kqdn!x*TgYJ(K_BD?Gma)8xiz?VS~EbS80>1;@W#
z&;3zR{Isr5do}cPm8i@KkceXVh}Z$I&xew*y6{Bu#D&WPv(5PLEAZNa!smA;3JyuI
zXAA6Tg@e1m_jAbn*zFffT*lglFF^!Qj(EawDczJ4%0bG1E+*-3dKdCWJi@us0yP{;
zDryw=S0^wBg0Q>q5favt6R^%oSiq{Lvz^w@l(S_erl!}y%wub1I*RTP5Z3_n8nPf$
z4|sdCw1$-I%XB^TL&7hm9p-tscs2_W$S)*bG*Y+01JcPqZ_KUxfG}pf%$IfRlbs6=
zC3n9Xw)0yS8mgV@P;di=bj;`LVV1*OF;WZH+nFI9@j<My?GP`}g8|g4YEpm<<Y&Re
z`4Hq&?LQy8Sb&8>&8xfWC>ub91vyGU*FMD*XosWjbsm4vx?t1$h(PZ1dYHtGTvRoC
zLQnr;3vHmwTafv6H067c&PriD8fS5hGi|8V^W{m?#xma~7UZ(4=&;HpfBX;67Uaii
ze|iaO&Yd}j&%y&vyVSCdLh!;6NwAe2fY6eP?L~-f^GeD|>1$wH-wF_UTt(c~Wor`{
z^69AjRWM^Nn5DXSV~z#%`sbLzZro;6f+osr|53_5s+kpk=3G$fI{n|`L!)|xAtcAc
ziir<Zf*y_IS>r(#;bVg=fYE9|>6wmh>gkydwstaV5u$UH-KcAgiRE+;UlA8AlZ4?<
zH-D%j(}v|c&}gQ-P8&dDqbo4!=%VYGDKAgB7Vi()tQ+#tO7=^-_%N;J%f@<%InVst
z)1XqewDea;62`qCjl?wVwe+nx^6(Y-xA>{4z}0N8@Rm)~y0{Nv0P5OHTf(V2X0n|-
z#qfS$gl7DN|3gglTSJkimGnZF{T$u&rTas78|%3@<zJm+kT5_oUbo0S8Uz_c+;%N=
z0c`5QX7dhru*Uh<)o<<`qsCF>!*(>zfo__pi3`%F!`ILB82-hB0HPZ^YKS|F(b%07
z4Y-nP_{qM7g$fm}$MK$7r;JSRF+%LTjl{mWKh#V*Sz0V=^kb*hKmXCcr5wsDagcl^
zR$NrI+N;a@I|Tu%k+#XOy&Am>og})wyk$DQ3B}EwL<{zs3_zkCdZQUqO}5x}-2atV
zh?a@uIG&zOXb>L&xjmTapIl(CxCbB=<Dg+eipnK=0Ul|1ZBY};aSl7?rRRZjmvYa{
zl?mLdD*obGl}bnZ>gZ2IrxNG$vc%s@-s34moZz<r;n;NpcfO!jX%I#st_X0a(@i_O
z)VvK#|9QWKXynt|LeN9aL40gU+AI^89p(#qb8)prf_k@dd@R+h{Qa=;xk8V?f=FB>
ztRB^_TmAP2{%||y2*AyAGj$1TIEJLC{<Rt5o~*r+=d8Sxu_<k<+$nQH{vE`4VzEVR
z8pbk!a&1To`_6diV7OX%4QbKqg=S!@o^nfzQ^}qw+Km-~v~TBdG<U~J#~^r1OYllx
z$6z)gb@*sIU86p@8j9vmdVmF+({rbahdTsgD6BRz9eD3CVnxr)Sqz4k2*OH;P5?D*
zCui;`olzpO^B)$sacI)rqNHA+9pz>fLj!)m+iGpmoQ~iIHSUMn^kE+85d7ytUPJH-
z#BY2Tn}&{k@JD2wE-jDbO@=ueyWkNqdJz+98+qgVA?a<;%jqMC;=v;v)WX9f4pijg
z%Kc%NQe;>0euV3-DBW;jlozvbF(Ra?JOwLX1Dv=vyEUa1Ufyy>63m|QTulTj_t0v<
zFBy$UJ`%Cbi&f()D@8oJ><_X{H>lmI><=WZ<|?O<0?gwEr~QEa+6eEr%`OiL;ZdFy
zJeZg%*?&>Q3}YIW*={LyzIhT`WRg-D`Tp2&y)OUN3yfsmpU>eiXJ4q-R!4Dm?|3L9
zqWi16gRBg{Dwc>_?02o>BQkop0eQF8apLkw6MzTqv3gn-yQc+tnW=F&WggG5-+V{v
z{BT8(f*TZrEcYdC(hx#$G4=GdeF-dV91KLynXv9F8|lnAM41;v(_dsWL`LWW(c0p3
zZ0MB?AHQ_{KX#PCHz1k4#p*FMe@i$5^Fzuawng?Mz)EEGB}(}hpKag}0`~e7m6jiH
z&#ZL6^Y_Xvlk+xc2Y4;4hF@4mP||XAF9=V(zE5$x<aqf1mMSIvjSOWmr-`LHpze-A
z(5%YvhKxxL{KEH^A}XpR;8PjDgW(1@_b|=&lOC}++%4R+d8~w4nwu51I|=Db5bVm(
zRfUm^sZ6E5N!C%ogJy_pO~BfOvtmAxB@3OioYA^U5;HW`?hE|CQXy;mrKzl>4PE%J
z;IB~)B!jzHdiOzttWC0!^ZvjCws8$6Z!WE4h<T-eX9vUsP6RHo2my*2Wg2Nw|A&Tw
zb~>7Urm9>R3z{w49yqO|YmfPa=uNDjOmsI=@4skfirFBV6NnyG0u}sbO!c{j*X9f6
z{~FmBJ1$n)&W~3cGhOI1YS4TY5u89YijH$P;XgJahK@(}2vT3}z3l>b-j!JksigQs
z1pwU2(Zx$Rh!ampnp)AiOH7&Oi*pUD`^%J?r|ikjryV;bf8!)WGCamqP3Ktv#mi^Y
zHEPP2$2hQ8l+#`7M|D#L7vctQR2|0>9+)}a2Mc29Ev?9OKi8J>#_2i!)`0}FEM=<r
z{792L_3uARCuQMET=kVyzYcRR(#e;r!;4nLOyIk!!O_%QV=>n>V8n3ij|oWQq@<MZ
z<Vtf5gg7x3Zg$pmsLSnX6h5CR&vHh2YS^b8E_)K0K-xkh^#grfL_0Z9r4Y*I27!$u
zCAzDne&4zzjBb$t0Iqeq_i#(qe}EA)*US<<Gs7US21N)gzORaXqDS|;a*_P}jaM9j
z<82jG&VRhfOG~@?=Lr&NzU|!c*VegqMzKl;u$bV%Ei(Kwrn(A2zc7PL5Ry+l%s}h-
zxCa<K$Ww|LvVs?CjOV3dZ6x;u%y?TZA*82^{2->Puqz+{hyU=WKk(x5`45%WB&M5G
zD<>)&nqiI}_h|4?q`eS?v8(K0Ya{+OqaoM$MgJyT0ufzoYm#;QTjVyb9zIL<eRgNA
zsy%nTVH@BsV>bZx2t^q$@SfnF``VFkghDu2mcAato{NNtDLK&VVLaPrY$|;;h;m9o
zmZQTtMO9`6XeKfa8OAgN>)q*Yva08<C;t6B``SX5T2n?eI)>bNG)_%9Nz`DoXbsZU
zGGZNCM`1J9Y<bB3g`bjLt^O<x(&K9zsX3U~r<T#lUZ5&yjaVa`sT0(mZd+^^e!^!g
zI~sTbdb-JtCu@y@$(X?%ib(?FEj<aVm|&~Ud)6fgDEeTMlY|l0P1soG?L3)TToDM=
zPi)K;7!z{Z!&IuoJZHmZzku0BBB!Mol2S%)h%d(Bet1|k5m<SFo_EJN0R5U^+WMCv
zAOI>J8Bz5UrOE)uLi&DN|HPTCI4sUF<z*|fk^J0#)au*y(XNqjsU_wJ6teyg*h1@?
z>uOdTpbtQRVjAEduR`pDWqqYMXVCA3qBQRI^Z#=TH4$6PY7(-Ea(*R?F4M%GJGQ}u
zywO|$y%}dze;gMBVHXm}glx)K80M4;RiP_A_x2ppDjgcO(}sU3-K81giLFCPpp$~~
zU_*x;{97XBtL>sa(SXW;t2Al6`W$&-@od}*K#zzkhR@99$W1LxjtRS>?RsBJG=Y9F
zgU^8}s1E})HX`E($EDBcA403dLr~;A!L)>s|JvYI=4v-#aG4G>*1OW2yRa{Vk>$l4
z*P@M+@|S3ym0&r5(M&rjR*9#&OobCBDOv}}K!z(_7dT*A{t|jZxxh8kxWrjU2}$w;
zQ1Z2!mt$c2{~ngVusZ?gKu8gPCrI>8?Okwv7wBO8@65m-nVAmcg2-X!Ncvv9N2O*<
z;H5&=WMNxwDh@_2pkcTNw8NklhOL7`$%)-u(2v2gGHL)44<ax#xM6s^x+vz`rz+|S
zA8TJRxZyav!r0f2?VL?fcmp7<&L{AGGdsBYYa5RSea#}}5hgm@qt|TH(@mxu&(e2E
zVxggvfO=o7xZoGo5L1bx#(PT%C7ObSM-s22{f&<KZ!$$^O2?%d5ns7q=3`6HT~p9U
z{T3R#K3-hHjeV>xF|%rS3(J&*^0x}-ht7vNg(Ugj8cb0U$kMwFi`fY)dn5qpV|X&b
z;a>y8>ipchoAHKjl+Bn;SmTx(orrx-3GYILq8O8tPGwi(d1Z)Gc#SIJCegb3N4wIU
z!7Kj?MJz)%({O~9lI`e6stv#-kRewbmf&i6OJ=O#xlF@m&dwE~PIA400-C;55<)3w
zU>osckuc8)7hF?U@(-k}T|xl@7hNm@(I&mP0Bx>f3tQ#UClI=HR4fPEvab}klY*vp
zQ)mOd(mB4i{;~n+jEu5m#8YawDYY2}p8;YdwC?GSGPM>ksc}MFkvKQdYY#`FvIbe4
zMQi$#SKGuKgnYOXj7U(bO_j0M+t%?Mv&LregM5#^rr+kDt!7vX^#uSj;*|x&D#NAG
z0S^w5p1C}ZP}^F2({ps3))|*Mtt2>|RqU@K{Tj6@b;71uw4R6|6a#G1X@YO?BMAsm
z9J%2bKneRxul^LAH8_-4W5{MYwvEMP+QQuFBb+C}0;0j(F+i5=Zo@OVX;J}ia!f@m
z1O&TGy%KH|0_H$;egL2jXMM>DGRmEbck6)nlJzwtVRG}I{)~-5@LHg$hzMik-Sq^H
zi=ZmB2CEuX8@9x>&+#sR83nr&kHKE30i(C%MKDm*l1b|hSutBU&NA^U@U2n;7*!3j
zneZG)V~9;L<0=_Ct@wKP!g1eiDq)m9WB%*4K0{V3<5@b;5^&)p5^5|4_qTh*EGNbO
z<>gl!aCe}TUmwqlHueV;F_2{%&(Yedj7fjDO)b}42F^{NpfmQNa-*3qx9HhcgxQyP
zzVm18nrd|co}u~f=(Xs_r+x6|*oE9q3g9VNAl1z+qg_9{m&vqKPAguAHwn1yDmDt~
zY4ngCL>Bl!3&8Jjx~%W>u*P9l2i$bEV({6ta|7Y<>uM$u_!t2z{$A$!t+Yx%HdZY1
zAJ>B3A11mPJ?on(dl}yk#?NiWZgY%9%TnzU&mT9Ta)v<7q@MTQzj$vHF_fJjmsRom
z{Oi`h#vu2bdV7*!MbvF2;^tXEvSHM1Rh`)a{Nt-}CIE`JXPvLN3SZJfH#G!v`j(!U
zN7iOS(z=3<U5;Ue!M16J4uG35YlZ27CIj025>?0gBo9<Brlj<SwdHx-lan%_s>=L#
z`3ZHTnFeb!gxc<jK05Ny_-1}=Ur{Xwx#w^(hIDnm%I&K}{QITq-u?x^stl6H-`-{M
zYh<Nx2EgS&%6arQ9LMSS@%U_~AGg~^_!FLkk!DfqB0j|3liw)`58{a^AOCSCp)rr@
z`5Mv1Ter?f8-Sg4I{m4k`s633{LjmXS*QWJKbSw{{Rdap)FV1f`SDX`^W@DVdvUbO
zBKh8JwT$^S!Erwl+-j<b>`-s%7R}ZYx363^@T7J8GgObex-{_0qggBTYSoFogL)K|
z#Sib>S{yZ8MMh^UC52xMODD)n0Z}J0&j)-S$raPK#u5(HB+wm`0=C<l<ogJuuEC6i
zE1qJo3<?`fN}V$eahBPs9;r&iQJxKP><L33o(;>cPzOhmf#e8>9S4z>;vY8xxj?|+
zBx2o82Dm^bx|b2R3{--_uO7|+%4<$!x$VoT*UH4A;Q;>@VPa$dNV21D0>0bg%-(Ib
zZjb%2;{lLh;D(o08Y-sV&V^r<3=S9MTA$)oVS=Khup{_dfCoOdq!JteI62?_n^&re
zA5M6XoRgOs_nI!+!7imevQ^^_BQn6yI~eb6rrgLOHUgI}@ojWB0*C#d6?LxsEaQuR
znFMb#lBXmvo^S(r)}<mXr)#W3b}dp!2?q^OrD?_EvR($OqeG?KLGEvM7Yxhe+OXv#
zZxXQO1;f63)yoa;ZhMwbUcYU$!;d2+1ZnTgpo`{wrS|2-yn^j}H=4U@?gy|AU?ebR
zhvaIB)%{Y#|JI3iL-(Pl(=f_q!Hc$Q{-@Xz@1c4fW&-l?Fhk)M;o94rONgTT!<m7f
zh$$bBL=G$X9e>YY5gO|o5pY@XPmUSqTC$lx^NsNAbWvB>cqVQuxgK%wvq(cC?l|bp
zYjTqa+SSQlHy>*KjMXqYr6Zu-Dhnf2FhkA0Q%Y0IhJq{+5MuP+MEKmlz$0)KbS-%a
z<d$ZlsR5h_;A1CA59h!r!hEeEXwL+U%4<B=mpxY_?S#1d8S#X3X3j^RYy^T<Ggl`N
zB|iVFAsm^J+^7A->Q%CPmD?o>VdmNkcNARDUN<oX%j401$T1+aMYz6RCq#fw+rQuw
zJg-R^E>uu+cfDwQ5#HZ{DneeGsV~?0GH3&`VkksH3JOz+KI~tufw7IKDi*X~RttCZ
z))0@dTSLto?K40Ol_;o+&oC3z%x0P&PBLmfMj?HbKK3@~cv0(n6OX48hrJojtJRiQ
ze#Z!vF~#FW%TwEni@&K9v%=!OHOpAK1AlXG@qp=+Z;ksNi&#dgLoJHTQA#D$Qndp*
zw0Z`@<}BFX@#PfNlD@cww50Wa>BB|x{kqXb4>g|;?FcnuiSX~@4@zs_3Bb0)#_i0~
zS~_9jz*lMi*@*s*Qw9{}>~i1PWHDxG5rvq<)#@2A3q@8JeYB0$&!MaFld+B+5oy*F
zEJ>v+t$YoW2JKbY$Kvksi>eg|Qz8#w(_Xo$k#D*VvlA`^A;qt`xtHF{T_qWtLK+jF
zLbD&YJHET7reY1fwn{)%iv>Oe%bzdVY$nwy5ofZ>SxP;>qVSpb#BPei2|1SRVK0-m
zbY|7iQ8#Lps`(TmFKc+O6GAw`yL>y4O>L^E^lPY$kDOe10tPhvwSkfP)<z4EyhcL}
z&l0(n=yD-k`J19Y+QlwbI@znwuQPO%T>BtV+e2~Uz71W9a0H1v_vAvSegVhCi&MZ=
zhOIrurmc}U(`<3>kGYE)$Ysha#3=8I{dTB4iS$onv`Q~&V){^<*^(lXT+%vk&ZA`7
zWi4VBRQ~XaHYn0iA61<JyW<C->xTDHoC}3ieT!Erz?Fz6rL@S-G*MK5sL+{vNYF5E
z&ryV@_X_jO50B-e(JUHA?=s}m4}*xt;v01LZ=JP2rh0<;9c~rIi?vkoTltMavijfa
zGzn7uMzderzD{q!(Nd&BD1#}zSF`!dQDvlXomz>vwx9>urwKl1rZfg&yAbk1otaAL
zJcSrq@p@(w@k=}*sw|0iyQX@unxS!m-vtf8+{AC=*C)d!ii(n2Gn5OIvg?Go?@uo8
z%!jVzAL>z^bv&Q8f9ZF>Of-^}DnoxvU9sQM6m#C*V+ZG3c;0iZR|^%T3pDKkKwxKr
zWX5t3P2(N`e}uH4?WCCpt(Li3(-Xr#l%2qfGK#?xqft{s4_(2_5X`3vy$LDqT*=D;
z3z;9DA`83QqbEIe;e{tj`!wO;KcSpBPyOUT^CgDNzy^@8?CVJ=r>)@6M5CD+4l^oQ
zf&Uf-V5_GlS#%(&$p5dO%YCPNlG=24wodwLkb{qG^TKJqfxnxTzv^PXoF8%wD*O^=
zJ5xtOemZLA1o8!@WXf9#IIIV-73gT45FaQ&p8nm)_x|Hr46MIL`Hg~blk^f0_+r<b
zb<*H*t6Pd1Q6|KG>|pvcXV+xs(wIJ;&<_;AKTnZi?JHN5RC&794(77z{96q6lqulh
zNF~oY{vS=jLHV5!7>$>5n!$XIe*_%92<#zplf#pL`byE?A~xqajxa+2q;xA63thLF
z6Bj~d15fOpJGG(5Uaxz;3~$$-(-zI(5fV5H$MK7)-<?c|<4l%e_i3E^j8Jyhvrbw0
zbf8iLRnragef2{7jFQpX(&a;~;Ve4kK?k~k+}%QYeBHM&IzO#ew3ZwYXD$YIAd?F0
zE*)^0cx_zY1km7Z&Lk6{<_08g4|-BNcl@cad2GeizH<s(O<AmeiWO8T>$)M8b^^pR
zwPC3!qHxwQq9o37)w{fk9@D0k>%|!W0qaLu+1r3++kJU`)LOJT437IYz*wVA0AH0=
z(7-6gXWkPWZZ_l}?8x_4csRw1Sj6##A5GV|!|*7ZCuw&h%Vq-DahcU5Np*p;<(*)K
zLZ#gq7bT0?$9MDC1k(cv;uCPPUTBW#^qo0(+NQyLK8$}<Dr>lT4dti*rBAuzHo6Rb
zN~uc;m8;z?7u(C;P>t%2hN$0=DrJ?0sxsds2zM9`JWsM*MNk8tJQ19UX)O586;^&2
zt?q>DaB~9QTyOvYshSu&$KGD5&zBzh($Jr7Jc<7v<3T@>vdvJFrPlWO9=-fj<pSlF
z|5iQiF*+7BIG6_T@Ia0=On+u@g%duPDv~yZFj^((;Rxo1kRs3PXymC><bScf==HOA
zC3>+Nn!*eiR_-28Ah^5eKjE;|`TjbbC*Tj!OnLvj@g4(!S-mD+y8~C1&%<52XUKBB
z=xybLFsj70pxMBl?lByXswMvccY;<u8?U7l?Y7gU51!UH9SiiHB;scx40BDc!GovF
z4+-eSXjRGIsmQMoj^n2NQSs}n!}c&X0--koLYTO2+0kN0OH>rPEwlXAxB^W7JKrmh
zQS;6Q$TPWex?#2>eom)>A6!;7B*>!?Zdoy)-{twpG`XkS&)MbfQtEG*<~t}FHD-;#
zG;VNWPCFi7W7bfQff;)<To2HR;jbI;$(RQf=XLl8CSHoR@Dtc8opi;CaR1b26{;tf
zmHq`r24l=rTqw+;VBb9YxDob?Xvwx&yx~tV!1e!BbyiVzL|d26K?4ML2o~fZ!8JG`
zxVyW%yA*E0-QC^YU4u)I;O_3w-1~R;=zgersxfNpsx51;J-@k1(evWWREu#_8<|Gt
zR&W5li*n<tSJFx{Eev`iQ_17`-^bjv8Duu9vczez6NYgrTe&d5eo}MdT=-CEU?Nq=
z;&aRtLUndfk5<{){tbg<I{2~6id3x}HeOA8LFH1((^@e$*wVbT#X4+5yr;w^B2xW*
zuyG+mWS)%GT?R1gu(akCej65H+nn9u@*ZAbhg{bbe7ToNjP+=%b0&s9m${0EY9@L7
zi~Sya%?@~98_MH5G84(iqHF!Q;R=h;YtAG3UZo`WsFC~YXJ=l2EX5A)0{L!R$8~GG
zs-sqd;OkFEdbQX~)nGwr-QHkV;|s!b1B@>-{jv~(h3f$C>8C$ShW@SH*a+1fPUn|L
zujc6<UE-g+cXC%=pll?zevimruNmB5LI%>RxvOVgOl&%_ao78!H+z%?On=iV)*l$`
z+9oeExT@1|(2s{q`KFiB*InZ#vc>nb*LW|%E&64?$_*s`$2F&;9GOcBefN`7x+>lE
z%rtcu@pC_rfLlF@-E}>>=tI7jTvL46YsrYKkRL#07L@YY!^ss(Oo8{??{S3FyaD^~
zTXA5)uD<pvw|SUeWD0(E+f?31%73Q5FQf+UsQcMV8~8zg6Xggk^%7G{U3b1)u}pIf
zi9Rz)h)UxS)V1Hed%ZkPzCM0zaW1|-IXvf015(An5gW^DtqGD;^ETw_3jYq~i>v|%
zVsP%)cB0X^r~jbK4~^3tYa3FW*xh>c!ZiW{lV=0+j=wnK8-C@Izx%`<Vs|Oz3ASG~
zJZZeBztUz^b@AQOSovK)jXJx)C7JjkC94x?^;;3%ATmwKeXkrT0-7kk<A(+4JWjf<
zGvx!9VgDY;n_Pp$bpr@H^;OkQ+50F8n0InwkGYI5DHNIhcQm6~woFKY@YA>4LSzzU
z)7kB(ZN?a0vI@lWghjvqg6?O3AzD+XX-Yz6Z{GwW+M5sznH*7iQjZ)9BTdbYZMh8;
z(B>WCv5Q+K|1`0+T+bM=c8<wK+<^kjQZ>a27JB&UX>QiVyq$~$gBEoY<ku_?=@+wz
zO8L6n3G+23hHHfUow;3`9jYn~uJ`HFHISFSkJ@pUZQHFXHiq^6eoW?3MONFnt;bgL
zH?-OIZrGH4Ge(CfKn$K4f>{});dZyMEk~FO(zA5I-at*t{55j8YN639Fo_H3x;;b6
zbQlz8^nF*YP_9Vkx8*TmY{4k`B7c2sOrUVb8l;d=35AX_+$dJMh1nfM#D-4xDhk_!
zVZAi<S$YKP;1nHu0~6gTy|ERZnloDh)DcNtaY(LomQGxJO1rqnSGN4$@Zy)jo^ZHa
zFhfC&`@;T(v$)3&8@i)ZARs==ib-vN%i*WgCVQCKgoP6+JSeIXZK4Qo+FHO`@#~PM
zDn6$0F;A717MGg9BzaKk6sLf2S7Ma#_C#jeck5g@tS&0NKL2Sac+hT9B~Qc4&~cP9
zmAs{D9w%$^)jlcE<<IN4Thm_-2e;az15Zrcf62eIl+b2pAL;G+lmd-Yh<3DTCnh@)
zTwK^%S4Aadk&6QqYsh=CC*h=*Ef`ZZzCXf0P=eBU%FXdRH2UUsS$$lN0CfHT!*QC1
zxm06?uYIEQtpAL$w2S&*$wA6dA(}b^VbgcY+z+0N1cY-6PXQFe;;qp|xW|TzDzDAR
z2U~+osO<repjo*k3$q~pq=Z8sB#vs%VZ1FG2FyV)L8-3Jq5liw%xb<*YWcG;{veVP
z>%>I9;QS>d_a3yZX+2*5mxQ1^e>_#mgp5*{f*r+O|Ev&P^{jH1p!mBH_{#nMSI)Kr
z+Cilgp+&oSnR3Rh4(_D5Vg-NiYV+7Qd5WW@fnY$xWJbbdyP^haGT$ilmSneeh%Q19
zYkyrkGH3+4qG+=R^79oXOn!=N9C2kRl<14MMa(DWN{?8nDL6S~ExM8-B?GGH7<v}Y
zLnUDc4rCkuzmTvqG_4$_H%iXcr|+@`4d(uDo!)0cYS)OzgOJ$_#}meSjeo2D{v-4)
zTi^!Xm*t2t^S`nn(C3>+Y6MbYjP*?LV>zf_gz=O6|Ai73=qMDxi2Y6$t%Tu6|38Rj
zvG<b|xp)(#9#WDY6o_Pujn-92m$}6(Ix!H2N@7rz1#Ln%fu^uy=aE0$0L7sG#^8#(
zpmz5UYTQ3AI<T(%yT$I<9*YV@YvdFKK=Q<lv;LMjn%+z?m>=OnlyaSIca*^JyB3!)
zlqao)&+9ltMf+{xs|P}(bG7d1wo$Jzqv1?HleDByIw-4Rb~bj*N9<t1d`3BrUemJL
z`0{zH9f@|E<(o8LiJb19u{?eelhbWSRXw~WCT!a{B^a!;_on($dgb?L5N5>}AOk0j
zuwgU5DYWW9JLb`tQ)QnF6YLy<Sy=&#F%&6YU-nT=i#raq+vc%CoR9R>T)FYg3=@*b
zW1t%l7#p^+!df;0u^iEjBm3IO#9^ji@0@Bxc^?W7@0|UI)?Rr0W@RDX^`Av!OiF5O
z_XB5yPq84Wo^Rw%fYesh&U2_dpzAc9_w?-~P+zn$A;`$8f|^2XiCa1bnM1lF!jFtf
zsSKln7TLm3AmY?V5uz-+q(OR77;*ek#v(Lq?%O^8b^-|og2$n*6$%8Dpp_K=VY&bz
z7yI}J>Z!mz{U3OND;HL*=~m%aR_X5PlrUE%S)hiBQ1$QH5KJiI5#a^ELtcTYxK4Qh
znl6?%ewi~(@^68KUyZYES>w-*z{&s52BK*H=H5a$lswix5Y%VJJM*~1qCb|%OxY^!
z^4lMe;?S@M;a{V@Z=_L|FYWKI-!ryeVHz`)Xg@LNSF!wnsSO$>o*->vW*M7d>``5L
z*qaO&w@wFoW}N6Yd=*yw<b#<nyE~FU$MD7$wujbQl-7TER0k&emW5b%FhJ=G&^{rZ
z9>C6yLUW(avC)eiHPNYT+&4W=`g*xLtUx6Fk${WJ^q?FLCAmEx`Y(b0u83LTsUGc*
z`y*5~z7R6yFD)-R_rS@A1d^?jx?k36#J59=8+h5g;qnRR7G(=J8x5FR8OP<u`s!_`
zYp3(>T2%TuPWn6p-)^Fiee4bifo^o!?*d1^wS6Dr)2xnIH7UP37KFw{SWk2vTRF%<
z#4I`*>m^=RcjGD_vT87!)WtV~{6t$7=JUkH7sJbX=qjA@xKt>&A6Jxa6-<O*bnYxx
zhyitRSx-Rq9eNRH-uN(emx7)P&ELTeZuFYrHKFx9bFexQeju<s;r4M+$|B;hW0A9q
z1vN`laxfG><GgHu`Z)cc)c0>l@#oAyGYZo=0<Vo|U8BWGyVPGcSawQdq~^u+$TKBj
z+))`0!8*J{0osgDR+0m+!Oid%mPL6ifFHr^cT0Hi4QDLTamUl~?&5%7p&aCLEdh$E
z_th@Ic-$MXLa}AH@^t#)a9u?sZ^C!z&1uEYXI%}EsUz~b7Uv;6PtXSU9Tq1Y!8GP7
z1CBX~LkC>}akQEg_lepH^xnbc<1?6X8vB!1dW8-_eqg~QqHK`GLf_<|%(i9#*p0O;
zm6)hQrN7r6_k0LwXt>g|Y?}Fhp(l#EU9Xg}m6T!eO>B0loz3;Yqutn0YW1dGDV+hv
z$=DU%q)(FCuhbl|!SLyEOG#+wEztM;E!(a>>8eQl6Cd6qaV~(_gzhOX_QgYs+hCPI
zmg|PLR7kuM7MK(;axd60htXjt5LFVgRxBb!LEjoIr8f2$vU-Fm>0*X}5fr7%?~1gU
z-6N;lJ3e-ExA~x%;chE2%*j4rX5%2y5oDT^rC7%AE!5<A20`Gu*+I0)*RASh>ah7B
zQKSF%1!3KrTr)1MXr#Cqp3kRi2bg;kma6tj;;C-d0OjWVmfe^++Q)i!g55=|jbLlz
znmtK7V<H+2>d7pGIQy2N3cF|<-ZS@)&}Fqc<li`?sgnP}jXN{+dS{nAGd;hhCSapw
zgXFDNSqp!3uj%AZ8tow<Cht^9I*yMmo+pc9La6ceqAWsc#xclvx7k#_o;xcMeWC4x
zt*0^olA<yG7|YF&L<HqOzZ|x2M7K0t(x9eRy$biY>~=GLNTuv)O<!f}dR=`+Yrn(l
z`n63E*<4~<Y?XEV2huXG`Rvk#{Tst%`s8x{-;nJmuYyDu-0`@-$8o#?sAI^V8-IV?
zi|y9KRo{w<>>>snI4^(LTwV9Kkzx`3W+4RBz9^BO;CR0c1UOIVV&uGYVaIo|qmg@l
zb2Qrt<Kd5Wo+S5QR55GT6?gI6{q>QPsM|#uwpP$RuVc)PH=Q|iK#pv9X7Ty0My6aT
z1f$C|75{&2W^%GsO}g)*J=ltxXx5wzA@`Hd{JWT^*_9YGo@P`=Rz=YFV}V)*)qiy4
znQHA=Ex&5c5<FyE|AhM*AC6|Z>4{%|Sp<p0<wbi?QZC@KoY+R~#V_^18z!0lcKg!Q
z>)&E;y3~@v<unDj)wc$FmB)O1a8~nSiFNbbpqIb-OP4+CD_9)ia<^9e%e%B@uOlP^
zzKN%Qn<%`u9_rT&)$4-pt$<v6rqkaL;$wwhNtVzivuXG48$VQergI97m{4ppeOGuz
zk9)*=asNmDK)UZYK`yYMr+M%}Q;za3==m^Xvdn7g@FN8FB?vkG9r#vDdS*LMGuRMt
zrbQUy;Q3#ma#5ibB*8<M&1;5yt7p(3=MCqNcY98Lvsnn7n2GCYOS##cnsL8J2V8LJ
zOV@b|c>ARsWo9|E7s!FNOGjBCCDa`+QkqTrV+Uu=+;qzpw2bS(6&b3r3lHD&^BUZ?
z3v4>>O!yvN@&JaYKTE!g*5uc{tCA=w@H?J{XhkU}zdlTDG4gA7O`-QgvvM&-^BpJ?
zQi+n~4b^~THglFVPfY8i#;D8hu!`-1NQN9q1FBGc9sMM~Ef+t;H-_7K4}z}nePp{x
z+JR<ELTtWV35lWmZb>N;<bNAVKPk!<m_!SCNp{YvW8Ht1sg!96Fuyfg6pBBihK7XZ
z)qp`S{^dohi6O$VBd-xgnpGN`5hKxDl>85ZIeHD#hACNdz(Vk9mx>2_k?=gONVbBX
zDgg<E3yc##w2ITtFW&Ez;ZxXpwP`o|$+J_63&)sr>t^WFZLo@3T|?|v9;3n6nXAYS
z7gB)=wxRa)TC{{qhf;oQ@=EUbLK1QicO*AW;FB|Lh53_52a+hr`*sj+OR3rN-E1rI
zc-^`f54am^+IH44Tb=6V7C^RT-YGSetTn;J0s;q;XkYdMSL1M~GpG(Oc$pMQU!M53
zXw*)X$2u%)h{b})*ClpA{~FE<TtR1Z9#rIOxsnAp;$M=FVA4SMe)NNV`GK=gQ;+i#
zT{_D&))9=R-hC=cZ7FQ=Un<>H1hbJ_+l|ENIVxyKG#sI+@P41YOK&Q!P&3V3`e!k$
z1F#OhC5bn9>WZe81ft!aqM7^TLeb=H-xKp>!<^eOoMR=*C2W=@kd+-+B(*-Zqej&D
zKr@=Fcdxq8R%`OGC9{S&s3tu#Vxo~yZjTB7v?*4k>d1+;(SLCr=}4NtZlo1kD|Wtx
z*HorY+L<5Y`M3<0&<-gA^Gh((&D6m_wzD*G)Wj*gIl<NVmk-H0GWTUS`Ybo9hJ=zl
zt0jDehpdqS$R)<t(~cP%RTy~(CffUa$)GG|@z`z->vY+}F`nTe134-Btheb3xBADE
zB&0TKal^Kk0UlJPB*A4Hv7~0=w-ppZ+)i%XMBP!8Q#N1W%2cETGhx!~096a1hXx`|
zP14_wD|TW(PPSMYu5ZBbE0;@5Ff`we-~AYu_Is%|z2kLULf1e$zpKx!HL;d-%5#~v
z$2j8VS+aWvhC<EO64QLd{P7>`9m3K@0)ww(KYoogQ$p(2<2O{%qukey;C{w}$2!Ed
zgBiVULG(M9kweZ}j?T^E%h(qLdMkKZLz}X$5CcZJc9>&7^g|B&&CKww&6tHK<xHcq
zPu=*+<j1xLzvbYUL>I7>UK=aO44(E_FJ!%?e?rF+I((ThJe1}Y8N~di_TmtV7F+d5
zdhGOZ0v*vn2GvLo-5I&(N!N?vV=1ATu^z!-J=f~f@~j>`Av4#$v6!6&L>S$h{)})l
z{FpHnOBHo=Lfr~jqv|b03w^>!Q{a#Au$s&D=teAtdE!}bY6E{W<|x}1{x`wp`*&(X
zh2Z12Ww`BRjvx4f30?JL!Lp*YyE7lkO(;x+hUeTu>9SCF_c7>P76M}Nt2QpWL-*Li
zoBngWVkliEN|+HwUw~QDK4>0ofYy@BHU-6(io3<;^3xJa1sr7tm?3Hck;a<#>MQ3X
zuT-&72ueSUe$-Ji+)95jTHSD}xF>Y-VwCvNk*mmE9t2GzWfB^8vyeBe<?=1Uj|Ca6
zAWf1AIqU!A;(WQCKUjN<m~-4MZOIU6#1Emn-oz3hLNuBWSTm@}bu;LxiF;qcguLL~
zsSp0Kf7^Y!ZZOoqrYe)MaCnzDh%&cQU=L}Z2<Z{Gyxu)@j45?ejHs|<&y+-Mq+?P;
z2jyO?W=bzL%;rf9EXY!rV-!iJolMr9*>oceqSF6r3D^(x-$g9Kp(!=|^h@3%?W&Ge
z*qjh6k59%UDH{re@nKfX5`HyiuLe~c-dt`7_Y5D~EuQ`T0>?6VL9e%Z=yqS_SR;r+
z^$N62#q7u7!HQJm>AH|MuI8GCnq~%y98Sv0+!&*$!>PuNS_dKM7pElw&XFDA_~5(d
z;2LXFcY;fornHu`&uxF8g{kGf_Km8A$lQe2QiVaUD;J7Z0>Lr1`MnPs^13JZ6Dt$w
z;-gk0QlI{4*aXm;Br&G4AxLVrSk(=$ZA;~*$1C)TZx*e3b|DHW6#jZy_(5V`Z|>+{
z2*t3>Upa*%>-=3s_9~%0nQ22vcq8!TP{EVV@bUefZsU#l_?V9;$MDMqI1KR{k}HJI
z&K_bc)D4Pu9RNN=uVvsP>l-iFx8^_kvnETZ4+oXcqpY6ur_<J&aeg(H%UBqi<tO<H
zfx_W|{U4eAT+89r^JL;Z4Jj^)lUlu6!qa3DX`5t&#*ncXl$~x4;+zN8$Cvb1W_GJ#
zHcyn~y$m`Z-GR(~KnH~6E5lZA5%(Sh&Q+yN4P(yp0=}aG&X9Wd-cI3YiV_`l$Q`!}
zk7;~em#B12X2Z(h`4iK_upzS|4lq@E;Ax9;m2=dEnsNF$<V0*W(-Mo6x=Nlb$um_q
zSXI^4F%(iC2b)J?*5`@tN0n=K(A0`DHC#CiGgDKRO~D(b^5&+_CDY8k-wZJdBIWDA
z`A1R>NU2e1u@mf|&Y;LaBfC;gCBB@+F$vaFK)*a<3hynXYv0^US=~!{8h{?LJQaoS
z)oOmwYk#pY;F}{$Wy@kWGDylM%HVmVH0z!|PIdOO(6-`2%TX^19C3Jj?8S#{6Vopr
zVFuk|WlgIc^{x}DKxtq{)S1Li!7VM~-sK1bTjRBD%Bcel!szy+M0Bf!g;z@Ka)ETV
zRt+I0Sx=Z>uIlWi$1=fxjV*VZtsZ&wSfveWsHSsI-kTrS?wIc{MiqWxUq&1)Et#iN
zYT>%+vRZ#rS>+EMD;;)!W~OpO$0Dz&MUZNsoVF}%OD+KS!pvSR--b5U*k`il$AA}s
zw=X{gUC?+u6E?GZja41iQGued*>I@;ap1HAc?KLl|CQYk^3}~r%VGW%qLq1bp%gUM
zztB_v-R!G&^?#o1+pRE7^vjQmLwe)?Eo8>1{)B3m`E&ZGxjhCAd-Pv0ogz{v!c{fD
zm0lV`LVcCj!Amb(eduxDxxgtKz>e`H(k|!cb<iygX!rBC?i(lgce@?5ut3tNDZ?^6
zn>kLpfoN~cyQX$KdK_SQy>c^x;RoJ8(W!NCcC(xWu7)0h&+X+!!d;0-T<#P#iho(H
z8pYC_TOVwnM!6w|D)76Z8a`#pBE{dD>H8l$+c;D|_CpF%TnyyG9Wl7?z%*b>^lr1a
z#=KiNaa1W+Nil9Y;q9#{_{E@OF&E!V`2&HsjiJdbq&afWaMaQb`#rmmjdmi4XnsRp
zAWVwYU6MowT~Y_x9OoEOaGH%>(ATOR#Cjo?u&fEq8<i6x|LeZ6vT(poF=_WZd9h1|
zXACvvFlhxw@s6LOdKrcUK<84)(OE~r{vn#2uE)@7%Ee`7*AM3mh)Y^v<_q3QE)Yu^
zs?XoC!wu1DCbpB+am<MKWGyxjBOCx<_K&ytyg(=rBn=LUAnuIqn~rK`%YJI)gd4g^
zYwhCJ3;D;sCoEnNwh9)Iore*QcuTL@7=#|@*@qxxYcl?L$p?#Zu9gLfruDlzCDnpj
zQNFT7SA0uVN=)qdr<vX|1g+<9N6>Y?IjF0b{WLcI-&m}W$|B8`{fxa4WffLmyK0G+
zaEaiLm}g$e|H)K>gX0I+vAj0*!^&MmqvB&GX$y;k(D}?>h;=^sH(Po%m`1%6;O*c0
zcc}xv&llF|fliY|U9oKs9nxpQ;f6%Vw?XvE>73H;Wh3P@*K4jr=!UZ3ir-}mppnCc
z(9~7!`p^;jF8*}S_TZ}8xbS%2fKI1saUJdmC|UQf(Nn|SyJE1~hyo?s?!(E2l`Lz?
z(D7d*jQ)$&e6)gxNqTMnwkPNMe9W5)t_r^A{sO3;gVi|lwt_{-@~SO0IQwJlM~ftx
zA+lo_e!d4*XXf``Jbo#n->4h%GCYq=Y{H*8A$_`t$di=j{Wv?#qst!PkpJT?)3>dU
z0R{>qw_ul=+ay!Bb%mTty>v;TT`SzdN89?<%{j4&Z3Z<fcO{*nTzyz7WqCETh+Bx7
zQ1YSY;8U$Wi_KNsP&$#Fw$npI7?&BQyUs05*~#r9usm4?9K#<fl;&<0T&e%8>O6dx
z;f)v~)QFfrK~HlqZtc<jiD5VKNqTU#9fNKgj~U)ct_UCsK%jozT5Ny7eFpKE_>}E6
z!>pqa-a#&vy3Y(X{MyLPJh2T*4Gp#>qT$pLCx2IuIFZab=Tpnjm!}VGHkfcAvUCz{
zStug$LAtQ>m{{x~+PvQEV}`m{y8m%WpQg!C1x~<YF;}3U(^K%c`guLa`aC|Oc2oz~
z7*u48D}$>HWC@^O<hDiOhO`Mmj1-M2+Lj|O(;f=A*^w5a-0u#IKk*qOLcHx=3vGku
zgX62GBeKR3!N_Z=-dEV8LN9&R5{)kgl&MJx)|ioTUriU2Z0+dXtv%KSpeEQ#vxwW`
zLvxmjXU>yMgz<NHH``I-&OMF#y(rjv<zBJQ6m2<x)Zu6v=W*&HtlY0~o&>wRZxWNQ
z+fnZ-Z#EO7lp+(12A&^wJ9iMq7!6Jth00(}wN~auJ<rYN10g=Wj>vBZn_Iez(;8XZ
z(tO=tIXlOEJ#7A&*LhUUG(y>wFclz}+kVac>Qp>C^%<v?4{@5bJ>A;I5lqmMp_Z{t
zg1@Z@I2{bcUB2#Mhwnb%H_zk9x@HdlJ={j)Wmwy!`oY4)ZZ4;FEyn6aP48?WZ+^%^
ztnOegsp_ytK02rx>}^{e^s`$E80;5yJXPqrzbSqr4yOMHtV{t{WHPGQ3Y5b9Q1NuY
zNpe_t^8AB)GAfPP8+AoiR<sv|l-aG8XPF{^tN<l$bFX!Tn1#!Eh`ivwcy4Kpx4^Be
zc-zg5vTgD_P!YJY)8bTax8mz^zlXRqzwN`W{hE1!UuQaDrJ;V_#3)Vix14B+QQ9a|
zQDkQgnq1Y#S*L@JT%1cTQcZ%<K}a`?@lbxtS2OzPMu^Hc<Li76zCJ4HO73UJoc=?g
ze5ged;_F;Oc_Nn)Jmux4^bx09y-IY)jD&BLCc%n(D;l-dvnTCNzSiGHKl2Y~LuW~1
z<grsGd7eLp+RfPLV#Z`5aukgyu2uy>qsKI;CbH!C%CD{D!8u`M6wq|&#MzQ`zHVEq
zboB7|8rTzfy@iS>?d7YyeGSj@y?OfpA(J`5(KzhA2`BREMK>Z3JBN5!@pPTCJqAzo
z2(nQal(DZDefOh&ZR7Q5mZHWEw;TO^Y$mMKv7{`C?h#&mZUtg)16PGuO?BL&<R9YE
zF|rDd2CK@E2mo;3y4H$RmiUDPIl>#L-P=<a&7zY0$4bDEAx9xLlH!^PUTzdf?K~jH
zi(((6<Fb{&`Tm?|0|88`Ia{yLdnDc+<+ClRVi7};%%g5ur#N-!B<9Nbq)sb1dWVFr
zwiX-`5B`chYQsUtH`uOd5ze}6Lfv<UJ~Egaa+~}a$Mdaf9AT!J58(mBsm=%#?#mtp
zDn4a_<bEc(aP=mbaEbJ7x<>@U8K}M(Nn}sHx+PG3C?bQw*K-pM96N6s-;k{Skxs7D
zj-<&G2V@&9;gR1zUWc;Ci$ov}ToZXOwc&!>&vtT-HFY<L@z*}7O8$wE85)K5afA&&
zBXQCcYEOj4kYGCVG%?ZdsOwvII6rAt2z_M9)wUR77hw18g87NaBd7@^aoJjt3CjKZ
zrzdGeDlK<NUB*f<VJnC~1%m4O$9#2BWf`Gkrs}cEfz)_cB13hdEg;RkeUG)%$ziev
zu9Aqlqt4p*mHzgKc!GtL5(Z|&^2pGR&ZLqb^gT>@Iyq?B`}-2uXS(!*>%h9cqX8wE
zr7dw(B&>^Na&oE#x&<0|x~pq}mbS9Ml*H^mt)Kv%sKRsPU*likSNCg$><u!vw4I<P
z86tCV!=C6(Lc5D2VE@VVtQF=1)D7Ca8U}ZpIqt=ca$J5xQ{A1+1l*S)ENDaCmf$2T
zY9ksksjuXH#boi#vlE*ilL6OPzWQ@pS3|cXoTzO<E5@W_<!}KvVU6L>LG|77D>Q@x
zG}0f;Jf{_t_hF3geLh_3l^zbhV>L<}va|C`{G7*q58=1|RayxMmJ$u!NU5G`WIbkl
z@c<i^7)Q>dq%5iOKfi-42p6|xGCi7TCBYGEH6xXm2x;Z#CHf7Eb2^as9eUh72F+hC
zB+tu}tDCawiQs`Se(+5oh?ecK`zc`#4Y~n=T=^%=O?|!c&I8Aaq&wwz@fwI&OXrX*
zk__HAXT9yAuBaE?2)Uz^OFp69aa^jJ!Bx>$Z^}XC+PUVlh?3$N8>R>2<LQ*=!v!;e
zu?^KQR({HY<tQ74aq=QgngJ)O&ofcl--N^jP&n&i;DdqIX2sEblhBNb123tY9_-ZS
zN~@QJa~Y=qm{Oige(WzOG?dIZwgJEF(2rEvhm_)Dq9HmVn+691=#&sEj_o*bZBNjL
zso*JXit?hBexBlSu&S@jY(GK4s3~!z=KmyXB72*-U!`>vigx-cXb69GgA?rD6puoO
zZ0+FPEYJhYH}i*elUTDQ<V&$*>t3w-eS(Z6HFMm+^fywr;O`*_HO_&@`l5rR(kM_L
z&my2ebWn{!FgV7WJ3gy8M?DtYk*Vl<jQeC@f5yYt6i9%FgtESRE#j80@#g0fnAgiL
zJqbBxA+2SPqG0-EY=$(K=w7cPXZ6tix^bqbihl&?xV}4OiVNDB&Fxln9Zc;t_IvUO
z#0V_Vil<?~-Swd{*5Q?3Iin%qEo)L1-d_IPKQw$5hiYNkQWpRYRCC;9B-p!fcv(&T
z^g?9j-IeMsLc9ASJHw50ftJpy(38K(-}9+}_OVd0GH9ZXY6~Z*)bDM4&6UpgH5bZx
z>eL75&U(!&9r4=f;(=Y0?OOyLZN?FmECjKoo+C27Uo@|&{PpyX_^5uyM0<G^%ecCK
z9iDNA$%T7zC`L>$W@_M&4Qj>R@KY?J_mj@I#xLNEk6kfM@|W6y(9)(2NVX@kJ~7rx
z!0l+ZGyL7Hva@X8`G_K=;p0V4W~CktftLs%SqRuy(pETSALT;lxQoiUUT67N(jK~;
zu?cWfG>v=+@xc2#CIFfZQQX7ioBbMos>D*Edq+b&R8Nj&evxfL193I#Ft!xqjd4ys
z-sGVNn!lWhj0kPjkSY%WYkOw*&0(=+D-B(#Q=vPa5}r%_{WQX|pAfk86Ph!s`7tof
zrO;lW&2Jh@jysS1!Gh=Kh6pR4Z!99GTZCe_S*KYw-5n@T)6-t>_Q=-Y;_tk{5H|lY
z=<Zy*3`Pd;lRX|(aX&THDWeNk+>qIsGGn1qxOM@)3u8}_B6+=O?}sC4Rj-Z?o6w4I
zIF`a@y3|V-fk;%y(48Y8GwEJ7tU$^lY~9BOXEb{}Z?Y4)HSC+I*PXVfh6PKxyOZtf
z+s%zKCrZM)4zQIaaL;mjy}4+9T!@;Bz4?rOXDkVs8u-&}@*!69aRfeDyL>}q&MPxL
zahh*>RsW@{;Schg_iOYTLd2KXhb9o$O>@%O$>n*vhb{-n7F*-^(!dR#6Y!AWNmX|I
zF4tN-i^uhzqb$}HLfN$J>Mqd#ihHoZe2zAwzhShGB(f}`Q<ncaZgVQJ?6*cDR`!oI
zACX4yj_j1Eu&pp#FUElqO;T<+M)bQj>qu&1^=?2?=WIS@JMJYMAj?!F-G$qq)LY?M
zPkYJtY)#VHKlEdWoEP=$4q&;C{+^|B9zOI=f(s{apZ6I4iOKe0H*#^E)=*O6yktps
zD;N({H=!pYAU$<3i;Bv=|26lmMW?dslKW5BCU<3(n)S_Jw9&(|2=-TV|I^Op-!2F(
zo7eHr)A(jzSeTKH>RG%`@e#Gs=x-mv6G>0_1EJQuEecNoZ^tib=K!94LCbm52wT1D
z)yQDo_O0SN?qBx6Nrf#T{BlI=a<%jR2qg<y<9WI)>g_0NmaCxkQeXe<XXUPkk7nrE
zq<Dp_7om4e5npbs^qg(K**d`Ai;05SACX^O6S{R?GrZUxGV}X&|FENVlN&$B5(K{t
zons-@m>1k9^hA!30P7_-B!ur#^M@BYg)R7~yGY@XkPmN)$yWqAL!acc_gp2PByJoO
z?fJb2w~gnbMiytnwj`U9KD|v34lfzI>45LOz#X4iv1|#KG^l&-dHGEvsmRAT#-7X9
zK<;;IXR?0{+uTlht3w6%Q$blL;>T)X>Q9+Du5p=-MC=!efKP++nekRYz&6YP+{0oU
z317OjgK)s)K)0UVSbELgr@z6h5WJxx3sVD6^UI6;?KUSC5r?~%?{UT8h@kcNO2W_l
zBctGV3Ha3PK<Jihkz?kN1t+~g1WZKRU+)}e08i7(HnvEU{R*;AiODYuGwK2O$NgZv
zR}d)KRAPh(_%Sq93UV!dqYn7`tAquqX;Hkx?B7zHyBWyG)tTJoxiZd|Z1^w5_0Q_R
zI;E&5Ei7rAN11ZLD!TMnC)W50uJ=}o%g%NB-pmlaKk{9k+Ic<JKa0}XN<y3&t+!Vr
zbyWX!X`FC>n>GK$H#288tqI0?vEYZzTj~jY)5(Ht1ejlZBXS>r;s%_w_110w;tfQY
zxSuuh92ra^*>mQ)fjZ&^3|gK$L41tj7hv>04JmrcOM--6rx)F$ar~+&e`S)kbg$%2
zMC6K0zOGNHpMcx*RW?|E<9L7ikw2HvlJFb*US0J-UQAn;W?=4nN97gRJ3sWy;m!u%
z?XhhHa9E-QA--*`a<!y}|AS4RGNFU!e-z}wgkVeXFE8MmHl((yOO&ogJ&0@*`L)BS
zpqw%xuwxU=tY3l?CLet)9ycw%QyrRqjS5zs5n$?mjOP3}2d5kmj?S{bpp>(dCmj4Q
zu?y$S&-5=bHa@u4@pze0YXBD3mdCv^YYZS8F4J8xOoINMitA8aidbkxHxoRdV|*Db
z!9y{mKy4AHMEKU>OOTJVS`9hj8Q7cA8+3l%co$Alu$kf$&WbvDsvMWxo6<>XK<t2o
zV{qrdXpI0a>MW?P#tq~WYp$1=t6({0aI@*P)OVhL0+_x_UJji|RR6~C@2X&;qz0T?
zeIdmEiANt-CB68m&p*7gp0nq~AGhM*;~09yZ^%uJbzxdfLiJEYx)roUFqFlsEVE4+
zMPT#;NbwE4O%u9j%~%{q5gO<}d0La=rJqwWdsY(iIkAQ|7{$Ox2UA4eaS6YYEA@>2
zxRr1_8Mrk~qkY;w%qJxdMgz+#e8}ErWUm>Mhbq5)7TTr7y!hK@#X0;R`u5`DgTDPR
zWH0h)|1i`=Cip%*Zy~`PMjhBO4t*$KrxP$~ued_lVQ@ia?>ZLBAmK~RyER?Nos`z9
zreP#Z-*`dL`B_Ft__7ZHE2jBVTQ;1Kc+~R5`BgraEuE4z;<3-X!#Px;3HZ3|ZnCs7
zf4xP+&-8y&u-YDX;LAJ6iS+~)!2aqT5>H1dHmL>)qyWLr5T|R1k%Wf~!U0(Rp8|Xl
zN-NeY94N1typ5C)|7`f>h-<dzOxJK4+uTrIvX?bA`1NsPA;^Gr!I{_$N9;BML&TAm
zblgl_xZaR&ns{5E7sE|^D@Zaw55i&pvbU7zO<@lZl;N;swxoJdeL)bsxEhb1%sM=}
z#W`qSh2}(9DQyQzbl_p$rQv#8_AOeA+iDT|nOi?wy{=mRM5uF9uu06JIq>ApDZ7}d
zI6RebX_9P(N5XQHC*sugf7nGJ&_hMil91#~OF~rkiIFCa3>0GPqt3zmI`jPa!Qc??
zi?TkcHYYFW+AB1Y1m%~lw2hd)nKi!r=qURLx^v2&_H%&cxfP%ISTp;qcpK!UDkLt>
zH3-@H4sEZ3?J4VCJq^Ov;u)-Bs_+HJ$Ct9-LDQ+PCR5D>JgoCIWofRYHl$I7+e%*S
z1e2rNDCv<z(dY&@IVj_w<#6&AnpH@Ja&WCvYw8s%ZCA<U>gqm|pVt<{A3I`MDH2P=
z>pR^UTj~L}4PrNem`tIG*wRK07O)No(4?^ku6hCB*U(u(Ls+lFkXd(*+lxKhBF1`Y
zjl|G@-S*yCN<<6x>)W+{L)B1pS2LL43+2n7T<8uY%NrTf8b<JCXwqeRV-BLU!5r!$
z`~B)zj1;<F41LdNyW}VX<~<(Eyg#aoSvbqtYg>USw(UlK7x~6<VNs~m!vjsSV@*lN
z5I+cVqq&KtbeXJNJ}ou2fU<h-49>zZgp0@=(;&oA%|aG~P-$VW(66H_&nRf~qcHZ(
zn8*t^-!(+M>2y};xTTPRMZ4%<Pj|FFeWF{##&**+Hb1fw`9_N_=-2GfgC`P1u2k%j
z-H3patwqNx)iValdbUXIA?1@TUV?<7s+{H1Yif40B+0{i8ltj^TfKXn&v_C)ZwMh?
zqa=<vv3>lhicz4r3C%B=)n&_-Zm+f-6+mFrP3PYr81&6PK_{HkF&HF@hv$&hsG*??
z4FAsax67vU`^7q$GJ74q1i-O#A_E}&c?PUeCM!y<45$Xop6`mWr1C1RSg&J^a^<oT
zlEZOGL#4_Zgjmqdk}_)K`=9WWLy9v7+tG^FGV7L4JgcwdgJ~TxPcp#58{Gd|6smo7
zY-%FeIFB{C<*6U~I|o|^Geb`M(Srg;v=1zRupabG%CZAU#rdDxv<lL_oBo(Y7aA=3
zf<^n9(%u*sTmy7LHrHSEci&)--`W#CtQ0Td(c$}``%WY|=Hn(hNzyvV@W<a$Eahj^
z<{LMpTI;z7=s)kTd#!9?Hw~y<;%fhRRkm9B1{h^u<NqW6(*2*oj-IrM20{n1|98N{
zp@YbNGX5|&HemY52^kw18|dk?vHoCUU|{E9XVNp|&}TO0;N>=EG-T5=X3#g*XJBId
zp>L%BLyyUj!-$2A!<dnQ*@!jC1|3AFAb`X#`z2r#;BFrplp<r(>;q}`-hS`z4b{vx
zT^>j>rZ5AILqRG=^W$YL?NZoH#N1f#E?A?g=US~UOnkFhXB|bg0{^*{xf|(PeMs)m
ZA%{;*I!6c5AaJlTvcr>;3&{w>|1TG_MKS;Y

delta 69981
zcmV)4K+3=0=me#x1dzoDFgY<YGdVRkk<A$hFgY<YGdVRkk?wGRGcq$iK67+(Wnpa!
zc${6ANp4*?5Jl%&g?1oz#Rf1qaV8!l2$F1oZJ>cAL6!&EeX4GigTMlOfPYN#T^7mL
zJbnK1%a@nukH@Fq-(T0C=i~7{zwGz(?e+WnI*;@G{rvLa!{dHlANC7eU&q_S)8}8u
z+h6~@okwnPuKxaiZG1gXfA|XHwa<Fp=iA#@=Y72VeI7nJ{_CGE|MiFSvVZz-@0@m<
z_ecAgb~mQOeMM2}MphGQuWn3dSEw7iF`b)5t=76R-Q%H_3=fhENz@Lx8_A6Ym0UNH
zTNkR$ZX};@#XZqcNIq-F*}9Q@!4>yHtA$pTL>+g!k^Dh_)DvnqQgEtb>P8B_KqaUI
z6}45B34s&_>UD;s2PtqAR@aSgq!<TOma2jjSAZ%|1#07p7sG=T4=QmRbtA>At#Cz<
zl3S{LH?rESyiYu^lJY)Kw7QY<MXNA)U?nv#bM$d>ZY51}P}_AQ$<APv9520+W*e$f
zH?o>gUakm#(nN85A{h&$d66qMxgtm_%cA*=^dQ}+s!CLlE|%8U#*3=Vp{c@zKvo#O
zZr_bLU}O4vLO15<OyzE5g*gu54Wi6cP>GRccra7dR#nCVGfi#Pb~k3)+6uYAOb1cN
zLPufF4pGOEdVx77*(QE^X$9t-FI1MOAe*GBbt9{P3MD&BnTtd1XN9UzUdO7p8*>Q@
zYT}B*Tr!F?w@e7krJ>a!S#2=Sf)J-kE-=r93Ed-C1oOVKCjv+6#^SRSC&a)js4NNR
zF+{nRvQVf{QWj;Qh_RBCMOi2hD87RjOD<@|XS^FrJ_l<0ZY%}M5waXkWobCIA=lB3
zrDcSF$VbKkOS`h#p~y{FSw=XjZa0<@FVv!LER&>OK@Oa;Y@D>vWP2;iKDgq50;_X~
zIu6u<8UgA`alp!VTv5|Y2(UUF_b`XF0;@lm<87kAS`#{6S$buym^L2>UT0-(qd>{_
zR@Q-MN8|@WH`Wn0)N0*WN0i~C=M^^AQPIkO%L*#%z^UaQyBq5m+HuS9U|ralF&@4F
zDeJ`?W8`gSY|hIZV@g~pWpf1+%3eBxEye(KWR75?Dmy0@e)bq!#tKE=XWiKNj6yZZ
z1-86o`^K6@fvw7-@#FZ%V>joY9>cMY(~Z3JGJSGQ9!_9%xXJU6){U$-)EM0uT}n`Y
zvZs}-rmE15taPjyyOEWSHD@<QN2Cf*?umuQeV?$nWD89VO7^sp)m2rxF*>Xi|3K7*
zs9B@xi^0P1S%=3n24po<VL}@d$~vKq^c(53rr)U>S!oG3a&6?wn(H9_LHercFNVJu
zzUuH7^}486MZLU}vB2ntSA~}hY-T-wg#4p+BderpbR(;*>UJY5T+w?80kYbvVmGq7
zs!})dA#<vb%Ols+T)uQ;lm&*uE0V{~nWPH2JaSFVg~v3=s;b)E$f~Kri<FSnP=yJ3
zJ^VVMASDD@9aWf6h<1yBLezk$OQQzl3dprISHNpvz{Xrf6`}@2T^cnYS3s_RrMV)i
z8d24yRmBS)7-g41p@b17+*-njToJjp=89O_h^5`Sv=LQ}sOr|LMnsK>x;1J<2_s6l
zwS*B-Bcg7NnozHVdTp&2UOd6budk{Q6?ZdtG-^VKgb+tVB$P0rghxx55F#PO(GUqC
z5<(mcfptt+$D`|r_cV}|9tA={RS8u+T2(^52=%&JuZ)fv9r>yB{~Mrun#gy~kI$ON
z_5J<*ynNte2p>E0k@Ng={`+2fdwr8$kNof9U+c#}*^^2KIe#`YK0b4Fa%Ev{3V57j
zU>F5-0W6H@A{-110@zeKK-41yn1Hwe!3An!a$rJ{<Nz7Q0Mm!0mVrS5!DIwN1{M~E
z14KI-Sues0LV$&^5}>;pz?1~s+y=M|@vcGuSm+XEH-5kbF~fmDi8Or;Abkqp5QcgJ
z>@x*~!4AL}V1I;*QNgLm02Vz=cvT?-j1);Lo!Fhkf*wA&tZ2ZHbil0z$vBX{1{_W$
zKJZZ;Pe>mNDw~4=TVN5LlV}1saAz^F!$4kOgat7Zg90uulb?K`Kme%#BtJ7?EknTo
zC72uF@rc{qFd5>r&?p!M!wno@P$&>(Rk;Jq4+#ux3lwAX4Xu2y>7*aTQVtIZ0044C
z5v`M`2swW<H8?RoK67+(Wnpa!c$}QQ2b5&lStj_r_xG9b?uE}VnPJmJdQ(}MWwN|$
zSMAj5mfEOWzG<~Q(=EZk2!W6^LxV=Zh+#@XJ<<rx2qBCNNCGXx?pb!2T|f>b1cIHN
zbLO1d|K9f^E2~>GXLeszym;|4GUDF<{^tALO^Sb}C`zWDrC7?k?{!ZVsK2289PWGw
z9v^w|@mIY16UV=Hg`(&+ieesl#jD=<AVm)TfTG^=j)xw&e*gdTU(eMk<_*un&Cx?}
zgZj%$-=HY=*Wh*ep;tfk2J&{g_unXb`yH=(?7r*K@4w@Jp{QT4zWVwb9>4Z1n}GL!
z9d3UX9)HaPkAL|!gYUxYAHXl&L($a#zXMS&oL$O;vrh$Z4k-8*%A#yI+mr)mjnd(4
zP$ry3N+MKH4$ntE;pR>9nJWB7e0}tMgK8BE+cygLJXp9voxfbXv6{X?U%&FeR{I9s
z`ZUFChdcM|wr?<S&2G=PZ?JG7#Wy*)mhpd09xnL!rU2IhzA3_m8sC)QTEjPGxCr8#
z3S1}fO%*QO_@)Ne9=@r=MJm2&z;znmG~vRCZ(49|;+r;H*zrvVt{r?6wQkV9J#61_
zTeS6C?HgW;!cTsSF4$qg*$H<pTwX{Que5IjE$XGW60O1xCdrM$b@<F=^y(GSt5koh
za3e8uqX6HLhRfv4r*HmexX!c+)B?TGzL9Me+c$EpkJFj$t&cNVII%f6ad|lL1vm*s
zIEf`VNg<r%GMtnOoYX3uv>KfBI-HCKoXjSitQk1jEjT%CIH3-l+%BBFSvdJ~a0+^G
zO7!8B9Kb0xgj0I74Xc=kp^WiR=J9_}7VuCO@lclVP$qaN%Xla&cqprQC~J5q>v$*|
zcqp5AC|h_a+juBDcqqs4P<HW9j^m;1;i2r~p`5@&If;jI3J>Kp9?Ah8${836Mdabn
zZvGj*xGCKHE9&M;CFIO?eCLuwf15fPNgg>DD2ki%@&2c&wKJFDY@fOOY5ITWJ8w|$
zO_OK(y;ssVsCQo3|1?dVyL^MbLI1>+PYegt%qMztaO!s8)S7`)qYkHP1x{fJPK7+2
zvKeaTGgOYsQkm^=`<|`OP(}FGe0*J|LaG#B*QhF0iLaYfgQ~~ZZK_4h#MiS_m+HjV
zeX2*z#n&ThNDavKCk{@-x1N7I0jIs=a5}aFr>#vmt*^mpWf@LOi*TAB<AE(u^VB&0
zkO{R!EymZY)C#p6UvE(B)LMMKO>I$|@%1isjM|B>_o+SVczk^dNPHr`K0_T)r^z+N
zP{o`7jrz~jZ-Pb@sr-%H485i>Jj-+NlH;4ynnH0bC(t6z(ao{fAJ%{RUO4>OkA3cQ
zzw&_(pwC6C=2DlbZ&8oJXXyA7s26GYV1|YFhr@4u<5Ay-m+0o-QQxILMe(4?Qutjj
z3Yw@fBK`_dmSk1dWDb7C55#Is9EL;q9`C2xSu5K}T>aAr-<Hfe+0?T)eE$aiPWYyq
z-=qGH`V#2G5>=<>$;f{Vo)uUVStySRNWh~vd^0dpnRKRL7EOU}uIZv6<+6FkPbN}y
z&}@!GUxZN#Vr?`Id@&gI;WhqhHw<h2-Vg>7kRhGX6v<UpYex4t@lGU(jfR!u)7;g9
zZMcT@i%CX!-_w@rG}a`JX)VxvA3bd$?zO1xrSvR<F*B5Q^Sgi4-&21GoY$e2$%q|B
zU<FIC1y}HdLcW-n@TeV`R%l%{R9kgakM?N^My`~KA?*i#A{uu8aHRMVVuB6B=`_S!
zGZI8Ny@k)ii09_Ex81$HielJVHo=K2uBcj7(G!6t9LxWzH>UYH)I(>^pkCUtDzgGd
z|K8KO?zA>JhAn>vG|N)N{wOeyzlC`iV4G4fn-WM#lUj*pgcs6u9T!=?8@MTp%qWFd
zC9o5AI+M%f3#CFOtcHzRv!>C_PwJXM`^|AY+;}|#m>A(TnA{kcp@tvudJGSxDh8a$
zORDUO+HYLB^6Iy`S6tzVC!YB67hVXSc;c@1hQKk|fEIr~^o(Itv$H2;?H+_egobF0
zD1lOM{xz(_*J1nxkoG#r@`$=48a?J9&-BftnKIjRojDl&nuCgNF|^Be&92)scFUG*
z%vxr`PXviVV$d7*Fl#wZ6E%xg*{YQ4rAD<?mCWWRfwVBUmvR|iGrV5I=_<lwc=$M6
z*-b?jTv30pN&-yx-nlyyySuQA>vt^S<F#=4+;hK{r-ctbt%_P>hv(=Ddfn>~%Fw)z
zLdPlDb`hb2U!eJCkW9h6rJLWOen5SdngivrO&tf7aDjS)%sYkWt(ux?dyW@)39r-Y
zwpJ#q6Ak8XY!<c(#|pcJ{lbZYfal(16jn(nNhN=uEo8%Dxmc^zD>IE&W2>@V*)1L~
zp2(ieo>DF-t_dPH+nrlmU1xmI3Yd3cp)tdfNgg@FN@LEQa`Y|EzKxS3-iSy?9yRil
z{&=Hk2riJM29G8@+`7ey+S=kQ9P4j#HFdM9xDp(o++1D0UMB}*bE3rL^$Upx-=%rC
zPV;}I6wTK;iKCGfkbmN%hE!;+@eH5$X`27=I|5~&{A5<-Xqzn%hzYd)F7;oiZvaBu
zr%qGnKqFp>v>YdL3?^dcME1nVgHs1*+GpFCh%c^hZfr8ZH-7p==0xX2_r$5z>DJlS
zxz?rX<*EXN^CeLxx+;}SM>ITt`2t6zKe&ILpU6dxoNwI)qQnFRp$hP=8omHs<`dl(
zy}t%D#PqDf+rwiz=mA$z)t2aU;<<dA?<B=yL8zshiY_)C#EEQ`bp*v7O?Xj}61GVT
zc906SJQA}mXPa!f$M-A!dVQhMXc;qB{lh+}jrTuoDsFcbi2Clpv<**oWlM3Jvgm)L
z8^E?aC-Y2tk>f>B1t!nPO2I&OdI^>CwqqC8QmItI3L;zMfb9Ma^<}WSCnKGYxwaBi
zgRVJi5}lu-6h}b{);^_Fn5w!px8=6oSw+LdE{7Ewb7HYjg3EfXG1F}Em@99w+3l*;
z?e}}*aUcp|SORn4!rKVv?WvZT7m<G~vmEBR?d`jciA9NKJce}!cJ{KozkB~rI=Y#v
z3oI+Cn6pq7?MfozKo6e1NA;zXs7h>^aq|b%52^nEb~FXLlqWXSuhpg+aa^s%W-)$>
z?+;k1;F}3ab<hO`x#@(@itl>dowwJlcXZM|ucSMclwbxuiDg?ef}N1F9Zi4IjNjQv
zd)4i0m1UEs$29<32yE%!fGuUgZ?FO7bR%6zmzgqlNK#aqDwK=m$Tl%aHi;dMAel(k
zlJz9mrZF}>5r5TsWUS*u{T2`b4`PBo*z47^4yUH7`iH?Jhlc&Xt+rY~z8-$`PLG}}
zSv;Nd+?rW7+`AAOp*e=;8{~h4MzH=_z!85*eGxSG78#`_=(4DYm<y72$`%Qr5EM~K
zDQN{T%Zsk>`G7^%5YGvTAj$afj2t(U&azmPh!hNoLW-CD(DJ)jT7EvI&lvM7!9`z@
zuc8F!a$9UIV;&D08MnCc!Y4yUNdI%!=iX_Wshl5S6AgIu@4!B$V3dC&YCA$zjefH~
zH`ALTsLIF*d7)aY6`Q>oY&>2xG*iQ)^noKm)*0V2?QAAjDOceJ7irB%nn8y9eK9OW
z;#-BM5eRoE2EB3MMm*{fCIy4(_O*fnlFW8l-)o)c4rWtHUr&30y!3`<GI{m`JdF_8
ziG<}IXZKo{I8bS5wOfDn8)XYQ<y1E7HZ$dcb1}m=oySiXbGBW*@(ee{VBe+wk@^bw
zpJ_nQMZ&jh3ie5{*NTY`K$3@PeUhPBQ2k>pL^Ui<p-4s#+G;e_VT8$lhhx$?HmTFx
zm=<@<b&;tCLu-&gg7ow_g%ZPu&oq5|T^e^#rJ<qp3@R^Z9DRRx;kdMxp|Im%-uxTD
znZFCxE(NHhMXg8FPv@#RY@i7B9m)|LRo8S=xAbCI3NgO&f!0Jb0Dma5YFiHAu~;);
z^%-kd;9^$<Mj^BxV~&aWrAAcpDMs>4f!VgSwpf1cGCyGM)_b;`ejo6+mSbG50H*29
zf}?1DVpT!qO@x2=<eTcAU(~E8X#PK#h<kzN-|<|m7yg?1KJbwWPQW_#Ael)CBSzge
z>@ZzU6F>s9YTF%q&hFWhwdFMn&#;6S!PPu1;V1oEAzvt`Dye#^k?Qzezo+#z3ucU9
zvH&U>Y-fPi2K^zHhyYlBI<4C6s_=+xM8Irngl~t>U*msZvPQtaJAmhQdu63-n4HX|
z-Gtj(UCj%kWf~4AJ_0|bxi8TC?-}T0A<bt|3ZXp%ah)qywl5=;QWe!J0S5i~pP~7m
z#Pm=>_P-7MmZd77r4AzGLfInVW0ltEtep#s`BJ_T*7J?L7Ok{GE0Q8BrCM04<{CLz
z=@&6<!?J&-3%m$wfbl)oC%|MXI7f8Blw(K3@f3`LI(sBHXLl+Uth0bQEXGn;u5#I(
zb=}$L?ejx(aLht&ny=kmH*H^5GOzxaW_{?5Z^Sr31q}Ar)Yqsac#UIN)nl<IU{E3}
za$-_kTAi#$z6-!5#$gaMzqqi7b%bW<1|GKpYK(vORj_Ad(9^++@#0LUA&w%$an$mI
zvWS+dcI5ZSyM8smtJPtG9Gg;@)EVX2KQH^5u4|ekxwIh4mS_uFD$FI#tnJXk-m@ck
z|H#skX2N&|Vb|eZIbVO&xzh9smtNy1HPw_A%{6$&GECJ{^t}68+j0X7Og*a5eEz@=
zOyqxJzbFg#?>k`sWGWx~hImOM-;k1MaHx0&`-W3Q*cW0~A(~Pxp6LJiuU~vI_?=bV
zl@-}b6zohoF=w=VucYVGzw$oc`09LGWjQxxX1t`A1a|Z-1Y%ARy&)59{B`hd@Vcy0
zwMd&89`aEdWl#~75Jve1cwm6XKwdySfMS34W7e<5R=S1(gcp*bg;Sj|0?h})gx}|f
zw}1wI{;9k92j>i4dGv&#8Tq8Gjd}iw4Zp{)X7Z^WY2qHgAh0U}!_~7$(sD|*Bh4qx
zf-*DDk86g@B7Vu>>8Dv$Qe0otI7LDU)ivu?*EJGImRMP_TO!XqTGAXVr{(FYill$K
zMqz&-0dxL7$dgMf6?oCqGBu3!WwSBU7!Ae)tS?_2&&<zYq^i&?!!EGPEC=XRrCfS(
zVQI3o3|eDUgIT_GQ6h@e$c-u6iG&&v%!(jC@aJXSdR%Y>IY@vp+$y)m{9@XcG*^?)
z8lo%dcV1_nYFM253+_KLH6Or~HgJFc)j;-Kvz4|4nWu{`;sVg9pzy3$+Pb2k6xdT!
zL#)HeND?0IC6ZuXEvuI=Bg=F_m)JM|miiv`SxTookj0(YcV#u!G%Nt0uI(F1Ln16_
zCF}%7lN?@t27XtNL<vV^1uTqUD`<=<h%nw3IS67MDFWZxf0lPjT$cOjJA!|4@IWvg
zf7bs9^0^PcLq?CF9?@+$Ht<C%L1n-vU5j)=I?ROG5VTsdlq5RAXK*wITnbP2<zy*S
z%BAut1&<4KIjC_LdBC5*mgCq~0ht9+=rVzi?+D@$w3inR%j?<F+PD5G$Gu)MBtK2(
z6`m3A2fh4=`_GEGBtn`zK?;Av`Yf&Tc}4qRvA8742d5%=$pL2k3+i(OGn$~0_sEES
zMrLJB#vy7|wmeM7tfvrdh7peC+Ac^>3JVfQHVX~`Ph)0MKo1`VH?W3{<lGC1%O73G
zbiHqW-o3}Y^Q~|FsSmrqYh*Z|yU=JXn3oTJ47ES^$DarLL2M@i9Poc9U^{u@;YVC;
zD3U7Saa5$b6zNzx&*asbR;!3rk&Fs(7wuC#O`<G-Q-D9kSo04L5!Y=F7Od{ixErQ#
zSKD{G*W6rE>bB&Bo6yHTKre2S@i<YqcI~|>Pc!J!L$Y?pmIFOhETmhRWpICF&gAF^
z7b3c*!RG%Z_1iIB18RR9Svgu^6i(q436!Mn8@}b+KDO_XmBUo$L7)xK^lZ)1VoV;y
z3oRbGzJGom6Y#Asz~O#rdw5n+AABJ5OP`aCKmB9;{Yl`%Z&AM!`vMheHCk5+#{_AS
zmw1&<f}zf$93tzQ1DwZ6jLbM0lpztHOd9LPLa7iI44NqI!#IBqQ3a72A0GPf7+8Gc
zqaXduSKW`g?*ve$7`55u_fFdF(c9){KmN;~`H!;xn4;^tYSa*_!8fBU!Jgj-jQwTM
zT^QxfL|Q8uq=I}<2#D6I>kS=iEj^ve5I4Hks>kt%m#!i4v0zL@VG*n72UW88$zsyg
zMa?NH9xrlL&R~CebN91Z!$qbggKB{fcrRC#beHqmj$|8pV_V=@#Az)1aBt%3*I%1R
zX_mH4^B0X=H{nY*_%J5eyT7A852$$(jT?!s7>Eh5|1fTfPSbeY5w}{V<w~A}RgLc0
zi1xun2K&R{iC~orV}D7!61=U^xcSo@63UtT@3*piz`cLs709zbhFHXcAMKyAd~VBc
zv$_Sg*MhNppZY53z#4Tt(t=pE;p9^`ol9dp1%BU)VXB-W1{t&g@PRDJI&IL%bG@ks
zQZOL#0aC>x{L(RviG>iSybz&}_uPB0mF5%NLk}sLd!FKKVRWbatL~lH*V56Vg}6RS
zF$g?nX54?v7YAuZz<9yF`EBr5zXqDJ8GBcTWXMJ#SIm`5l@dtyi`8r`8;w^67)fHO
zreosBRxw-3lJSzzTpR`tMmUZH>pf*icpSP}<J*R8&(Q(P^JZe}XIFQ2Oml-<S*)1p
zhwlLPy#@p4a~mAXmL2^%LKQU2p=Qzk@~~7MXJLQv7}I|be5OAJ@-9$o)cHudlKoUa
zUCY#PIIUPIRpuJK29Yk`2j?zR$QD|icBhx>rxxLt@aU6(0g0ao*cC2knysb9$?D1)
zaai2j^^_n6)9^+AHc$7+3PoX#TIA}y`I_9c9YZqps(>_=Vczet4BB)~eGFW3Nxbgp
zNzQ-a>f)?Ie}EMXOQzrQV9WE8rljh2Va&3e%HAt@rvG#%-^<Z_qIXJ1+~9smzEcI3
z_5!S`0DJr+tRZL|@Et4E4A3KrAp4r4E0$p!B_&i^<8FJly)Xu9yf`=P4au4sddVn-
zY?*D%wr4?Wf076W@#Xsw+&HSR@xtOWSU-QP1V=;%jc=pF&!yeMQ=_?MA#b>Mx~?Oi
zN`umVbv9!PN+J2~J0GvgVODGYE8t8?yvsdZ$od;SBar12g0gS$UTy)00+qZ0cJfjf
zK5e>s(loQPNt#EU$X9k?-G2c3$^)ripcW#o&E#kDtvsIBLY~+o2Ww4m`RlDhyU>4`
z?aq?OKY%fsxTn}A-Hv&u3rt>&U!J_UHOc-H$g)+xWaI-ottG)oxFP`bMG0AfXu+~(
zGFFaDag!(d*b$f?r>&$MW?Zl4xTbA;S%qU#0r-<@GI$?OZ#)a)`9>4X(0m1_rOBFp
zoB9XpOMsq_Q75Pa>O6IsdR?U9!fbyzd$Dq<!r@S;*3mnsW>3$aojo@z$juiqOki+a
z*;h|$C+AM~PVV+k^iQ8TICHLhzN@IsH79c+d!c%vcA-7fnYmQHT$TVdBn{mJ_6HZ1
z1-Vl}%^%<0+uu8Z!zKO^5g>eUD_%Mp-wKdSL(b9T2!O5mQ}GF+7%7Q0!{dJgEv{xu
z5_0&m<_dyf+c*vyh=F?5x18TSt8yZ9;ZFJ7oK)vDPS6d%$T$6U4jgJFVNFEMX67bv
z-1*@TTawKyf@1KN<_!cvOx$-MijG+k{KU1{vYi|}+vUKxTH2BdA4Thm$lAR269VmP
zmf^iYk`y6SHEr9ZNPg|FK%Reo53tS}bs^H@f*~4;p&I@1V7xG19FzE6lj!bPA7bYw
zDW~MBT$3Bk&ZIjTs6%zJx71r}y1;puroeZgR{-N<TT`ozBbK^7N)N1uv3=z9c;YY$
z@zln#eIEjCK>>Y=-C`KQbespz?!s|>ot4ujEu>IJThok(U6tlT8YzFR(Vm;)M-t;3
zjwNyda~wT{aQ?_bh8~za<G8wCUfKzeGM2e>AvzH2=iDgv^BwAkV9P`>U~|+;93k+-
zpd8eKdN5<QOdKViA1#a`?BZB)mMW1>kSIx_lBl~4w`H|0149SkE%0#|AKbkN5JrAm
zByOXlk&)Z2-C=e|#P5Hfvfi9yOG;2s-=rclkUViP*q<qvtpL1~%a^Y$bvkGt$0}Sy
zRl~%umO$VtE_$yCkW_z>Pl6MgL0cen%j7D*!h%Ed)>oLKpXf)}(T4f|17O|&5YZfU
zntEj%A(62=ZQ7O{$eaDG{_*}^|78DEUyJY?IM^6ThLv)qU73HYjF>UAvbMUm$Luqh
z24GG_5H#NlHr6*eA2}{u0$n=oE*PNY$%=3^bkZk=WH<~w5{o?Qp&xpPH7rxrh<LzM
zhlD%AUZ1Fy)%0mm=Ugx8q-#<mnQKaogs+)*bEYV(L0h+N`6)4<cg3{jvL@#P3Jt>$
zz34V<N6(d)B+h^3UB`aC>gsl&x{BrJ5vTKXA?OFT9X!id(Li$46F|@v8Q4r+L@i>U
zzXde>8rWwKXm~NEpo&qCt-7>F7yXi7@vDBrZ~BCSDGu>SK`L_KR{&||u>PK{&((3h
z0lZDSkS{VA7|D_X^2Ek|;xLX8M1;dWk2v;@5MxS;NTq*2`dT+juPevtTwO1^C;v$<
zXCc<$@_aduQ@gp`7akBNji9%e-pbqA{zLQgmt~~v!{k<FUmBnR&38}~oBj@9&#%Hz
z`_v}28%YSBQ_ZjYGk(io94rlR95M3R>di*8*X%b3OPfnL28HKGVrMX^h51FshZ#i)
z>CrR*B9MP|jO^}zXL+MJji)>l-}rSyt<Vk%lz^+%SpeF$;0wa*lU&wDjKO&{Cl)gq
zGTWt4&kW&evfQHuwI(*2k|Rny7toUx@Q|~zqn@&TZdHVZmHKFw=9@@9Js&!$-rXb<
z6UVP{9{6iiNaAp>AhgJ_X)Z0MrL>APqIGJ+`mldJ><qD$Hi!o01YW>$isNy<5g0hr
zfaCck_#kYv=VupY*We?u2DKQPtyXG`Uo4bBjbhjyyi7^>KU$Hzj9^n~i6G1`THM*Q
zmli>5;MB=>Jq#`P$AL^7D~5zAve_h`vz&)@OEFA_TR>@Wo=P;Ifu}TD!;CK~GLn}_
ztP+0>Wn0^~mTgnljVPyS0)2i+eH{?mm|6mEnbN4_Q9hMx<y+-erB!b=TJw{I321`J
z`r^jo*5ufP#GoCVg-fL?wQ8+fo2`x07|R$78;ct&JF7ce^V{<R7;)qx540=e+m-{D
zAPMX=+X0;PlI$DMLHr+*2JU%B!!Ga6bu@oo=@-OpiDq4%L+5ND%mb{2$s|o>C&!1@
z&u(0FH{6Hajg5cJ0pl?$XG)^UyOy&@^Zy4ZT~Se7c@cGJzK#YeGWM*!Oy-!Py>^nt
zH4$d4H#jN}o>T|$&;8WH)Ljw!IeBpH;Esd)4>$~R6gtD;Du@h@C;2mj)}S}&50-xi
zD}!@q&Y!t{=H4?n`CGd4j=N|doNJch_`CoRu-)p+&GvwaE}Xx3&)wJMC_sVD&`~XW
zB#r5X)#;0X1b+^rkw@~vN6=(U$|-=J1}`JA{vumqjnKEUdO;6nm4R(D0Df|UC&(<n
zW#1=RlIU<^PnGyA#~YTSR9gZ#!lHk$VDca=vMQ%qV$D-k9p2e*ssSJn+sf#9w=)P;
zOB1ZK<8j)px?pNh3b~$NESi$uTIV^&aZpi_bzA1>pW<almXk7wrY`dwty!+Y34jw)
zg2OpH_i>t^v2@K=oCI<$%L*(998+D5Fw*y^zXg1npt4bp^F>)#^vI>aF+G0(WKv2>
zOC-+Aa{{;($!sc<&Q9aJ#E4B<E~Xw?gEK>U*bKGVdjN=D?@Fa`QSQ%X#ZyAaS_!jU
z?V&0o<WRSfHxqhet6Zu^`JL|&o^h#VkgoH$B4{`-1y<I}dj+rN)uRYniTFi|tzaEo
zC>2ZPYNgt#cB{Qozck8?b2xveqtg^avYfGA4nV&~;A~na1WGr&wYXS@#z!V~Sbst0
z7A^fl4R2&J^6KfFo9*RX3z-?zZ1;E6J)F61=|*9$)iRQx4qGAuv&;FzCpp^{IBf>~
z*pF40vXhkQxH-U@<)}8L43{#z!;l`*0U--m*F<*d>(m}~iaJYOq^^Hb?~Y^#FG#MG
zFJaFi!|b#B%iZJqd;2H5r@9B-Gu;c_i`~oJD_xz`<cL`*tDA<I&StWB6+0A-WLL)3
zEIqnU<A^pEw4K4R!5+PT`qb$&=g*!$M_;6`w63;%5IYM81bj`^=f?}%TRUtNW+53a
zpi7($8vck((Ji671&V)3uq*Hn(*S^qZ~-0sR{Z=F;sJsb>KyI(j3cma-pMBONRbPH
zhDC?JHyZ@Sj-8gXo?2B|$;rzFr<1d5@$qKM)ofIHG(hqdeZ66X3#+I`^F`CCfNWTz
z<yx05UBZzmgEM7EvaHKnu4~yLLY9kpuy^yn00({=G#HLI&cuJ2e-IX25hSrPtFbyO
zMIxe!n#?GSE*V%vf*9KqoePiS!H0v#@F9Qx-y8QWEF3H^<1FmW?^55SzCc;P<%zgf
z>{?`LDHYebS*nvoSw9<O({{$r(<Qo0S7>5sbJ)@<MYV|IOhG1*N!mF(9~Qz2d<e#-
zph;xYuoxedB&>fK6G5v(AWl;IVr*zV68?<Bk;Cwv*X<<hvkUB&vV5rphkO411$=zr
z3pQd$!;Ei@v>uvyyZy`WKV4s{5qurQc!39GI0P^L;fPvNU9M|&y`Cr}3piFoYQ}H?
z!*x8TZw!pFF>jEXu_g&d1x8?xoKZ5JN|Pimc1_fl+7*9hg@HHp=6ef0_b@;OFq_~j
zB8kBiIZOjm-hUrK;924yza5mC?$o&R=kK;l_SW*u3<zz%zf%SX>2W_+f}<#Fva1{1
z5=z}IIiH>!qJ$LMu+VG!&n`xFf02xS1+a0FRQz?Q9yL$BDw0!$QJHipL*z6?S+s=%
z?YUaM)+m283p0gIp=<Rl4HrJ~ASW0@mgzZWPMy={GVN?T*Dkh8?MkYes^y#cnR=^^
zT{Ro$1^_qHKF9JTus95FOG5WOAvSq<zK6lPIE6qkK;*1_x@CD__UG(>_JEkG$aT-Y
z^hl}j{<R1HYVoP3o?@POqSgw`R3$4kEuSlhON)Ol<LaJi+po~}_B89Fu4nZ<cUSie
zSHk+r27CVl@V7&-_A^u$(DZ$T4h18RJ!_P7lQ@1_P1cgl^h~;)?xbgvb4iob)Z&^H
zoSDZ6AZ4`776DUE&8a&xPN&iZH>_9DaP1tajf4~SA+S2XJ@#{$f{$iBBsQsr3+k{t
z0Y85cfk@vw-A=BFOGwup5L|lT9)I9}y?f6c(`xD9*N5&14tJOklb+@&rfQ1{w$KlH
z2zd`{E^@_x8o;rFPdLV-6HNF=pg9_`6f9GZk(qax8Fq$KMO9L>YECVxCA9)dtD!b2
z9JQIF1~bE%kv`TZ`m*k0I*h0$OVBhH7N>uV%7?zVn|Dj)uv|52MyKEH_vj%#7UqRT
zW7$ZVQ62J;$QCwiQ{F#<t1$*VlC%fb$uj-n&Xb!vJGfx0Slm8-{FUE)<?-Xkjy>?e
z)(71uUH3_5Zmz5-&sz@7YiTQ^S(;^O<lp1Rc|NZwKd%B-(WtmS<Ga-N!DdBOq^Ex(
zZIG~%Rwk8Ag}4&bs>b!NICF|MDb{4kQmRx0Z@X&NOyVO3eu5+@r~(b1HlPkR!gjYo
zwcCp?fD2$w%M7Spdvlj%Qk=-Y;c1S)&kA^#yW}R)+PO=Y9vC1k0fr!j4Edda_tV2i
zlOXiIk6f3MNxbe`)E|OmCl0H4u}pvOQE!bkn`OwRoUrm%$qJ*ntfgwh=5PiaqAoZ@
zOZ7>8wZ2y09_|b^Vu7WiT+CMrmC!8Xg6kLYgt4%vYVCS^rqZf(`?LK4EZw}ZU`+bU
zeaz+n*l=E*!C^d@KH>Cf@mr+DZ{`1@a)mL`ZIOTv<Hz_m4!BiWY6mz-XL)}g51Cn`
zwQqTh$=$74rlXz?;doV43ffF&-c?AYEJd!vgGCvYr&HdUVZlzf-}XgN3Jkb=x^`dn
zo?73VM?<G%UA5ppR+acc(WJinhd|GKoYygMUQA<j#$$XYitl2pDzgd;zK)x5vo7|D
z;A2f1`#+cou#N-xeXFSZ5Ilbz!t-x0ml_SXR?DudTiHu@125lmrL=BWmsZhegjUz8
zUgcQi(k<7iDbD;M^~Y2IT53LyvMZD(X|fh*QI$W|$)*S}8kTI3m`^ZfR3AhXFAQxs
z7>!5s++m^QZ380y!uaJi8L=;7GFVqVS?z0+@|lY;+{*{0C279mF7kf{D<r+js<>a8
zZz;VQU3D{h)AN9tY1MMfTE+IQ3QEzui%Mo-*SG#7ZvZ<Rh)zh!yzDB0Zlx^S?Ft+X
z%t}00p5%xAmii)~{359oYE$>bwNo0a;p{oitOZ&^D`-WntW~tC)R3A|TZ(F@D4NZ4
zc{Q))P1>TfbS^B0B@usTh-+dqoCyieCO8oYgA0hJAkm8v(aXFjtdfaZj@1;pukXI#
z_O9PiU6fa|Ze~SY&v*J@lzVV2BVT^xm7<R-R*)!etXGk5)ec;@?s*;}aZcR(@I&f%
zDMYoXEx^mKjVp*)To;De?cGzmz-?<jPIqNX1+VCJ2fa~$v_5~@7%4<br$jimy}M0n
z*R%OtzLu}&yZPDtLVhui<LeoiBTNqv$mYh@$rGn|KYF#aIEjK-w@}BF8*XzP4`B&L
zE<cK8@H+`y!4m#FFvh~d`QIwRb4jyoDXFB*VhJE#It{KK3tBY`FMuVoa>4|A@tUuG
z#<T1#P}I0^tV@6MjcaP9sC$l+wtSkmEQwPb+D=#j4IG@*k?z;aj{YX}#+jm-%Y!Ym
zz?S_j;JGyE0hpx*ARTK_-A|J;v0>5$Lm+|jzz@<UZdz!{Gjd1h3VmT9jOBTmgvkMZ
zy2z_l>o`n4^|EXI!_308?D2?eE{Fjx+Jr|R9I!Dwws?PE7HUm_eh*!)FqIn3pc0dj
zX!;kMRsie8zxU^y#AUY5mG}m~0@jvk(sjk-a!u402jEnxE)s;-<#F4FBH<Wuu{bW5
z%cw|E68OH~1fKbQQV-Dr9gh=<C&1Gpn(D>%trJ@eQBX(gosJ#fJx)p^_xDba>Wss}
zr=9I%{2_lTtxjvFap>>m#ZOo%)S^_%k>cgZw+wD8pu|7_72UQKKctgcW@Vx<a*$&9
zgRW6m+TgLws&&1;xT@Kp5M1khuH~E7W42<!_c|fCLY_SV?y*c><F0t72`CInK~DOY
zIzuB`M?A~1wvBRNf;%$>FUX^VdP!#OOviAGO6Y&J{ItZfUiuDO^%NVl&PlMDzopo|
zt&v_!gYe7mkZP$aq2dVWxI*p3ah}{%tcF{ot@*8mttD>4t!{1fH~TwVMpV;h(>Uy5
zV}`<l=Zj0yQh#%_xiDB9OxR_1b-Xsl@gJ3;S+EPhR+y(k;jjqhkg5?+i36ac7Z+Sb
zE@yv~z={zd_RPdsGkv2a7aw%jT}7`-)n|CdE-=1Kzk&0`o@57>@}w>$d37tHd4}_z
zJRC2qujk!k?#Dakwy5j~juoP=hooOkJB*d9r#;n8&}K$Tx{{O9lIR2N_QUONE@v1&
z_tOzp{0HhEfL;N?$2f+#8tW=W0N+%xR11H53#C#bOjHxKM6*6q$FBNptKS;5#;y6p
zLSm9wO;}iG<w%!UT(paw`gAgrB>gAJauPd(sYI{VtM|IS+0onxW6gz`#hJ-yc?1Y!
zEZmA1-pcR;#a;><V--Gy6d{Qxdj0!qC6*P#bUJsCOQ$98%>4Yuzc?`(mF=hP3LJkU
zkh5~lkR?74$7qN<je4}0%c4Aj|5^Rbua`TyQ-wmo%EfWjzo0%(JmL&Nk9Wr&v4-;u
z3a|367SIVgO=svlSg8=Klo9nd_+XKJ-uF@<jA};BrV6Q|T2=u^zKHn>LoEv&Cgivz
z=Kw6kMERL;_);V_wMs$!{Izv=!eoD~^uMz*e3JXA$z<ZLudlD1I5Eh>YCroqz(5aI
zD)ZC-QO?&QF}2TACRn2YG%5Cm?u_jbM{`q&!1gF*dA8@~gM1>N%om-K6MAK@?lrs!
zIpU(ROf_4@VJ#vWcEU-x2``b%rE&$UXf<-p9Eiqv+Ab6~5n-2*z`^)=x|o01_xT#`
z1bPAY1?}cf14BRb(Cibl5B~WZ^ZN5N{}E09HJX1{6_%wio6YX$Uj6DEx+|L{^HKpr
zU|+X==;drv_eUsVI;T{a4m(_z>v4T<6fT5|;ZnE}ZiWO!D3)V8EvM~}C@%<Due&n4
z((ep9qt3Xqv@%)2Qf_IgzO{e34bZ<$<3PqV!GE-V;V=Z-A5M!Xy*_!u`Rh3NQkxPW
zwyVE65?#rCjjOn7zj}5g3$`p7^)te27C@(NBG2I^YjQd}H#g_D+wC`{b8aF7zJnm#
zspxkK0y0ZT7ez@Iij2i5HqY{5sPMFh&bw~eb;+r$W=f@$9_0$On?HXbv5`8V*fO;q
zSFR~Im$cGb?L~bLsNptn#r=48ewNhRbym77tG%@zXEr|xh6Q&C#M$H{Iptfmcahs0
zWfF-q9E1S|{zN_Y!70SVcwSJmHY?`k(Bh=fFG%I=nM_43`G#fMrl~J&bG9IZSD*!p
zeW}!U)r~(`lhG4*epY|gayrkXWqeK`InXnPmNr4psWMV^0~kr==v6D7K=)*?F5^<P
z<u+y*j_QF-e}($(IF5#>eiY3;jHH42nATM(QO%ykTC$)BIGPsM>>Xw<;zh-eueeXR
zA8?<*hpkzEx>&0%)$6OR7RL3scI%tqZxji}jryTn#%ArJjq87)>eWWIS!$Q$NOOQa
z;S3U%!dXnZ(yF$arI`};KrKvpT*T^o0bCx9dfpz_bZ_DN;W%betRL-xE?Z_!a|M|b
zSF61q<7JJEuGWpg3vSb0X*MsThGUq?Ie}$0-~y!UW&wppm~xWK7e8sCPoZZ>jLp6I
z_n=RH6F3U%lRSSlOYn*2=njd~JEVNUG)#=jTrcn>_OSE}MWtua2yZ3hVdS`ZbP7B^
z?S^(SNZPn^^xi+c>+;Y2yNu^bs$INPOrmu4iqGBU`wzb0`|oiZD$kTt6tVqQT%U_;
z3(|)%A8ga2C}7Srd?W0YdzD7DQO9*X#cpx7G1nO6hxvafnu#?6?mZw8j!ZsN&D1jW
zOe2Hq`>_FYN}aHS3xDPcy~40CDqs+<00N+W&<)YtB10e9dC@&O$=VT1hW(5nHedZH
zCDy;liHU-mOa6>6r5k3`ayWx~;6FX^<kz>ypB!zyKA#_l;lrg1`TIWd5tpZ32N{VB
z?~6sV4j_N1iqJ10G#&#6!-1fnM{>z#oWB@R6YxVwwZ+GgFaw&uqw@yu^8r8VM0Ly5
z3_ZhnyobX9BpTH3^+_EY%nUsKM34jzlk)-ez^mEr9AUvI>i*Jv)bJMCyglwd?SCLz
zVw(E;m4xJIX&Y&p<{C)NtCgDL2$Q73$)=u#@o<0e+h@Cm2huSD&b0Ig;iiT}>8DK~
zfnd9u^x%Ve*DKAS0>DUKawMK*Lfst$&bCbSvj*b4URuh|`DL{@D{>66A2QevT#M2m
zeYR()3)B_r{ZTbRQcQ_iF(;P9koc5);z{w8ct+It=EvupnKi$#U)-N*wwi<Huz6O$
zpkII1ujs^YQ%;>Yed6qib0;{pxi(AcLl4Y@!zvalZRHN~2Ze)BDodEc7<uk#``ShA
ziWXpxzFupzTOFV;h%e{EGkrAK`jV=iDJGg;2#0;;FI$CpmEsPKK8dme=RJHZ)L6;!
z=I1+|UT^jNo4sBTbQTx=WZPD4Bd-)orY?WXz+y<6n$Nq2rf7F$;h4jx&#{^*FdS=H
z=4s3F$^X-)Wia&bKadKXYQrkAv@Iz3O-$8FDtf|HtBz*dcGq#RCMI!@KLm+wAL7sB
z)Z3!I!K|ILL%V9%?2Vnx9g#$>HCn@A?Agv-XV@F{7FHHlCiBbl5kA2o5**PFow9!u
znXW;9Fq#|B;l*%p1JdI1((+_}b$)IA_&SzdAAndMr|Lr7#D^m(xZMf|w}wZfdDYu!
z_;OAU2q>+^1!!W_3?IAFuY9}a@CJ9?Qxp|&v<w{K>Xwq1N+rwW<`UAPz1b@k^~FW|
zj;9s?2W_|y-=!mN>+0`w3{ysdrTKrVdH+3W<k!GcWN3#IjZa9Uj^=N><-uUxO4Gb&
zP3!x<3-bQQVBc`nbyO2@I>LJK)R)(mH|Md$zo=T8g{zoTI0}x_9F24{-A&J?=O;^(
zwT1Ns9QU&$>Qu^AVE0bD%Lj3v<1I?uR;zu>wHzN_Pk%Vwn*vOdG3kQCoY{XD%fbDL
z!uvemNF7fYAnD>tMG!n*P&NB)r@9jF@scguhU9YMl~+CcKKE7bdArAPbOHIYZs@jB
zR1=Op>oq~t4NElz$4HoCOVuUYv=l!Bw?7ny)+yB>^ifFs5BCs7{I&{mzZA(l-W6dm
z8BP{QOC#J@zrD7zc6@DbjZ}XS`NO5r()?g`u(7tewzGR|_h9$TE@;QGFXGS$XnO4T
z;SM4Kfewp4Z|@I|T)zNExg#g0_R?Jj!j>q4<3yiKxD}e?0!g$TMM5g#B*ir>%@!o1
zSmj0A)Lfa99F@Ck;@<E2okv@P0r1XnxW;g$l$_0_*vDSQ;@TS703UxY696i5lWO2A
z9G$E%iYyv=c|Gq5s3>;3$hhww^)1*DD${%pMfOxCdq`kfVGW5p<}Xp#sJp5As5cXf
zkBhl+-+Z+L9^GWHJXl*<U)kE&-q_tazH@ePZg6qs(#qA1Ya4gX-aYH!w9-BIUcVP}
zTy^fw-ksy&{BZfq%9(%lGaF~N&+MEz=%4GK?_cU)?qBQQ(Y?FtVDQ~Mj*BXAILilp
zNYZS>C^!+*IL4rdtzFY)fE)g_g7impMdC-z_wa(;icS+33rls%<pf%`c^Ob2CuPl)
z&B?72BicIeu&!GKrzvo3@A0HjeEjZ*G>sKm)7EU=t|%5Qztw+iX-z$KD*3jz<;x7i
zmjmfTd@`xCbW^RH96ezaMR3xB%Dn1fSRp?!l((d`^6c@UbFXEwr4Af}lZNRC$k4Ln
zIOcgpgt1rDgY-438DpDhPmC04c><pYrQLLpPNe6k9=Jp!D(XGKs0Qb=aPq3<w|!FO
z!w$GX4?bfwJDz{VRX#XTOHfRs-kj;Sh;={e<KRrk?Yw$4Qic;<eKDrwAGlZDR8Gu<
zhG)L=^2!SE<*cR|qKwe?RadK;9W=NK$MvTa{hA>;q9bY=N}vSIJGO4gJRR7`76)eH
zVtOwh*ExNM<g|*Q)#d@qti`>y%5=s!O5wD}o$;_c>MnncCu1C?AsOA$box0z@0Xma
zgA3-cPqQ$ZjFuPI7ICoHZ_Ts^{UL)15SGfI?rQUO5=#$W5;1>SNm$f+e5*=7=DJ$E
zSID2(oSsP)#9FG5m-DGWaOa4mPA0__-m%PA8xEs$1;bD`=D^E+z0Q@2p5p7tr0Hrw
zK8tFk6%&7+626st5^)PbDdl*z_kQ_P_4-n+cB>BT2Vh5ik|DwrigKMLUKV7GW($d8
zg4E8A8{@fgZ#)F0wK!fH6HnM+5R0(ShkF=EX-#9)1moIYSgK8Gqy`KuBWY#;ZwW4E
z<|76<toia{ua^{qRi{!I*MDKY@NdfqV=MUs)?R;cfDlz=(Bit#mY4@bcb(>>Q=6Np
z`q*P{w|y3|kGVhl_QxLknS!%J^Jz^+B4?|jHQ>*iw#az^?h@~^9!9L&divpJYy+eG
z=hxzThAOo}U5ukQDV+1gyCUFjy$T?UNqxC~x_(fPszh!0spljdT)k8BLw{jzaqh&{
z$t{2Ee`Ubw0yT8%<Y^Wc?#z!D;MM-#3An+>E=}#QgH#;Xrd!2~Z&N)u7IKSDw~FRQ
zFTX|J`Y<w)bOqE++D(FU&^0UFZr8PJR%g5J^WuU+i_1b?q*;$+jU@-Iiwi<sz&l(p
z_5vnuU;B)gR5e-T5+g8$P1fDB?Xqo;pRs=sn;raQolki{NGl_XHWyg-`CZORh?2wk
z$i71Jp&$3&c5i-<`V+7PEb*R`Q{S0#0F8kBN{;Mc;FVyKOyoP$8l!Q*nAm^zBwxb)
zZgHdzH#d%_Xn~OB^UvU;DJM8lz2H9MzOh(DrTI$bg^&kp_3vfvx1yX1uI>0Tj39qn
z*Jwv6Tzeo@vej&~Zvd{zN~Umj7uR1^QzUx_&SyESFg{?Js1o+D)Abfa#>!3{9xd)%
zN@<yl$%}@oxcW@a;z3LO^sCh8n|7K@a6fH2Rz(-+KYUo#-BcH@Eb}}<=MVz#gu9>g
zko{j^Kfg*X#x=Z-CE8-LlB#4Yxe9;oA&T<O#NUiN^6G^~p_OT8W)pJ>%ym&endkbw
zx&C3~3DhmHMjS3ZS|#?Q3QZ21%fHZ4PI-c&F0i8k%VKq;^umMdySo=I0H0jAu)BNx
zf?y!BT@11<KXu+v=T%!*WFf)NII3%ukpus*k|r0(vyjO%mQGO$g+M?5J?MYu$nRbt
z(WUL!ulitwKUX@dosHIJYo~RrCCC6f`MOXK<b>Q1n<6gz+7tJ|$vQ2P3Y2M!U5`7(
zpOQ|=rxK@<r<%fy&>E8{-P~YqVZ7R2Yj2LX#>ZB6SN7{C>ZkV(_7VW~N&E!IR~7-u
zV)f+%ThO=!DXNW6CDYYP4a<LRfCKbV1mY#T$Oz&1NNOLeu)|0+QDN9&uVGF;5(&Z&
zk8yi+<!7owLu6Tp<*lJp5!UZ;RU5$V?rB-ydGbl8T5VmiUvb~5Q%`N<ApTE0`Q(!U
zN}oUP2@;rL%Sm=V>E(g<!Ijb%)aypc(1bg*bxT(i-!NtkV@K1Hx;}r6?|z&5KG_>a
zj5|`(v3wd+zcT@Try#~LCYt924oi)$85&BtDO?YsVflnv;b_s3$25Ah_+0Zpee${I
zo_k;LMDXKJJn?T4vJoni|KTasJd3gsW;999*q1;;n}@lV4Qhwlr(P3Dt5?RFwOJ-z
zMqqSjuqU@Uvok|>ttx*}v`gocg(QwUlM;mS!g#W@ytKBuzPd{vr?IV8+S{G&&AF{P
z+?Jdy7D|9v7~J)c%jV(LvHjh><NN%y`|`-f3dDZb;{Jy~IJy&y7{~Rn78oC;0nDA0
zk3M+^3#!2MjF!;yGdU%fFm-lM6eSnr(<y-$lCc~1zI@lg20njAjm9JLoMfIttjg2n
zgsOX{<*P^ndc9#@LVVHgCMu347j6j3nMVjAk3}1x)rNk;iRzWHukw|{b;WzQ%u)N1
z=5><9mRYc}$ws@`##v#ad7C7j2`fD9q_zN9xwdEHcoykhE7!`inYoNhHxFkTGj?#K
zt$TcXm?5gw2=9N|K6{6<4Tn=IxqEK)_02}3|84{tB)RaFm?JDyDwT%X`7?h6Q`$%9
zX_|lCzr-^j`)_>-be#i?E<yL^$L1Z|wr%^4ZQI5>o;$W}+twZ1wry+gmrXX`ZvNXz
zbvo5a^{I1`PIuLFey0kuruTZ7=|fUMCzAMuL66Vz3T!RXntOh0;Lbv%@t5Tphs$7m
zT<}K_c_h%bQS8C|*+eO{b@0geh}*6@qqT-Qy*^o{gHD$N0Gj@wz|{dahV&$qb1)Kz
zxZqclrOMB&edI4!$AnkP^x<zAx@TWBGCK0KV;szNcuWNYD;r_Ar{xQ>jk^%Ub+V7(
z(Ka{<8N5Nkg0JB*(OwV5k!&-svnEm)eoVVm<EaYY*aTHut^j)S_&Uv5yygOeLm#Sa
z%xu&p7V9w(fQWO*uF#q~{K*p#GOkBbg{tU-u40|Xj7y3T#Q{GSE~4q!H}o1O1fJqo
zfTVy6#FmhKi-1fPknppY#)wHSRqJ^0<=^JpAd@(0^M!UFrX2!!@q=q0jLcHpkpn;H
z`ATx0hLM$wCo>wGFceQscG-E+pk^35dJ-Gf7=kunz}0Pl6hEow>}iHc<gV>-vCPZo
zD$I_d(@dCBOJA=k7QqFNTe}YbgLKwwg9!NxvPw&p>`sF)P0%cTeE!FD4r;Tk>(#od
z*c4l)dl;(NX~5f!wd0Oo5-bk#SCdRPf5UA0+NPCXv+{Y0c;iI~yb^_%M);mgfT)Gi
z$VLwmU=BnkoI_@`%5=radZ>ARJ!<8?!@AMB@-3Qo0B+2)B8+DQS|pH$2R8~+zzWS^
zzuQpsMvW0@K`^R&mXOyd%}!l?!FNPbGUWDjX=y3PcT=y|M^pc5X>n<(r-m;b!xXwM
zFV*R{f~|__kTJNf#<oBWm1H7;gg`$2B`m=RAfi;IybF@g`Ta2>>6g{BT>%DR=UrR+
z-#L&Wd)5{<^(PhT?cTGEyn`RgluhM@Y{n=#XXk@ec4Prza{V3VmI&?Q>gZ21KMDYC
zZ|bJPeo}_Ko5QTi*WYicK&$=eJG~CR90zMamxVX)i-R|B*A*hAG}12ccl8}>L3raW
zK;8V+Og{s0$Vokefu6EuUJeXb<G^!zPqeAa+**m+7~1c5nrf#e{cj!B<+OCwx1PDv
zLlb75gre|;I2mRomV#2w3iUWsj<vq(9NJo^rX6)sIaiyUxkVSCTw_Z3oIO7J;#;;6
z0HUx3VIuY-CH@Qic#QRn*#UxI?qxp}K#O=fC)6jscFZ;X^d<=@B42I6y6qcC;&@yq
zq*4YR8WvX`dqEkKr#RYu^%KF4bBuNKJTmtfKiuuZGcS<8=h@$T7(N&Ja(=Xicc_QU
zh4-=E*nC<RcjK|j-apm9Wy@Fb`;<b|6))R0?n0Vi^n~HW3GuC?`lD!CBi1$%;ELJ2
z1*YdgJ>5fH5J;1J+oRsb;gdvgf`KCwEoIzX57CA6mc=O-yyc`L7BPY3I0r-}QdP^U
zrbTm=EM%9JIYW0uK6tdZ?%*pqj?~`}Z$>v>(7$Ya9gafZN-l4OSolc-wH>>PT&V@S
z?>}Qmn&q(cmXwmTNVww;tKh5vz>z}Uy2IW^UCgLyhR<DYuh4dT$(Yac!YIodvU*CL
zkFe#EA7D(VYLA)b`nHFy5|Z_kp4BrZL|C$7v2Vtjl@evjZ{5SECK<5(6;IM7a7{0X
zd|lcW=H=bgnm}E?3X^jG5c1~G!yC(S^H<GpPWwKkRlP->V}-reL!FNXaIOXt8QZz#
zfZutRkrNJ^8V-Ai@ztQolv$mwR=QnX+q|r;{dDzC_EQo2@+B%LEvPOV6}5-Pl#u4W
ze=MGN%BjT9Ajc)DjfSiGTLViqc01an8QY$RlYde5XSBC57)CrTo8{ac#sjokrGC{j
zA6(yPCh!?G0mQh`OzZ+4(Bch}C>g%Cm{8bIkga-5b0Z#FO@dA46wnzk?KNX*<CNiD
z2iviv2A(W6n=*7tc7L8gMu<EYO2yb=6vS}*=UOX9YM=al%3kRQ&4;z?#4)xb(~Iyr
zS0>%HGUnXQ*VfP1&;9%LGyH*Kh9FD8nO~ZfmQEqXF><2#YvO|wpqD_*R1%?1)LF$%
zcS35X!{z>rd#u^i(a=)g<7s1_I^+j+trjCKDHY^|ixUg0j{thcWRe}oIKPIMA1~rZ
zj=y_aXA~Njjl>TVo-i}R5=h5PvTf%1_db>Sr~#ak+PWi4l0rvJ=D~|Yk=}gOH?)1P
zw5gzyt7^C%c#5hR@ORh1+4)4tO=ucB%LSuW8~udL7uYmz21_i|w6$nKO)KR$gt|L(
z#Z6kyaX@W7!+Oo=m8tDUt(+j-eMzy@E(5*)!l~AXVj$BV$yp${|LWgnd+1pT0DMCp
zG9Op<W9ILf_$3QP-_5Xsr>UxBId81mBzU1>HsF$`?idaUz{@EzUkQe_3>%_3yMr#F
z8$RUtZ#*lJEy9VQ0~GQ3QB2L-QsD~Oy`H(41y=`57oGH4T2=C7Qa#4o{yL|ABjh*K
zOPO^whlmr&<X_jQ!)ER1WUlpBF^+J{EUWH5H@a$pVmif6HF`ee;Hz9yF3E8hPn&oz
zR{Xxctk~TxfR&GV0*yc3Q}q5`uL9{!yhRwf?#J5?Co>ekYF)Al{s~1#z+ag5eO(JM
zZ||#p<CU*myxA9K;Fu4hP_M+v>V(~raGJ%h=4`y^qg#d5PLE6bLMK_Z;kGeo&lQ0X
z2D5MHdK&NeK_m_!9cdmtG6Z?AI?3FHJ8g)E7z1WV0NFh!{-#5dl^<1EjCk_(poJB-
z*mf+@c%jy3M-1OLS<^LP=?y1UtHi0h{6ApZX&XqG$}hMKfcK(D8O@}acaI*KXMC!l
zDIL(SHt&ht?DXtO`k9)kgeo>Fu0g&&ptAMV<=wtM4?{mgPdn3?OT@Y+P9pDZAPb{{
z)!0)70EUwT=Zgnug2r_L_vm^xIDf)0#)0jgUsolxodGDwZD3dDBxctiZlPa?)O?lG
z#T{nz_lo&m)tmzM8(CxY44nm46q8BsiCiY+u<%JxFf{t_EU#i6S1%fIx!CtX&)UAT
z=OL=Wzbq!iFR3f;W#>7%S^M=M!hZl?v&a0{fc)?T?20xaOGRBJ^+i=zku8-wKicfK
zYu>dMk$$FKuY&kK_JXQe>gc-*R$hOOovXHo<pj1lwPrT2#9>`NHLj|-G<)*wYSjzm
zC%Y$}F4li<k3|a)6Zcfk_CSJ@BCdGwFA}`0jo^dxC2s{ZuYI4XDf{rR+ud)*B-dsu
z0I|Q7h>wq218UbvIrwWIGaU*zCwg;}hC_Ug=rNNR(>>a6ffZSnNNs<YC<VBLjUPTG
z*aY4x@U^HiQ;ux%Y4_zR@va@wov3$?>YS}ix9_3~OQq9g#tiYw?V1BY@Yl3EyTCgL
zlxC4u2u7=_5|Rll*~08w4_)!GWEDLwK;{b^L*tfr)7W&c^`1+8-xW)j%6PW-5CRwN
zSh9|CULvE2%-ik8b_x)C8+~Cg@yC3S#WqoV>uBm5`6%Qz3D5~sYMJp}&a!&h#hu?C
zxZ)sB<nC9Cv=HXyCEmuy7I%-U)5YR)dUc~V`Ci1)Qu5N%QnczM8X2whYBXpFK-~s4
zbLc84JLn*>d#rqGp|h=^f1m=Hlq!2XZb0mJbe`}k37>*Qr^?r^gj&Xd@Po&KkkO@D
zp)92%VvvU6zC<u;iQg+p30-P4_DWVgY5hXJ?@FUBOL0+_70z{2MNf4v)zO(<-O!)0
zqJ$@|{3j2Iv(5V6Kd~#;fh5%0fC!Vw21@6Y3|HK`+oDSy^sNi&-FJU#5bK;{@08#w
z3bK(|viL?Zb>^LHValgzcQs#)r=`EKG$|FJNG+r>>@E={Fe))#V4p-e_fTFW0Ih&D
zqEK_p4lKu!zAb_iKhVA2A)qc#j;H>?mjgyFPl0Peqk=M7fXB=CYfx_hzz>+8#u4Ra
z^+8G+LO#YV2OoT4Tb~F9Ox+r^?e=qbg)JIhLzQJtb1L3th<4tGaDG@J5E;dJXm-i3
z$I`?ldXIkUY1Pg?{j(b=bP*U3{&(4Y{|0kJpXjl^Q8kc^#JdW?YN-y@Qm`wT)lC%q
z4peLbjdiJN;w|E6tb_gmz&jElEIp-7wZz25H#Ltx_2uMCT)H5YS=t%9Kt8`v-o+4k
z8BXT<%sJ@)k!0Kej5hRsM^B~L(+`H=zTfMOe8T0J`pwEi^$oy0C0LK3`%*x7zG(Aq
zy%S(F%DA`tMpA=X(QKdFS?L?H_s}-ItOJ+3Kbqqd13oZ?tFIgc07q3|Y;H%fY_Y)f
z{siHl1Ueh82VSXTllZZlr^jSVXGCn)HXI?$aQu>`KIBY2nE&JYtLv7&|75MNo-DL9
z-Dg0(*~Gx2sZ5jkf~mm@s!8Sn!lwYfci5=|{budkeNjTv)?(5y43vHk7}Ae`GP3@&
z>}F^ApS*NtT`Y+W5M-4%TGHBQTV#{rMk`>9Wkxe$VpVV&u`j{(*RdH+7>=_?a^44H
z*i^G=*HmoX*kc7HL4%!|<H!DdrJTXPSN8Ok*v-1mM)pS<)J=@B^WYq}!SMKlQ-6o@
z6#Hu2X?Vp;?1<Jj{pch|hMHN9WO9S^`ju?AnD}(uYO{VCP?V0FXkIW)O<QM4E#g?G
zS7ZqlnRntX{Fk33u*vY;<X$mh2<3L-&rl$PZT+q;YI2elWlDi2-0a%iq4$j|WXITS
z8)bNYi2gHAh3-8{M|E0B?R-<!TT4Zd&wKQ+2%{R_rfOpBJ389#&&;oH3C3%+u7xYs
zrbv#=0s6)hz&pKLx+?OGTLFY0h&!<;(WN%d#(*>g{xJtJXkF6Jvy%1TB$sA4|KJ?|
zAb-nsKPT3diUs+XR`BucSUCT>P|gU^Ba!}GoN0NeS=@I!fzl7euxc^$o!<U}3w2tY
z!dLHAwr3pflJ7|8$>j(C@p}4J`c^hy)4K6<++SixfTTE56nINGOj4W^&;jU1fQDF~
z8zrPulB1CgvGS^XU%pA-UR-?JIIhxfIL9nzgx`+)ud$@b;{@~vtC*!(Ny$6jTPzt%
z^&M{RZmG5W-&NMBTb^6BJ9pl-`n@G{a@Fe-f#Y%2kz<SJ5{rM2@BUgt@SCR_F$pAL
zJ=1D71DtEDctS2UNaFK?)}0K+5oHMSs?JLkga4(cSDhym#y)kr@gHs2smCVnnyME+
zKX4hkdtXSFi-oUHTy#y}U97H}hJ}l^FG||q(kZIq)*2y<ADE@KZahMSot`?Yt(7*A
zR$zslccJRSCXXLZ44`z;QHyz(&De%N*TW-~0rs|WY*kln(#$k~xpmyh-$H8{lwlXy
zq=PW+8CkTT#I|UCb`h56;XIA_)vxO5VEEpHbmm+NJ#OG5jCy2j^AzYFR30CHdI)h5
zQ06KDqU?;!L#P|KVfMnM4RZFAuK}%t>04gUq&Ba2tIP{FLD(oNl@*J$^_8aZ6p4P!
z04~mg)UATMnrrD6B}d+gc~mw-tDf46&~wceLkyV?T3>#LucQMo47+*qR&1<64whnP
zlVtJVJ=8Q2Cst14FMOKJnckOQIv#qQqb-uf)Tyx(NE_er_B%3YaaUP*N}^0d-mKUY
z_v6D}?cyZVL#A@>s?A<cVXiEhlCHWA05wexG1sfZ$tYItHOwv^s1}~f_A!4eu*x6i
zqrI14`-L<owbMxVCmI(tFPJ3|@3idN5aYz(Rqe->Rbd$)&7#Sn4Ph8YdNKPW-ur3>
z8O<O>&8RkO7&M1Tt&j;3RmCRNogB%mmZz2xSS^JaXP#&x7g)HDHVX}%E-+17fU0V$
z^rkfKjmc3v@(tx%IJ!zqzDJIN^5mLcm+0bHwZO9p5V3seJw$u7NNIK%M`(tZFh41-
zH&(IMYNweJF;B%(>Jcplwb%U`27WB=>`vz%J4B7f@FIKl@f?K_3e5^?Na_u0Dc93?
zcX$ES$(4>ldMnV9P+VoWhi)!iK($MDYFh)g)|*%J;zVt!oa@1c3QvS^E+c+#vaoS2
zy1@q`JdCBD<XU1Ac<rdWxf<O9ei@>Yq8!9j$ZqwrYr$H_eDd{+cB2Ff3X9_i);7+o
z%hN)0V9lR`BF|9A?>9Zb&rNuR0$s(mTzPwNO}P?#r~DJ1436Y&xYv**pnDLH!2PM&
zSb2W5gAJ$H*NBZyX@PdaQce7R@rO_F4$=F$hVL7iay|mmhgbc=Q3So=*t&y>OC|MQ
znWrpB?l3TYF}QHSoEjg#(uE=W8HH-fp{rNstfxxH;LLBUW!`T-4pe=)EEX<t3xn)F
zD74`3O^%m{hsLUc@2w~cAi}^JQ=>l0%tv!@IP^5VjG`ogqtr3_Ik5!P+C(_VI4LNX
z1zr*EQ+lZ6Qqja*10FS53zLsgy13ykC)U$-3$G59?BHbRas;na<=%Hr1x{Oe=x>oG
zoa#~>tXa8E3+PU*xg8S9SGWnKd4YR(UB^?b3P|Vy&vXoP9s(-?;J3-mt5G9THQgAT
zrV^`aEWWZVxD6da=7{;!?+a0_izzL(DEfe0=ocQ;?umvhX({q22z+l5AxD$HENm+b
zN;NWt=@m7RtihhWIn$V0D>q%GyPDqy^s5f_3^?I``#w|^|Eve)!T`uOr3xt}%I=<%
zy8lMPC%)9XGuNF|01Ej^)*{+0_9^H=ni=)B$#&?^J4%<8dOKZ(b)8Ey9(+R1lQ@{O
zSpxIp&1AoJ2Ke`+o-@KY@%}B0;GaFXtorcl@61V4Tr?M>@WGS_5MsM+>m+^+pp~pu
z&+uBF1SJ@T9=tv2z7-syQmja<>`@H-1N(u|#boZgV?%rY+kfq${I)s1q>Hgn?*7*E
zEo<qlz>sm@(rV`G&D2+Dxw#V=XkG1@zk9g5EXNd6U!@;OZxM+FZLkPxOF#24#L%q^
z^V7zA8o=p(=w^uiR9jne4q*#%?H$euMfUi-MSogkQ1q^6+P=x`u>VGfqpQ8c!VBrf
zOl-!#<a#;g2atwV{lV{jLAGZeK#8HK+|M*(sb+4}R=jU_$(PC6w0XqzGICq~m=7yU
zgz{?LxWQ}aR_d8?lX(3=TzlYRQ0jKiZ00v<4QhPCx|SX70T8*yBV%qTrH<n$XBH89
z%b(+(Ve4<Cte1Ser|r{_jIlks(pn|%AYB)#as8>~1n}_r4XtV3(M-2W8+wNZ-$}7P
zFxa)>=sov18E#q~KBP*LP0X1674*q7{}LpC|LXK6kE%~NLL2mJxh5Z5@K*DP9w9$^
zmBMuk%G%;f!zpY_ptu9Aqm!`dRw(rB{aA&(rv;~3R)l=OhE*4j@fD>-bm1mn9yuxC
zV7)Zn0ML+X1+>uDl_G>uO6H|?zs<q{26*LLzkqTG+$THM6nfbz4=4S}a=SLFqtPEy
zsz1IRYzdn_on~`iJl4L*qALhYZ^|qp=d|plOc**05gAJgklk2~zsYV&GVQ!va<Bc?
zZSg*Kl-?L%P!zp~5mE*8rnfmMP{F9Q7{*#`0C{<n`GJG~z^UTVs-fZ=o_}953$AS{
z?vne3CiE)dFOJb`)gD?ra$P&coxm3sblmf-2O-?Oyg+wuZYc(6?%G<>Z!WLvo}6v)
zOKE7s_>@!=V!GPq#1AjOUAj2d^}Z#QF7C}vxa!nTu_r`CTKEd!)0WNL95VU%pZR9!
z0JZRI)G8x*lp_+O*XgJTUsY`ED<Qv6x$jPScafobM<#mB4{l#neI^*LRD23sU$QQ_
zmaM6B(2hOFJN7zq9N&^$)tXBny?%yDuE4z({kn*{2rn&T5JP+~g;<tF8fcIZn(doL
zc7TroOjRk>S~d3B%Vlo*&J!aSTVHmAfZTEK@6%gC?XA)0jZY>5f`*4N0+t^0RwGSf
zTJ^ye(>V$9;lPi{O|ZAO%QE$MzVivEYL&u<XY{2+P!$D;0@kal#HaGG6YqmY@zh@F
zP<Jt#A7sCY)Y6ov?sN~BfE(fU+ZQUg)&-iMP-n4sCH>{|a>E;jp!$Tlr31Yo0Df0u
zHVv6Rw{;0u2`6RO_{>U40{_g?L{p76z<T_QFx!M3`On+DxUYy^W)VdY>eIw_<=5kl
zv37!X=t#L|x&FZl>3N1o3reiy!5RUqeo2OE%!XJ?KBhg!R)RWrg=R*lK5-^ucqZ90
zIqPR9ogA~WmE~sEsJhM2#r(7?U}8BBlbpW0gIY#UOY>lLTTro{wO3^#CUx=~maY&f
zx)MPASzZ_U@3T_gOuk4xS6j3dyP~pOTU7nA%h7kUU6lRoLsv+#rmYd@m-&hp=tfPC
z@=YR*-r`PXQtb|D!X>=zC+!-%pI-{C{hMY3T#J%hM6}Cm4s+MsD0}NFV7Ix^Z-TBp
zj3I3<vchSNW2-*z#3llRj%8(VMGu$0(gyFERe^%l`FM_w-x|fEfEL8;i$*4iAvkM+
zaZ)Y|Z7-YPP4WWB<L&97FwVve_0nrv$>xEuInnBoe~pqlkHvNxyTQO<L#4JRH2=c0
z_vSUAsA4U<R>CxZFZ!DfV8wl~hPf=H0o`fKPJT`Ld|xVl;(~Y=>i7L^Te4*Aa`E1|
zbG3Dhe%@ZNcbcP3*LIStK+re-8kwYQIbPW2W{JgzV)hR$*10;NQ`lvQL6lL1V^#gk
zjY~7+yaG_VZh%4a+`NA7uzq(?80z}=xq+dvKiP7J4B2N(4J)|-9G~fgd3?Q#Rl>KH
z`(~B;frn8zU7*6OXc}jg2-3)EmRxkH!(r3+0^vwVtWXykqo6&#UnmoFu14>KJ;GwI
z^vIK?SC`?~;((hK<YmN`GlwM_%(35S9%y9F$nh%VCzD!skk%7wG0F1amB>kdIZ1!s
zp+?IqugOMy7we}2Oy1ejLy<FxrB0&d5t<3+ealrsfABxXM?(3dp9o4)LXSi+N62ZT
zcsq(3h8RDsSYMQ^W968AT3jMx!8K4n7?0-M4k{L7@a>E8pY6FunNKxaZ>%%PMp%|?
zd2M6o{X$RRC(_HN_88C(Y!NmlbI3+AGSxDjO?vR+FXP_;&&};`ZiRO}k1-h>(*N)`
z6fwEhJ6t|lxw)B!#DI}Q^$>{+CLdfDrEJq11{h6|xs13fEcfu_@hC3E^Y25F{!lh+
zkewQYs>pSs=kJJ<G85EbqWnzXd5%jPH;q;E&KU1D2}AvY1vAji7MNl5(cAPh!i-L1
z5xr-b=&&O|6y<orx*W7Z%6M)U6%m!y1Dpk8wybGSsflUJ(6ARb@yvCl0%Um=wamVQ
zOA4`=LApuA2v=B{8~&edOFnzVMcRKm0(D%!?0Myi4Ji5Arm0b#&8X9nhJw{^T}Nh>
z*MZfDLEh#YgL3i%l-T2?qiS5UYw8Fe8i*7tpI(vx9aN9d%C_z*`}u4FFJ=wSDDdlM
zESfRAs7HT<OJ&tPeOr3A_4MV;n58t`U1?6oOcu^$%BmF}5=$EudaF#(f+FBd3&r2&
zYqNQ-{w2?kaSFBWy*I*q(VMDLPkpD#mFzREX%8F>tdw`#Y-{JWB_>Cn{<^muK9-B~
zcnBE*G}dIoqU}tg!FXw8jQbp47}jgti%g84M3hvcjX(yKO@2k)@AvK9DKs8Ln@4N>
zc&qoKkg}-TNn3kqB6jN-&pQAb>(vxpS@6jHzQz}uF^Y<mnDBSLR9<N!W;1f#T@?6H
z{Dw<Tbzx;#mSyXelxV<7kiX{$mqaMiYTAkcXMsnYdOPbbi|V+)dWb)PhaTm5)mMEw
z)v2}gu(y1=%Wq)SOXz#Xo2n|SDO(C^AuWqMqk2&`zOQFSayp27m*iJm?QMI0K1N(V
z6&kW}v>FpH8RX8JHN#Mc3>|Z~up1V~IW~8Fm?&k>jq@qC--|X*5L{lgd)Af9#9ZeA
zg)`mRUZgGetOPg1Qag1y=}!{gZ)FbC9&xTht)0ttnyp!|-53H|GiY$?PY*+}(j42E
zGsd4;`?p_<l7|_&V|II?Uh*foSgubCj!+{w4PM$HvFV{HGbgOr0XFJOU3)U?;AF9A
zm^WjPjo%aul_&Qx*6q4`rixwT*HgRzx%P@7Uw)aWt5-&f5O3Lu^5x;jy4DL_Up+v+
z3Fi!d&2b^`tNxxJc5eM>F?#fOCR<Jj;@qhKRWWG_%akIvem1{q=T7JJLrv%PTz5|E
zOCyJb=lF3#E};f32StK4c=eWQ#GIGCvTvo<25q*s?*RN4;mh>XITxQQ$!rB+&Qo*1
zyS)1o$vU~<eaL>7-1B{g?>^tZ+M@~t=)Vt{@k6FnV51yPw7(!4jCOj&+gg^S*8;8y
z8|tKx@?k20jbClNO<j_y3PBe!g94KZ$M>cq$`m5cU8<wDG%5O1v5(=(yF=}x#m4uB
zZ)8Ay!g-PuQvd{@6to$jI;1jT9Ccb~1<S_L(d}ZP8~xBvNFakfrkX3lpMSVuipaMS
z=hxh!{`bZ3y6ChIV2v$Kp4bWJ(#Xy?m)l?xOdeY|I$pmze;-d%q(e>s6Jl>huEPuR
zrwh@juY=;NIS`NsPu$NU^R66F3QLGCkpGdiBOQ=E4j>0OQli{j?^=Vi!%HZv4Y2kg
z!YFW5Z7|kmO;nbojs);Ea{-v}dx6xMTtXOdDQD~c6Y1{SPL-;&cTZC}z6j5{<8vak
z0{?TB!O~q&V(Aa_tmXM~pz|BZEkJ_B!L<~V7BB20c4$^@*3l0N$fJ|RXO8N=@Mt7M
z0tjdV5Fd}zcW+kRB;EG*8fBJ(_u_vvnKrN31N+~;|9`LjV{Y{i2B6c^2B!{oGCA*e
z<oEUVQ^PE~f?jb?z^7|56IbN7c|32D*j>jKIpl*lO1HCmOx^<$_aRvjnB;Ue_L29W
z(pOfnE&wgHosk}a9@bxK`-m$7E#DG25S%v~bv(za!<y-h^xPNR`}orWOlHk%cz^jC
z?Q^n8_$7Jk6#r<-==9tvGridO1U}ejHpyjj=yspQu;cSYfc|f5{X;~NM1@WRkc6R#
zg8#?UfNGUHAfW>ZKfmXX6%xHjvT6wohAwmscQ)Cg#e>WH89isM%#wSS6`V;<J_K)m
z_BGD#{Knby@l}~m=rOv~2Uw1DJ9T6>L88dNM_i#}^z#NI4IFf&y^InD->UF!`_wl_
zm^gD}=V<F$(jW0vC)<?PqWrVPqruJVyIwix3>yaUAL9m$xpv<3<wtx=&yA{_uO6TN
z8Qu2iW;EHG^*#}fprJt&I<Y7(VBE286C0-RlH*!>ai_F?#?)8tQE);*_@CMBjn^++
zsH8?_>rKEA1=Fm_*MbK9>sBww&N&JDH`=Y6mmloF!jtTBsH>O!zK5F^KnW^!T^>;D
zsRi$5R866y>(+4-<iNzc_7X)Gl06-{WL28W#+CSW#DfPAYQuE%vV;9MUPHE@1PQP2
z%wx9*(m=9x>A_8FXLb&X1~rc_0eTIu#Q$-1+of)mCoqce>Ycfr!mxa8yEeV`jauSA
z88XnGbmM|6`hUWb?GC6vh?cM2(x8(5Pl$LedA96D+UBSFO-)O8D%&!y9zS{h=ivQ+
zqxyf}n9$l&%g=nAUR4j?<UJp-KJ@F)UEvEH^wl~&@Y83E1)NO;4t(JVS-&;pwfGcI
z0rH)F()knLZUS+CCiQ;3KzY*h@TWWrw?}TyJSdm?B(%>c_TZi+Cec5j_3vNjI}40H
zNS<8h?-;VzDwqg)#Q#JO1GXP|l489nXEwSkr!d}5(gyeqQ$FzCH5b%R?KAyyeWGJh
z+hc3q8dcozjZ1QwUPi<%rJXkwa=UX&`(s2h4}y532S>*JS|U@WQWUCaJx3lrsZl5r
zj&M{_iL!gmXN+U{os+pfobyNh2%#WvKKtaKe`;g4J<swd^8siG&;oh(55j>z=6gTD
zcJt;Gi3E=SIOm+~%&ZKurgr8o7KBWkjO<+hMLoar_4ZL&YCqNb;Pc*2H#bX|giCx0
zmc?iBjO&xl5%ds&f<}@e4Dcrb6B8X0R;XOH(5}R<Un+dWwbs_YKtcjlnru#5NJU(H
zuV}IIU6Pi$D8wgC{HShz$&sCXe$4sk1pI6gG&Vl#d0#cJ=v{bM-+U~$x+950Va@6N
zEhv^z3$8@^+Tus(tbtE`LZmrq&5?i-s53l4_)*vEK5(P-04Gvg=j=Lbz+mU#gMZ^d
zZaB1&*6CI(zp)f8`}mwS_~|3y*j$R8#oGxQ$RMH|op1LGkIPmWC+M&lp)daK1$5+p
z?fq?m{~CWobA@`t@2vu?)cNKj1--xhKK%!TTgzJ)n9uR{*g)e+df>4mT?u0#z}@zF
zL_<DrCI0&(H;Quksrk*?nt5TGD})|QzLW05*G$6}cW!tiEOsdV2*e#BpHC70%oBrO
zI+AUH8eOPgFu8*<cXjIbNb|`24sh<cly^aV2bLDL6F96H#JRI`fu-w4^d<O$!V?~u
zRhR|5c%z?GwC6IqRXy$^j`n2@tMAqdO?)V_*pxC~w;?;IA#VKahEb%y*+gkheMY>&
zG)9-JN~c>JxEx%vT)NK*uMW>Woc=x8{1p4tf9;(`ctr2J!g$qBS3V6p1$3Tzoz8F=
zEbas}+FB62b9cbvwcV;22Ddr^vej5a@kMupp&xPlAEnxY4xveVfj=(dqIgF~Udmkw
z1b@B-u&#b03EZI{7zHofj-gx9xu!|i7zgV|?l}Cnr|WUggQ_9ldy#hQkm-OtHe-7r
zlU(t--^}u=6d&305brk-02{5d6sIzipuc~lUC6vSw4qmG3fC<7deCJY-1)czZ-ngg
zmg?XO!)9?_DS&+25_w`m{nulh86xfOe47yHf*yhV{()|Ouzi7bA<jrUX!$+9Vrb}h
z_`7T`Ov7bbZSdEd938$oWV}{tG`AMI8=QykO=VJPul1Ii8=Uowu?MT(JJvHSiaIJ9
zh;{fIX;rk8bW}9r2(pk9EnNr!GB5o$Oo#AbAbc!K&NGh>q}m2=)`Z~=C93y&4$9Nu
zC+!$nC&e=u6!Cm(_%@bg@C2e)_7w4S;a5_kIf1s3yHe+JwxHU9wwZ}*bfCVz4ieV0
z`wA_&@Rhpxwgih4bp0tpo@Q9wlov#mVYrKU{C_r13^EMYH_Y%%;!LstnkkboWa)wI
z2`!`t98W^zt1xu^Xd8>k^<#ILEDS_#auaJwxbiS`Qt|vNy<Au~3I&;;kQ2iacKD5X
zPrgKhf)05AI>8!(cMqg`a9fdVuozp?C-}ESTvmB^J<7XQ_&13_FkD*^-#WyW0o`0}
zgrVt_Yu^AzduG@eTPbS*B^QR(WcRTg1JC^N_9aCr3CYLj80bU?OD)7`Pig50JRZI!
ztZ>k*#zu-6W&{s!qbyb;jDJ86-C?@+yOh92%d3PPc9Cy)`g4GqEe^=v#~=4*aq)GC
zKwHo+&?)H)x-kz5zP#zBEf;^Fj%EC2$!Z{VPOswHW{Nx@@BVwhHTrzL0iaS{$h)IR
zfi57B{i-1M(SV;d?$Q31V($K$P^Frrv!9!_AwTAqLLTIxu1x8*^gVb=9^jB9>921;
z%Z&oVnYv6c$b`fnlZ~J&UlNilA;5>^j^xkk;r5eIFBzwkLw{iWUJJj+`Mh15waxvi
z+_uTb6rYsL4pI&Pyp95Owx^5d7+%A>X`y(X3M2t!V18i_2zA%K#|wzEaQfPx0I0d4
za|G7mocv9Gltw~WQn1a{-x$pXOgzZd^0ujLP0;`MiJY-x6TW<ccd9GRiC@z;PsIKn
z(r#g_4%SKyr&<DycQeh|#z)|7(%_#{l9(cuv~L#etd<r)zNXaWCuAyQ@`aSP49A73
zR}$`lsgyhda4845F3~7Pm^cu$0%T&!?}Qut7xw2@I<+_;FmIYb*p%w)=ho<=azQFZ
z3F%WHNxoG9)`Es#MDH^Ux^=>!ocS6CXPH3z-YfRN1p&R^nc=U{Q5p$X1dv?;$kvP#
z`UK><rdr&9PL|vXX!5qYM`s4v8{*O8;~*iQgN7hSpM!{{EeWBcyPefFzHx(+;@b8T
z1Ad(g{&NXRc^NDvX_&F_+^jtCU@UR0@Z}f$Xp*K>y(0@?z8%I;WV*yA<|y_kCh2rB
z&)-D8zj2uyLX>O%Hm~C*NlCBi6}#1IX$R7vI~`#H0^h*qBFAqCiSxoId~_l%_92Ex
zJrIqQSYgOU@@fzYMIdbcZU@aCJ8AKTzThtobxTKg|0bz<{25MG#?x-^_=p4Uw{<~8
zv?3QkLxC_e>5m{)mn5WJ@jQ|Zu7de0obYo3{DMrp2<!wYx*4n4T>_?rBmeqt-unIT
zZ#;A1UzMr-FghsX?b)U3%P}&Y6i~V+pneP2ZZ5w5C}q%1>7)L9+yU0JQr$|vD<==^
zu_%jJ8N1ibQlXnf5BRkOf%UH-Hp(*ITpASu?glp#S4Jc_Qs=RtCBMFMs?x9)Ainm*
zXHrSgrO{EK^df_Z2+#zJQ2X|Bigr@4APs^*KxhXfbiMQ_(&?o&u#n_m{km=f6MQH^
z>Thv`;RDe}cw{P$Us(c-zjWrdPE|u@T(_;E5E`JG-PrYuK4ywP3Y&_Lwy+)%O}!UP
zXCJ7Z^Wgg*zAYgvoe={L&k)`>K0(J`=dZW;L`Z!3M2iLG#l{WuM!6`*z)l2X!9|o1
z00`_9PyJ>}_#{V6#X5vXMs-+VoRWqD>0ILPfsC1?LxFaOLxM)&=y46RMF1P8UnSKP
zUFKdOjGi?iU=N-2iw9w2&7kK~WaWqvC*&`7rxaiQZ_%4H=#x9MiAnSD!pUz^cujfA
z+Wy#AkNC4BqjEU@%kM#~utRybmse8HfZ$P)PL4!~Pd}MoQ?S$0Fd@>JK180s+ssL6
zG{l;D@(HOhE=eHq9^w0=1ZBD$U=S}9{YkO&PH+MpEJbql^W)LBfRl+#Yn7PWq8QH!
z<r>tx|BTkHf^;j&pO5DYy^?tPa<M`Ij1*$$J-u2Ks)1%&NS|g42jG5JZ~(dN0_J_@
zF<v(yb;(qJFf7g1FtzYE!F}Yp<+Ok8In6^wfJuTL`SB%zT{LCp(}knQv&&N#6Jxal
z?;;Qz+T3>%7BKq}^8DErIz{x11t}zsW5qxvUFk!m*VV8p8X_S{xO=ewy-S9*AfYvi
zY9smn!9Ea=gj?KdFd}5;_y_+VhAGCS?+~6%@|-}jp^p>zM-Z_bjg%TI-U!h8Yr0G{
z32goKPq7fs;CXuBaQtD(S*gg`f?LA7|KT`VG6;ka+JK-_Bu6?>#$pAMj(>0~m^t#1
zBYL+dy_Bzi4yy>z9%whR+gfM;PPbnCL!NI-Y!eE6t3G(zd(q+YY!i6^34k#Uo>eq7
zakF!AXXW4q6dsKsh^imf2TI~+_}hecRe?O9c-$i;P!Bxp8(Dbsk1YLm5ft~y@OM9<
zg<w%tsYC$(8A&NK+<i<Gm|+PC+zLW+{+qBt+uI=!U@+g{htMFNcV<UG^2RpoTIn=y
zxyx2)cVCFIqz<evU{+hf4S*vaIICq(U=aYm9AAYD_=1Ak(M#iK8-UmKWt56<A5~D?
zx(Q(c8t`#i28E|Wa|JId5dJLUNDV=FjsRCCd$iY<ET^4QD}RgAsZh<&5@p`#*K%3v
z7i0G5%37yY5w1VH_W`oUEgP4)4sGvIUZP9>I7!s*#vVx8$Saaq0Bi;{BB1Z$q?%1j
zTPJG5rqten7?}SG(Hbbn51y=1AUUaF$}XXHJGQ5zV(J~{joLhwVN_=t1(|dO6}}{(
zpg@jI3(78|g4KsyqOFS+=>Y!~Y4j@H6jPGzfIhN;fHqSV9=m5-NN+!dx$XBS8?CK)
zEU0xb8?8<s#u9VB8xV&d^vEL#!aT?iVTo777uPoC*k!~@(Rxg2!X9O|W?^<`;VL?H
zh#`CsiO9z7drWY^b~+P>>G6IpvW9>ExD<wq;Dy_)af-(m=E6*csn*FM+aW>!7{i@3
z`L5V0GF3LCTVu)|9csN8RUT)?9&;YWx=?EhAyH|)DC=0B0T_D{p@5X&TjMW2PcS{_
zb2hRf*Y*_rA;P(``yuL%$6bj=SD%BG5${x^Nf&v7XG4>d?*bEV2g_>%%j1Ll=#Ik-
zz6IJf1#(gt{ANoS1T7o{eeAy~WcQ9vaO7Ts6AUuRkf;W0q97v4v>3}$OwBYii#;a_
zqH*A?slD%h09^auY?)L0d>^#o-)bOUt;9Ci=_f|vIG`a#BCZU~L5)z>U^jmZ$U$(9
zv_Ytopd^X!T7(&s)!;Y3?vFU&A^q0%VKV;qeSML=C-d1Q^O=x&JxjfPmBExxoY@DR
z+1Jh)QV@t7$t5c-)&KLB1L!~4_^|%8=6u!b8)Vqk2YhxdzC`A(tbBo70G8ibASTyH
zYEP@!WODlBqCdoCDy(P=zvo_0=jZn3x(gx26AKk$d)TRCV{`CKYX~ww7xD+eAFPJS
z^?6)Ye+3`p?w1U5J5L$T@a`;V-&t>1vUKo3-`Rw@jgbGS>u_X&kFG;tlC1D*yK1rx
z?)<%z12}Bl4tL`q+Q`}+;$!>R#JP~`aRa&AcG}L^PPS;@-mcu{WZrbA|0A&#KFO@a
z)|wxD4Sq$L{$u0OS+6p6k@zj@9pN<0Jm3YgF4#RKufh5dd3V<?+C6;Lyv__wDi0m@
zp>NRjcz@FI=km=!qW8?$+dpnyXkI^foV<7C0K{`4*B$$O*}W4PCa&)^iQqRJH@6p+
zg1~HsZ!w0My5Mj65%)%Jm0xE(eodGKPf<o0S>UV(;S0y+m(J$SktUexR?kePX&zG@
zQ@JIin{Wly=bW5tmf#n9xt%HD$M$~_IwGB(OW}kbL>vcASIh<;_T3*}^u8}`9v|X~
z0^ZDCuBU9TfzdpHB{^q*^+LelFcn#%hwQo!A-r}PNhH|Hz}Sj><#D&@3CYVI{zbJ3
zk)4;lKQ^F|U*8B#cs8&;jre_xxc-~voI&)PnLhtFN5A~Vpx|YXn$7jSE0c^`jrQ0g
zpW6AxGiJ|AeHgy6RV=s9p2Xc93jI#(znolO3ct%+Jf4nC_d|>DoA^T29wteN!lxc4
zA2A=bs__*lOE;SqdwJSj>+qxZ4C4u3xw!o}qd97Q)hGX2ZtOcTlI$Ky)|nTV!{*U7
zC~wo#2R|N4Ttd%&LIWHh+@0OTVh94A^8lqTl3)YLreAnRF?c*pd{`!u8^yp42Y`p%
zLY-oN#DFF{oIpIFtYz|8iA4<|;!z7EPT~duVn$qIs?Wcb3bVSVVtv?k=zRzx)z03Y
zk5pX5qy9R=;fp}d(sd+|TG?Ivi+HgSj)leOiP;u&W6f!o{snKIm%QK92dZj9e^&`r
z^9+esCi!7cPB7^=y-T<^H~tvaj{{&fWxOu<M9+!bY1I_hf`US#mJ(F8uaLkL4RD`n
zQy0#R<h!2=e?Bemt4&*nurVfc7hbEy$^%Mo6A9~yUsn{y9tbv^ZO?~3{NlWvZ<>GB
z#NXF}eY<0ypP1)Y3P;(w{GhnUe;Gjw{VOt*8RWVO<4B}!LE|zx<c!zp(g}zPrJclT
zFxtdFr7nHRuOFj0XwYL|jZ=%Cfbm6?Bk+GgY8Sic2|*5;%g9*IsImyAqNb&dP~&M#
z`;g~*TrTJ|pGx0h@_uebAJ9k}USv=<RT#4s=zWh|ec8I%9oXtrXdY829v^d7V@aM|
zNoxgGFodzhvom{+J3*0h83h<rn+_12g2LpMSKZ>9IXDLjT|4~Y6+nV#)X#iHLouW#
zfT*iY^T}R#0El~`{$*NEAqm8Jv~3dsL?`DS{ej@dwFQ>vVE1IVV@X#8wI=c&QN%;x
z93MZHpb!Z5e&WPmaZLwBM<R#wKWrZqCs_bWZw!Nn$ngBG(^Fun6#|6knM8?aZ~@W+
zYsZ-1=qIVgaV2!2<i4S?;)JGpD|z>!4!a?`{or!UPVXTQpbkLNvcySHaj$>DK?G$e
zR=jqC!JdU05cwiy6@eDD%nDWv_}SdUzgq+VO<7c<4Jb#=dqV)Fd4?L98<`WTYtF$&
zRXF3yono>(u=bDpuK|A37VWZg1|gZds-oAFhl|4i_x586mIMx7gE3dvRO~$hUUv^#
zr7}d@?cDXYkEhX6-|w^70oTR4H1ww5aqB7XFyA0O$UC96vc7wt@i81dPg5M|v^otY
zcLVPB-5=>_k!rL=sJ9S|XP7^{Kxdpo8DRp%P~2*W&XK6%uK=R50pp?t7HXGAY?nuB
z7g}Af@IJAd5kEJE381~7a3gr;^0piuBX}?qhi{@Gtg*jxV19=nmzs%l8LG9y<*n~<
zT#M=<0k?ufnHEv1%J-3(;NOygZU~LW(6q=N*};)uCcuOe)`VKB%G$Q@b;c;gt4Z${
z9KHFSurlrq_JEzX^K<9e#5p~P2;Pxgv5?abm!_p0Eby8*22_hfYn`Y55T8zKzq*BH
z?mDyKyvmu*LD%FLt)Cn$_RcLA+Dt>37{l<_UV>$9D_GcKs*EQ$sQ``X1YGhF5s0h<
zT8HC0Lx@<Ge;g1S(yYbKEmb^(N>X5w$_U^fWp2ieE5KTbF|-F5J!c6*H8sRiQa&<!
zt~f-}Q)Oiq0uNtMFVIN#P8ZSITi<m7R)2Hz+(d;mM(2~W-q!8o2iY6ANF%*xX|(6j
zBbmUZ@8grMGyUDsk>}Mi%!PALs5+qQ{8?jRn+r!j90lr0p=Y`W5-Gx%C1e)6wEVaF
zJ|*<>DWIak44j0euyNg`S`)ATKXPfcb2T1yNcEKJY8@u)pqiPce%`olE{|fn)ut^U
zSH=~?+Hm}<%0X9G;BLwSW3Q6Dyh9Da8p}ASXPlB<3U@ZJDmFKoOoAM0R`(E4rW-wm
z1J_@9UeI4i!hw?%j^hBmF`B2N10N8h?s|3tfPuCgp)3~Ngen1q637-<p6svu`fV1?
zrzg}yy;EJ?M+@PzEPOnfxNC6f7&4F~l)aodCj}@wA{{RH`@RscSA^0Ol;B-B>R@Ph
z`FtA85M{Dh3hQ6-5$#-|B|Gp4*STAp_ct4ZsVS*5R*`Jcx?G>*Aj+5Rbd9xiRP^wv
zfE2yCh6c}_mkBe}nj>vq1n=~#H3MI%vi)JU75oYIvvJ{k->;w@dn?;oDxa3F#<D7#
zi3U><PtTf<7d_?H$*cMxAc-Nt3!-n<1R=~GIR{T%ET9$@Z2W6xY9HL03lPa=m;$^|
zGbGXMJIZ0)kqBBEB6(KUwI*#re{9x8z^o57oe4Y`0hkzsfVdyDjB#RbF)<J`pg2%_
z{*cXN+b=jzJ|RlDO$#}?dnp<v=>!K@lgZzs(6nGqOTRak0nu?qQ(jH&mIz@H8}^Kl
z9bc}<`?O?9AymGC5=JYC5Zs};ncHAU=XCe=uiCM;F{HA-!Wf)1@b4T$@)?04K$8M4
zNmCDw#TTgmtn4F)^aYDdv8GaVH-D#yRlU1OZ3_2QWn-)4iX=p@z>9@reH?(cZ@l3t
zjSw=ZhBY7m%n96R7B_wU(WQsEEO9Ap-Q>woN8+ReL_RqOJmN7pidX~D747va<M0s$
zq%>h6_S2WUisZ4HW%(TS9U<foAQ-OH93#087zsr+g46NsYp7iUW%fXjf0pG@vkqSd
z%Cdu8R9DOdHb=az2G#-tY8%@D$hZP*#&4FL;`ua2CRfYC$yE&dA2qnEt0<3B<yVK@
zT*C+T+IYD3{f09`uesmIuTLkVs$y5iwp&f>(PM`Y>Tx%E-3F%LrxVL8fJDS%HwPU<
z+pQO<<QlN<{)t>6a0~S75{*9>POo_r3E2lw%NXin6=qWmb}>!U=Z0#UDUhirh+vTS
z?xGD&Aq|Coy>Uk_UNNRjt`gvDd*m)h4ya~?B}lB$QT~5s%q)O!O2aYb7Ep73Ajd<A
z?SI>0s+K?G)KpSC^fB5Q0O0-xf~k(>O+`V#w?c>&|Jmq-Qwd=F4L%@<2Gw>k)s}-4
z62NYoRzj+xt{TEJJ)mL@bot8>>`#fL+X>8fLm@OclxB``IIVaYPlXXy38I{voQN|K
zO0>z+@*zqvcOXm*+has-rMU;ju=X_p=BK>PTt)G}k^zt16*d0TodCz>`c_=$n^VoF
z;`WKu?}maB3z4F)3CGZMK9(l(jtl*}n_7>qa$7s=31%DqC(fFkdf(V8z+~3f*-nL3
z;2al)ola-xq&)+jTgvM-w;~q(Cy_-SUSjXjzhy0h_Y)909Wjf&KcN03NE!jhKv>-=
z@y$^&w`vq)$yzi;FaTvSH&s=gh|K-9DOElXwjHYK#+qrZlk>^zNnOQ;f{s=<L3|f7
z5Z@4-ads8BMVp$P?B>SH2pIkNL8K*9XwOTMqbPS;1@ZJmlzVlxWv&Pj42yE)AaHUH
zF;G)%!Uwow45fR<e#>mZ4k=ZM*${k1R`C$8LwX{l3fT6Azkovo+);uV^HCLa_l&CM
zw<M$ca?-I<)I^2RI3-#B;<V3O)Bu$*w)k0XeE>OF!-8}~Sq=09;Vf+RdGtoJV@hKz
z>3BNtjRvs-8D^P;B$+U!pipmR$*{O(!Jl7Xzd^}KRWPF$7sbznRE2O&U_@<BLo4Y!
zEw6QUaz-n-xBw6AQ>*;$VlM!lj}RW^8#|s~v24C~>($yy0&hnW>ULkLI7)y+H-ybP
zYvYmOU)F`qN0lfWE9B=krk>3^+f5AZ0#7;*S;IF~-S4T<!k^O<y)WyvHw2uTG?U+R
z>i9CqMBhhaynCsixxc|PqV-Ccjk9y&U9;vUJPsQ+K>+%4V&0Y#YcPZ7^K@$>?Kr+T
z=P!rXw^!7SYX=Al)nAG+)|^CZHgg1-vPzzgetx?i^)DV=iMg@DUCFI#DeG6)9ZKE&
zGrqX_8ryeBXniGG{<l~l8Z<`(x1zqjX--&uTvZMfIzZruaKQYg^MvLA)_zB&!Ei9%
zS=28_VSulR<E}?R+om^eoM0aTLV0W0pYMXxrq$^`0mS32eNDj<g^cw9E-iWf1e%73
z1K3q7c~1Kht6F8mh`-4`o%S{tGcHrEzIM3ZQag{~#csa-Q5an*pBfh<%lSMg==I$!
z{%KLO%e|G*UftVp5D!361j;&#ygo)}j~Z)@o&h^a8IqS}_HP>mKYv0#yCNPWj(h6S
zXNL3@=w$ffxf9k8T>w*d{q_e8d$zBMD*b<-qT({YzJeg}(?Zh5VufBj@Xgea$2`&u
zPLW2+<`q-e9;7G!#91~d64A=}C7@6Hi03TaJM<Pws|)?>=aR0#LmmBfs_5|@=15?O
z43NbVOYr0ZaRVKor63AFa*+gUzuS<2VmNbw;6qEA;WPBShW;&Jgc^R3;>g$mJ>qgJ
zX$Je7YO^Gf%#R?9i${ZtTXU7d2$_{`(m37G08#mmOd9)Qz(yLvv$PAmH4-tJlMcjq
z64S&$5VSpy%d%DqTN*sS$YkBftt+TKJHP<-`l?xpY6r8DLYkWC^+l81Yh+|3IfymJ
z+q<Mn+J2J~HXf`g%3?uKn8I=ddJD{v4WR)Ty=L_F0P$|5^hNITg#VbvzIP~>A7dC&
z$#>G{_^&9-=;oJyX)RC=E+v8L!Od^I`v-`y{L$a~Ylb&vI%6(e?2xr%DUotuS^&-E
z21$IZ&><Ui?ECw_n}7aJNBv1?l!6HPooSqH$%J*|1Oo;sFQJCTJTfISRkdbW4+U>V
zVc9Qxl({BolC4PyQ;@F4u~3>mWz^r~2HWH&r0YaDo;0n++2fwZTEY!}8vLbhOAk<X
zM)_3x*NE+uH)$1}S@C_T$B&aO0Zp1En(d|$I{(sU%`isDXYk1RLMJI6xro_pq&^Db
zo1jl9V&lk%0{$EsM-UWDt0^W?3&c%Zf^sZoswxyU6KDM^Xjd;Oj9C;yGLfN<E(N4h
zyeTPcG?X46Oj*8<WwmTBdu(uRrbVQ|#!(dkVV>zX?)wkdck-HDp8Q(k4Y<kfZ8F|?
zzp$6<&ehkccRu}l(Y>{o9&&~DFu1|~zxcYQ7(t>g-8QCsrfu7{ZClf}HH~Ub+qP}n
zwrzXbp2p6f?89c0-Q?z;O6tDchpKaO&WG;LKR{bSH+=xm{l|a(So^cFfYN1wEaMtk
z<~4?CIGv2XhNx*aImK&iu!V<#W|Cd5^OBx=9Ryqb{!nKV`Ssa9cr!8hoJ_t^8qIF{
zpfM#l^R=iUbE)Xhvgh8?q?H|z)H!aoX0>5#Y{RZF*!wVrn>{v}sf8(2UzJJBR)Zeh
z6K;-@o16lkUCVVIQ5{jAi<MJwUuqzdCcu~XhNl6mIqSmESJviy8J?#CCAJ70lzie)
zWF^Z%)CK%AAJRp$;Br0e6lbEgiPYqubntpY9i-~SwkrJP&akDVWnTxZA!JMTgBT0_
zj)NFyBmuR3Pkbsm*HH!iTR9B5qE=Ga+xhE4f{*WFrRwa};VXb)New|=n|A`|-2PPm
zS&(;m8ztwyOQzkfsz&deS))3Ap>e9CyN6(g^OMre4tw>oG2Q&v*QFieOE?CD?#mP1
zj<>7PNPu!r&Ddji#o`s<(9a9EIWq%sMS;D-HT3r&LIsh$Vwi`aVyh!;FROQ#-q7Km
zRh-rQTqv5z1?_RUsO?%L>hJbK>os50U;RiO%4gfVG#^KTgZZ1&dCi%ky6lKr{qSbe
zcyc!U$P23PR+Y~zNso7`qDly5Hj=YqYX~=iVFtQR%FRx4bxGX7j69QSGG~_SOWIDG
z<zE7Pc^`rrkK>uFmd*RaqX8MDom${4MS*UIb+GfkVsUl74ek9*^H2Mtg2BrkbQM}r
zj&E6G_Xlz>nrQnp*vt7`!H;%3s`2~Kh@a{hkZE+95Iwzck+~G<S!oC&J!2N^KlMvM
zMN0f7N`%DBC9qY2SSYmpzobvZhoWecF)F3GpaZP_5EO=*4_5IZzm{w|f5-{8Fk;9V
zqMzl%CK5S<@GdPvsm}X836KX&B9s3!0lX_oD9bw>gqJFeW`!3o7lA&LtnyAY62*no
zlnIp;4X<rRHTtM%Rg3HS)v#S+j;W7BTZ5Rq0yUvP;y)7(?2V{xPK;Bs6w*6tj}${$
zn!Q+n{UY772zVO9lZip5353@M*Igb2JDv{9Q@L#NCTwEoQbH8Tpa1i`DM7eJeS^;3
zzNVHaW1?PrT#s*F*079Cm0?X*UnSGM=vX$Pi5r!&8;=UUZafek3y*rHu1vfdUd*Jd
z1Vw_jrc_o0BvL`zDOG+c2S;|Q8W$)J2?(;xP}-<!YnxVwYcRE8pE`lM#LOo<`>RmK
z9CBAfw0Zb*X5QI-B{<DF`Ri7`<F=JfxgS<y=i(FxL6s`<+Eah$mI*I_1;dfk&CeyL
zUBKs{X1FiWsz|#-)mrGEm&WZ;)vWL5D|1fKWoGmM#;|F38VpI*U2XH4497Z$J2ZM?
z-*mj3-}nAxJ+G8>j~xEED$D9&X|ex+$^`Zqr}1=qhAdemYyl+J$x#}4JOv+z5$gyH
zI_HjC41l$60h@^@3p+|ct`!SNQtTTLmxc(R<{B3-YSbo`>ZGktP5E}aNl9ByG9RbA
z80QMWfhmp3D%%Jj^TDYqDmI;`(o)5qr^fP?MUVNYmf&T0>o9>cv15}auUzdd)W@Aj
zig5}^sp)2OV6%R`RUB9<bR5Ax`u#kpb1V=2rq0x_*a&)>N-h(e6EjArOFqDBb~zgB
z=F)bGYnTsa^{r5Ab5xSnSg|x_i8G@~<XIVzkfh6oD}z<zFVmG}-4p-q<pnc`NrukJ
zfvA~(m8}X(29gQC3IB6kdy3D;>gQ0I%4A?kY6^My%fff#N#1}C{h(AYsw>$=>^a!-
zbV8Bhv4V9>6PIzxwMbqLPkP&sS`|;oTgSlY3RKOss(w_hw-*{QNWHyURMlGa_Wd|O
zM1yCTJjY8^>n2rL5~f#x2?>CBVpEBddIPV|GDq6%$2Ux%ok%}L4HryNDb*y5`gTgs
zR^Mf1++|))J`Hj@t=dNbnQ29v>H?;b<d@8(!`9TUSVT*&suMWp2M#j2$>X>`2wVI*
z7{=3PzvFpQa=}^-L<`H$T`rqlwBG>Qcsi983$CZZE(UX5rQc05LmJYQGiz!_9@|TO
z`Lk=R7ixwA-?m<~v(k)KK_hR8K(Y$&1M#YO22V}ZxAUNL%P1ki_0`E?W$0Y{%D%5z
zuiM=2#G+=Adf3K~?m`BR!-r@0noozO2kYZi*J!{-w@TmePrSUaeJA4JKw1N=$$xDP
zzODPVaa7B=YZUbUf)k-t27~B`@S<nqx_zT2?0W>#S`$1yJ_Z8?f77HwQ?QrKng~Ey
z+*u$$+B4BwfTQBI$Wn}ahqERjby^qXvdzuJvj!&%Ag(Tn7p{SWH1+lnR2+sTPDP3i
zH6*N(z)Y6E8DEs=k>d>hczFj}6qt4(I&R#huU|HD-Jv>T_Scul4!Db>YvNj%HeUEW
zksCq?l3f!g#|Ah@2d$;-imGMwtIXZc85sg?CmpnOVKI)h+vKm5<qzKrXK*RbU1`zD
zvMS9ziM6IpC6jx6)$4JI159o1K3bE)fB1)EiZ6L@FR|t{{&AOA^G5)vk2<TY(gVpG
zEX%_7AmyeQ<uq9Klj-%z6$rg@zv&b=r>XPvE4^qPO5w$I3BIzHi;6YPP<^P-)wZ+V
z!3Ew*Y&y0+J3%b@70UiFv|KGD%h-<sUkeUQJtfD4e%X*Oa=VuP!xb*)0lgh$%j@MU
z(DAwn0ld8{tgd0VM1KeP5We7tc7O6^6}pA568;+UW+HA5lNp+l?eSo1&`X@cgypwE
zgL4$MKvRcF+2=Rnz=xs=<nq^w(ttxik5u26oTGu?B3yoOKx)q-1rd`1GZQrxS7~yA
z!&h`HzM(Rk{E?6Ns^*fl^zEfC+<<y7R%OUux&c=?WZ`8}=>`_~WsLhE9=$2{G>eB=
z6gf;28MT1lXZcV0UXyg1a#cmze_rKBL}sygx#pxGv0hfa85}IJHp9+##IG{x0+|8h
zbX`Rz=!N+gdx~a!NR+m7%9$*lnVe6T*p7%wU)Fy;C;R;wVhrlOF6sABaLEl5VML_d
z+g1gN0;sHv%!^HcGzY_xQ4A&Pve*vwnN@F|ujy*f?Gmi2V+@9D_#yGhXqfeB+sIYw
zlg+m3)5q5K^JC!L<WYK4%)CO5$axgHeJ%T&Inv%gua!xKiu6~I6&P13o@!=e7O}iE
z>Ljyr)$}rM%i{CGHTe%7)iTzBgR>xu<wli;;;eKw(R2<VS$@xG984kQu~?7lFj6)j
zN<yD>&(K9IE{L9_xIgVk@v`&Gt(DGsE>K+8Aw)yJ-fbxz*>3A=MNQAztD~L2^<WzL
z;-CS$n<w$*DKmI=M1k)S#h{h{al;t7M1PI3(db|oiuWMyfYbaSSWbt0dFS&uKr8~C
zR_o=7L%9c#`oLYGc4J=w)0Gm&XF8gA*Lu=wgTI7#N=fIQ3Ov^1Qg(v~Lw5`t4bPv(
zi_^+7$qLrBhQiP)W43cO!BiuVr_(C)zOQHvtcTaLlAtt1+O<*2P!UD!%-1Wa3yGF=
z<}NvfP-Bp@E{6*_g?cYv7Kl6BR%R58q8oCCeM$yW5y_ijT(G5L>tq{Rete<nl~3uq
zOaCp`UN>X-^|pPT)z8!8ZF3balO4GnRCCc~zf-+IGZD@u^A*^DL7)A?2DDe!f95gJ
zxAX3tq<PeqS{<X0E0pPZgT0htPW8LfBwLspGCG+0(a}%G)V}cwoe(++nbtPkdXF2T
zj~fE$@yOtTOQ3;AYY;)wl!Vg7MERsqFvc2T0~Oz$wC<PmFSCYiwh_$k%O{VQQl~1I
zGE!P8EOEh&*m*$f-2eF&&Os}iDUg`k4Jv)pTHHZfYNaoi*G|$?8n;QSOd4~tBoA^b
z_xW_5T)t_Wd}?+>Vo5tfSW4|TpO=N6r%wj-J?ZJq?nz)F=Z(fgTvfa!t;*qN;7F!Z
zQ95Vol8<T`fBvFtPyavw?!wY5u)Dpq+1p+J3Y<ziTbzu`Y;%sCw0A~mhkv)bZdkx#
zckLK+d6&pwH>tHEFxp$ZR_174eDv^cTVwVz#J>JSSSjOYZW-?=O3YthpR{d@jBEfL
zv9f=g9sF(`=*E6t^>Shu(z(<)sGwb0pBf(r2j{MV)Dl$)3j2=0gm4`VL%UCQQGjJ)
z;+h&|IDyiMHTL6z%!73vQjjEyk!5~4QXD>~?@k~B=Z6|o?8gq(P<b_{DMopF?f7(1
z1{KQ!8U)&{Nwv!6f=O2zb^nzkZU7Z9gELbfijaE6hzp9Di4-dDo%ayVayqDjAg{ZK
z!CC0(ZpEzjK1|i=ejONrQPcKyfipoP9iox>J~xg-BTP0qA4Uprm$aW}(_DLzg<soa
zKb*9ZXHUYXToGzd=a03tnw{Hzq76xUt!n;6{(YYI%UDjnu{6*!fd|2s>;4|liBM<J
zbBgh7@-m$!dkySI*XggD<4bL*Ypt;<{b?>g%~p&zB<nb8wI3T&ZS6NX7}eeBu$|4z
z&R{P-IAC+aq~Kp&b7c9@ycUV`%2_sYuM9Ev@Z_YSpY5BTIU5L92y4SPl(Vhm`}3}=
zQI|4g*d(i~Ig_|s7v7DQqMZ&PN_N`6B3ccZ+)$MjJU&Axd5NbSaD<c<7yVaBP)l_N
zEHXIYI*{o_P6*@g=F8C0w=eGJ-}Q@GPKf<I27?uK{gr|}wL6}l=u$g@mQ9Zo%41HQ
zuS8X6hJyHvK&OtoPo%t95e|XY?U{`g7ZkGRNh<dot%GKok`tbz45kPq_E?azXbb73
zE&r@eO$WX{{475xG&Y~RuDY8iI?(mL)7K1V@8~{vxE{ClbeSFc`@7bWMD4t-Z@zSf
zbkQZ{RN}plJIvIsTsf|vsH*ArobSbykI%3^0*?3XMlo!OX#9=~<<Qva>tiE|<VMTB
zv6V*U{NO_OSfMKX;F-W4g&>w^<{pb+&Mnp{BraKnTj!|Bn}dKVt@@#c`Hg@@dd)tY
zAdCyxl(ob8k_zJywSFLO6ITO$vGEIAewLQ8kgp3ow;$&en`}V5D#lb!s7`F&l<mTw
zIVQ{NzKrkos3m8EtSkOVi|ZD`dd8|gP=hDOFq*f}RN&7AiT(gGX~IA5r0<>U6{a99
zMoq4_rK0+Gvpl4B-W&QQC4})i5WLk6Y0Od?lL$j<XY2d;jCfXA2^5G1E3?q)j<mi`
z3Cc_p+p{@NpR-%Vl!Ytef|BLm5!x8^$VI;Wnh?kIQ&cDOv>2n_zci0RR(|}QJ5pAs
zCY2kOPLE6qbx#LwYMayxhsz`*v8XM@79M^JF)@f}wfg~zvUJgG!4|rVO_U(yqwlH5
z7<^@PglOV@HZz)3`6Y=cS0D3Z%|o{;+5P)9Hm6-ht-W5<%_dhdKDJd62JI;yPp_^S
z-P$Xh=JLiLqaa>iudePNZb~{dd3Oqa<2ewSupY2|S_uIDZNkZdB09OiG8k0Yl#4K(
zEW@xf27T9kLJyx!t#Zg<NP5Se?xvhyFO18)5thHHmbft31Pb7^DTz0pnX_)#SzP32
zgGOb<51MfV3$K^nVpdj+0rqX`m`neM)o-<aL@<ik-yU%lN9v9o4!C;x2BGV>-o?NF
z^z%jfc?1Kzk5-KdrkJuTB>SL&UCAZZJI`PxAmCEIROEGLunm<_Qz3T2US~fI7??hP
zS=#*c`DK}XS?HLg(kZbBO-U5yl7*h|+hdY1O?akc*7?QGn?nnLKB$TGLTVifj7^p4
zqT?y^o&#UwFs%Sh`i|9?qyn1i9jwU&Vx>wO%3K7DO0;W6*c2%#n<FPgin4BcNk*GD
ztYX>Fbp&@MZcT-wQk*wnQDFSMYZGpZE{i*1x_9|g-xvDGSi;B)Eqb*VzD8UvszJ%Y
zj8d(hJu;Paa?z1SWR}nvfn#L1tAD7!YY@A$w-fgn{8c=&AOq!GrN7Jqg@d3l-=}g3
z#*hf)66;Q4z~Nbd+8u2`Nd0`IjR`f}E4!en21nxdi<chkss9!nJ7yl9ww$IZOd{>#
zqq&!<U!Km&ULO5J5Iihe5jk)BPv{^wm8Ou(6vMsaBCkMMF!w(zH{8CQ)C}xby>plI
zp%fK^H!=&iB7qSWM=BxA=gksRzeeS&SA~0^l_T_%2z2Hh=P`_4Y2V6qT^DGLFj~|K
z@US6J3)G$-=9%<^%<2xVSz$222)_r3-kP`i5dT!}(vKG<H1%HqH3EByos^D8N>7Lz
zWu#@e$@HruFsvZq`Po3goNg^vj}9)8HCZ1tLOZB1u+Ev4b>M;-X3|HSEde(~1Zo4&
zgUT?29ij?A(wuXGZV`Ro&49T%DxAbTN@FG|VIrIm-$M${=wr$Z21WAwA{P^~Kb7M?
z8i7HQOtrJvaiw@p>NtxN^vyBhqRM)|#D69Z$FbKf-a?TCC}&DP>BE17qh9U!=De*e
zuH=j`6y@9Rf_A?CR^?jYx)nJ_p6md=$1vVgn0<SFMA_Z{>jw|Zq5OK3e#h|vp3_}8
z);gdERx-v0TkMS%0cKb?md_q{#*sE2VMr%o!J3VUqB9h=k479yqD0)t0O!_AiOMxu
z$2%cSS{=EUrCN=WV!Bz;eQJC%#q6m=MNY8m5j{PdiQd^yg$;UZs1yY<oudH+k&TSC
z+uq@G@wp~^v#RYC_QMhtl0tieCC)E&+=Z@`;|L-;Ec2BE#s98>hNiKja3){mQnTCj
z0`>XuIzmBj+}&H9x;pF~sOU=~=tZP=;-i@74W^1_7BBpIyI-wkqk3+*QMhzTZ3*8Y
zMNCs2A7%7Ma60nGQ2eO4r#dvSP>UTf6s|g;9;$uo7m<%|k%Uz+%p!|#gnC#?`-gh3
z*3fw##F3Em@v*cutPl0pF@hII?k1>G*wCK(STeD*_OKV!Zm-0AZ4)-m=k|T#vXaTp
z`EItP1q?4sj&H;^3*tus;p5~1G-mBP=H2MSh61vz*Wa*>x3eAx14%yMnSrpyOs;zx
zf8PyMZi$iJsfV2ayO@|@Tg5oEPO16TY@tQe8CIVTlLSFP$EY$hA;X3(UM_n1MG<jG
zpiIe_P#Vtjh?PGOq@cLCT78oJn;1!k{&;b^H+z)c7?fOg02@z7wVPFv)D$0|yt#4&
zDhP<THx#|5zy7zhf%AQ!JopK}NU$JTNV^!pEKy|I1~uFHDOSFk%s&n}qq51PIVO@~
z#IW-5)#gY>+R>5<3yHbU!BCbNZ<<0Cv=Y?EHayCzQO)mVvKm|AM<q=$k+ea67~Eml
zoUQ8`dO{KV1{jnkrMw%F68s%X(yV`Ljm(1?&sf#k;@>zqoY8537}11B4V+5n-s@k4
zr1xrN?+TYou7vfQmx+xc?WQoRs+O-YOyEvJBjWCO@Ho&X$j%}xprfN>h$LI=TR$ug
zl2ckA?ZSdz*VHOj&u7sS<|fVvURXX{k%!ze@BH}>z>w3(i=tD@&$Q?)GucGhQ{K{G
z>+WGT^+uOs=mK~-`hF_fs?_TcczSQ4JrA03@Q2&BiaV_8UZ_7+8L%2=WgU%$1x-BD
zt=<x#<@qJ<bWWZzW1#VxP0t{w?6i9Zkmxty2-(*_AdZ8i|7}oN#F;_ev}s6j{ux5L
ze%LA|E<ROew^*q<+9|7MUeIh|PC5sh7!oCJkge0`j|zM;mKix0+Tub#O837qP?mAy
zcJn3)8X!i+m{&(-gAxvpcGnaCGxDxo3~>edgfqw_)MaCGXv!OI1mVD0m(}CKajyR1
znsdgJidu%C5)hkfChd*dqV#>tx=_@_rMw#R=m_l~_07t!ZY*A?Z5Ux_62`4dc*rTm
zu>%>(b{3#fHCIW_+F#RSe@oAtI>>Df2&6aRV$FyL37Ri7w%%4{lrc6Y_X#c*D!>Th
z_Uof>?Xqze#winvrl1YCl(XvR$6KJ&Ml0wGfLZ(ZUyF~`LhtyK?i2Az$M0@^Pxs81
z{q|yR-HpjY8Z*-c+{YN0mHR#|cCLqY^=%q_FaeJxi>H(Qp@umg^xJ9Na;L?hh1(f|
z9BZZDz9<9jF0;MGo!Tz#5?5?a7!|Wf7k=aOG_C65+vLfl1Yqyo<e~57j&nptM1YZN
zkC;%n%07sHPqHVM>rRs$63dCR7vxizJpvi;P-7gn`bnIEPGizP{Ul*FNv*qYpXKNp
zeF_+nGW;=3Se7}(emt-$^k-S7tP>|+4J=I*sy}!BN_bnJY2NoEPXp6dR1x$%IFZ!o
zwH{X@i<3$aB^N^-awe33nGxM!Q#v!vZ!WiNrTi1ecdvC@C`nl%jVy>HZ!7!MSqy=N
zhCo9^btj1;r7n%?Z}=b#D=HS<ls<((Y!2-3>Z2p0xi8hURTMWn8cke6uee^>@%VQ7
z=qzwt{R3X&x$EjH8ntktPhWeSRkU=~x_pKQ5WgR{-A|^Nd+7h#FDcRaLG76#vT2tH
zoxURqmBc9=MgE;S6|p!6r(<gwbKdlCWV*m$Y1Jim)2>j#6B5>*#F3h1fuot$s3?&9
zct@F5n`owqtvzWrXIjbYs&;|KcK6dvE8R?RQFd;IiY{FR9t(c5Fu};*vzX$i9n16N
z3;8n$1$wJd_(U~hDvB23$6@GN0Jb6Spk=aY1=)e;4^dDxmIEz469+qYcC2-B@agHN
zzC{i(MgFK+B-dBo;P2@$dCglHAP@le_Z~cs1&xsAnaHU@q6BdR@~Cdvb1&~<`UEi|
z9CZ?w|17cwtXPt%`ovXDX+v5v_GDCi9$mM-bn}AxSvPUSQt-a-(OIx%&PI|%+z_hf
zaBSp;H^P0F5O_@W!>GBW%1l4xYu;}j#2{VGoFOhTL_5}*^Nqxg>lY=;fE0&q9ua74
zoP(2@EN_QtHMFHa^gf0@O13jukpc|0mU{tHdGpMD;K}LWI*u~NyuJ^?Q39UKBWG}H
z*^KD^ca!ffd&~Xv^=WzaGAF3ovX8a)V074uY@aGnbWk#$y8T1&T!(QPPDAHbI=nWt
zLio}O_`$OYA*~ewL7}|afJLG7!-BOhb<Vqs(6mBPA_2Lmw6!n5$}DC;u>hC)#BaqW
z7qnQOugX1zLabbnH`k$Pk#LMtJ+Pv7zQ4qI$)09?a<U(ZZ&v0E>GC)?CQ$Z0rcLIe
zr43GGrDTjr0cy?D&jxmyFS}l%X<wp!oHvMhJd|;wI2|96jk>@EP->>rRwJ|eL1A^x
zSZ=k7qS*b8J@v|#eqUlat?)nB#uKu+s3y(!VHulvtWy_UtMDNi1zfHE+c__q8$MWq
zFnu<m;uz#mgdm|!1V#UFqjOt2dAYCYC|l-hy>Viw&~SRPf76os9hk3?QX-vQPx;=(
zvmW4n|K33^zsB7kcQsmGVgAAgZ@=}niW8AxETG$ArJxJkB#a#ioc0=-If!4eP{i=@
z(=_ScVMiw4#m9?oyd7gs_ua`c(5AMu7S`^+M=oZR#qdoh45qioiGugNpA8;hHCim{
z6q@0f_iHkvevMM7dJ@<9*I3s1=U7xXJphxh#l+v3+&XBX{@@2PRXJcmss&NQrOchW
z$x-QIC&i~Flwv%pu`;H*a^mseRSuQ9jZiW@xEjiV{$&0^Xr|3LL*Yn*IDJDH?u9)h
zG^<cWXj=Vau}wt_M{EJYc-{CP{xHwhZeo!GI_N<Irm+-wJOIZhnPZ?t#3?f~Ed-Dm
znN<@O8fleFO;}wgT9=a0J;MhxiXD|SRAfC5P+_JmnAQuAgWwR)Wy8xZ^n@-Jc^cBK
zj$CR92sn6jCr+BbE;bKFc&>Hsvy3ON#8xm;l4&h?0Wj4v3UpeZGpSe^FF#!MyB?w)
znZ9ev3PkLbTkYVbTtR&XJ7!;~OTbc3Oe;_E=SU+$h3V|#{_og5xyc7wW-QP5v>|xB
z9qL+y7_w;275Fj%Fa*=~Zc1~}ocR_{5BYn~cQyEhbm9}_1A6HhR5fs}qu+E%**Tt~
zL?@B|Fkr%YDy+s_VrPld^J!gN?wE&sjtQ9&7^sKN&vyt^dzOXYc0wr22!R>Y%)x^f
z%Sof93qfOR*t6Id?tE#%XjGJ9(I75i(Lx59ME5$0$K&<c#OvRc5k95uca|-`=0DMo
zPNF8jcG4BOrM>By*zB6x*)gkz@1qGg_`i5p{+=p;JUo~Dx?#$NfF2)SO!!vws4ONL
z)5RI2rBRX5G*x$>Um8;<-T^2eL`0sVN?tD|@xGlWUg%Q@A)~>`msprL81kp)Csjta
z5y>=7G$g_pr@xZQ8}HTgB6HOSf-Fko@8&9XAz_>C&T6g*d8QM_r?M`Vsw}ep%kvrn
zxEq}+#N8TUvCe8V)S|5%viw0P(;iX-S8h$@o0VJa6hgsc=f<$f<A8H%(cs<96MRpT
zps*$tZ4AHTYD=l&b!0onLr2!J!7k3t{mfs2ziEWtF)L_4PVDviw|zN4wBx#Ui6jm9
zwlj!)<Y-CGxb%<3Wb>87V#0$5M=>quuvwQCJ#z?d53Bfp7fO*naj~7MDq^eyjz%Et
zam|A>H-q=0tI-wH+<-lAN2({vm-xteE%FI7|A8zovO$#lxg_#1GD=VTlX{dWra8K6
z)ak|p!a%KIOl<G^0BdowXlc2RdGfdqGs(mNqh<pNNx`6%I#q>s(J*~7Gvvh{8)#pk
zg|})FtoZ?ZfO|GGxWby>j@4*pPSsM^p8hOi(kiE`Ptfp;FHjgXQ;Zkewc!=Iz_G<A
z_N$oWsF>IS{wrB~#qph!|4E;E+~cIk4DRWE<2HioPOd)#)bSp~oVL19*(qK2y(8f2
z8m4h3B|ANrXVMTm?XSQOUEUO`)>Dp5L4{&l-)u~7u%8yNF(op@*E<QKyjm10gR_ay
zny~Akrr`wFM8KQiQG}A{_BSn&l<^;1;H-NyD||scHC~y21y=Y9zjU?&L)Oq07Wf>3
zuN?E@>{O#3zDC+Z9HpOQ7iCo5e&^DCVhYiXeezh1{ce|75-9Py`HH&Qd!cYau6E~8
z;}d)?&GF8<2PHd=gU=Z+gp`O(nq<N=7t|6q>%ICLvH%cuu5)*zyS&J5){Kg^2u_js
zr%Qmb4MDcN)zO;zYkaHUvfOVf-jO1@I%65%)K8V;^Iluzv|<#aMez!B_AgtSw=&o*
z<O{?f54MzVJIg6j!tnezKMBN;O2joQZM;c8Uga+dmeBm6J!*qs`VC9k>*Ybu!mF79
z$J`Q1DH$lvGc8M0noT-FqkM#2JVz;ABJp6>Z<xO<DtoSHEoo%D%*N;Q6=H0I!>`|;
z6X7Q`izaiyy$F^2^1~!%kV4VHsf(j(2)Qqs?!FCKlvsUw!&$w1;cMA;yY6c7InXcW
zeRMmA<;Bsd#aSuzP5X6HWS--5mX_jMH41wyRt;d78sQ|hI=w}Sl6{{6#csj;7=|N(
z&Jwafes+!C(>7(PQ8BO?EibC*v}#P>Vm#_z>2DVM-GYCHO2!uZo|*3#n*ET$tx_Xg
zOhJh!tEkE}r?fq<bXKY&N{Of=M+GKnt~j6x<OS8)HJOTYDKC?-VEO0}FLTbx2n^+V
zXaZf1-|>>ttmP<0z>Iz=ziI~Fq4dG8P7ifb^7Q-vc5lQL=swH1cXDo6-GFFrJA3ER
zz5cL9uchs6G`*vHQnte=H^OFlp(~j`r#g00B2;9gNIBsAz%9Jju_O#@iie?LE|q?J
z!oX4`>r$5THd>@n($dnHK=<N2ugk3v#s|(B9%uW!Sex%Xm^FUO%ZKeGVC{@4yTt2_
zJ1J(})fec%cx^^I<Y}T-qFe;x$!64qoH@F`B?oh`1a|kO;q+^;@c0-!`EZ?1Hk)@y
zUy@Zrc?HVUcIbwP96c$PzK_q!<z<YoDYi{a=WXhMaXOb)<|H=w_8Aw+a-zNP4gqt^
zWxMzlEy_M$J<5+Rl)O4zp6q&E@zdG}pz|RvNTsA#h%|Xg((TJ|j5N!wt(xB-hP1sE
z>Q+R|%n}Ng3zRBH@=xWm=@rl|XGKy{c~wcCOybD-uxj2zihV%*d}D3StxdXEh3#_6
zcum@;oltERydLzZy}|r91Gr$p@PWdd0?!402K}pm8Fn;F1G85iBIlRU8-@M)j<VwY
za4r@OGiaZCuX}gZtF7DP7_XR-BTs0J=PSKct@bkCXV=H3sJ~rNEZI#-<~-({wAGS@
zMN37_8E{wY?O&pvHz$u%5h;x=T#rZz*U4M=-J1GnMCrec@A!^EKk*OMdVq4ZSez2<
zD1(xkBvKL%33Shv4SbPyO?o$yF0t#ChF@|yx!1xfKEgFKNl{?8?PsThMvI9W#=oS7
zB!_;_k)%WB?3!!&(-nTo*-o1`VQMB1H><SN3i)&piJ5|WnMbpqsXww)6U^07*5{_Y
zWQSVLbIwWfFGzr42(rYH&H<E8&ZsUwMyp@B^0vojr7E7v1?nWrtHvu9&K&6WPX-x)
zix96T+>r{EXLz@Z{^C3O4E|qf{|uT~QnsTqlw-E|9L<i__YG$&{&ugy%}#>j9AL%v
zK)n-3+1JkZ=9DqiXDO(3aB`(Jf0@!16Mc-a59y_#RJaDYR`dy9TLJ&JVQ|(GXvsS$
z{SkOx68~bmS$N_mYB8#T1iM9RX0aL$r}d3WW|RGgEY_^MTQssvf3qK3n(@s1&ywW6
z@w7F;*|nYNZT%A9-IAjiDB_|ieBmaws%2oZsuNkHB_p#EO0#DV`j_8u^JP-17zT=D
zK{ZBCWQcqqIBu#u0MH(|=bMU$j5+bn-&niBFQAqYc7oliJsE8Q8$;KL)pLJhYnCyH
zmiy7`D*Hr!a`J*P#B$<7`4Qc8ih|ifa3^TFL~94hnqlWJn(sr9k*bG<)>+MA+=To(
zW3BQ8MM#@69oDCGlw_~<wRvYLYw=Bdb3SK4F5c#RRjKTN2XvwxyK+9EH@rRtTDR|?
z>pw_Q_!EQz0Rl>qm=(%8%=tv{P*C)-K{n%A9f%<pT2ijy6`9Ol6a?e21QR@xP=tPj
z5$VV+QR1aMYSVASl7G5#y5UZhz7)yzJ8z4=WZzLixA)3c3kRe{QU5@F(8g4Lhh)_9
z3>INdx`@_J14L`I&NfMK28LaSZN=4F0~fl>M}CXgmlN#g)~v9_r!tO~GZB$uhT)RR
z6g+Tw)y8wqdq#kTmGOTYdLs=(;dxyPC4KsESN=E1+*^5>DC@d5Bxx4Nc?0VfXiBFt
zEmuj|1#&#nyfJp3+cuI;xm^D;)bAOvz^7@fjkKY40wOms_)NS$;54^fTNHN<ZwzMw
zOg7AROj9gfroSe<8(uk*50*C?p4PDc1V-07cipS3)NHkw+24!uU3+=WZ_r;?XJR-B
zjDCO&?hAkQ_u8^tA$;n5-UZYLEI^jP=P>+=uo*I7kV^6mvB{gOXVBfGx5H?O*cke=
z@8;Oint<3z4*Yw5`dSeGYT+yRZ1LjxIR@%Q2pg-_Y4dtcc7N<v`*t^8uC=$HKaVY<
z<t)V7!>(z7S-*i>t!7<*Ax*uG&feZ&?uA1<U7b{w3>h)|MInH+CH#!*KeNVt7uDGC
zAY<t;-RH}s9h_XSWC5EVa-5IkmyMrPAg%h_ERT^I5Em=`u|x<?{g15)BBsP&E+(WJ
z1E&OIXe)wrC|og%tr~T%2wN^_Ye8fsYL^&gM#5kvh;k^ZXF+BqhTaH5WjI6$e={T~
zPx$53-T+u^n0^!jFX)2__K)u>J@DsQV&)VjXogkT@)TwaZy{k#xe$fXlY^ZR>egW$
z5LJG_161Jz;iCw3a3jvVG@I*t0cmpqgL6;%JI*uA`V3!K`s>852VNm_V~zpjNye=2
zG4DB97*FI=Lr(sOFjZG`&KJMcF?+>GPamH~zSt%*%D(aGudBsFAgpP0zz14tb1Q+s
zS)*Whrcj3bOIU?1eTZx}%F1fjYEkr#XD&+bg{v{dGX0(2EBn}<JS@?9t5jcR66aL>
zNqw=OHxyTUe<q*z$(WSp{TbO8f}vkRfGgGebd}rrKw`9l@J`}j#A)<)Ezf@E)$;KD
zqj*7?C-a;#tM?iJ=LwEfO5pG2{3n9L`ae`}^cIEe3KYLV%<`4&Ldk2yu!Q}1BwsUO
znzJyY_uKnk$0)w4b@-&x+M}Wz3s;5!+|r_ToUEj*c(ylo>|B(6>Cpe-oEp%cE{SPk
z_><SE;B0IWQr5HR*7ZDMXX!T6(|)vbqO9GmIDBcpRd@NhdH_6POt5@dQl1oDOsr2`
z7kRdKM3gv27EcbeNc{cF>xgMzqix~=NkgnsAyK?c5cf}eB~AO9MCD>;bn)$5nl=H6
ziZw=>Hga59Q;ckth=~>5zax>d>IXpGk-8<DXOw!vipBpEzWwi)3DG??2{}D*Qd#OL
zE0(UF|3~<`bFyravMtzH_QJ8=04lB17*@gzC_3fb(<fFm47unw%91TV!EZ9Z5)(*!
z$sky{*w_=~dI<r&(B?Hq!r~_N@OhHs2(#gNi-(nDUY4zbSN*Inf}nwVkDFn_i@#4e
z`M<Lug*KKe&(v=QcmMjq(5CACLAC#ReJ;!)!zc-_FRTdx?=~6`7M0aO%M_NmiJ2V5
zkQJetRet~c-g&+7(LJ;A@%Vr+>5}#QzR0CE!=>hWuKEGIm90`bQ{U{oj|?r1t$bDs
zd`ttL@!<*rFVkW3IQ9xjTbyT0XK4Sr?on=^4|juUa_~?sN>7U~evj~(83x(!=Q<Ql
z#(0Sz<T1DIfYAx&j5u5H7C%m78}|OA&FrC7&{>1fm?%bB?kE41k)qL}Kkvu%SWQl9
zlnauy!xQjl2ScL-_^U@K$mxnxAiwjWrb*O>audVlLz@@Sh(jP>w0`>S@T^0F0{FVL
z&#Z`wm``oU;RY(%_1het=A7%orYTFNKaaU+BSML?eJ(e54b-!Ja5FRyCf5KLdeDV$
z)BJH?FE4FsR|K7ZBPgyrz3zU@4gvnKq%IK?IDqOZM6Wu0YN`|J1pf;fX}KmV3zd;o
zznrXG1Po`+I3~w7WctR!)T=S(SX${!HoyPb?<m&oEIyy_pUoMi|8PogulKoVKO-;9
zINYqZTAj%T#Nn^r1%{85h0`3Kw%un4CR*c`*BUSk$$}z|FB58=m^3kFw*P{R+h`AB
z%m4%tQH$!<K2I>%w)rvanI9A<F-FZwT)-2RrWsY>lQ}~YQhJWTaMLq+X@kbJt6~P`
zz~Voj;Zn1vCQjEpt;;`Xep3$plJrrdFDg{E%|l;>JJ00F4>-={LED<n4%$jP(zc?z
z-2k@weCjD~<(08DiC{J?q%~J@q6WDN9I(u*AEW%zg-J5QkC=$cK0b?hy}N-fjF#S4
zf{2#^qf-h2<<F*&aU5^&eeuo~D|^`VfsnudGeSzN%}JG|MZ*X$GOAW~mDGx0Y0W%u
zQl{WXWk?vlCWHF&!Y{pGC9?x4gnP7ikl%gCH)j;nj)EnH0$y+Ivtp~cc`q3!LO{FT
zyRe?lYEEQPwSfpV_L-5~`9ns3G(ly8wK9v*iqgGvXy|XW7V{hlazx?tT%0@AeIL+T
zjb6LA%ZOGX_@fUKzSZ8v;eOhKwUir%gFRkOI^aY0^<v_v=Ju(9BdTdLD0}$Y=O(1a
z`%_mqOHZ`0IV^OudAjShTmZJy2<VJ%CNm#+{&U?c+&XEE%3-vH!olRq3WoW5;1>~q
z$DRE_ON{9gi|xB|6Xwb@x;=p(67l)>iXvwF?^VQg7M;%9D#QE5KY4ieU5_WISwc-Z
zldXVs`;sehNg9lRu&L@-^1J4gY0hmwxu8F-Mms6fM)4KO6w&;=y1&j$0)aR6=(QA9
zD2Tz^YV%!{;J%scZl^1~$-g(vX^H}<Lmf_}{OXi-9{h==Az7t<AcyrXkNq5j_Ow60
zS#hr#`cJ4eRu`D-kDV2;<TNwn=v=ffm_x2pWd7@GR4<WeRhrk2^m5KaxIdl#wSRy8
zS+3H;k^k$X*otp8(m}v4a0^J+C*%j?C~Vt&;{P+K2=VKV!H<HD@q4Ah^K%Z^l%QQ5
z)WbhK@}FzEd<@qeyTb$>SF{WY)2%U;7JP6CeuITf?)EPC=!AJ`FzX&jVG>z&8OXN_
z)iZ^?x<j9vir59@qO6h}e>6y64k*=J_w=3~$VsTbako<KJ~kYE7M`$p^KWAPO3z_a
z33fy1!1eoNkG5=^NrP4M><mdxzxsh}psz?4hQDW16Z__tJ?dL)fdMIQrHJK4Rb$!k
z!%>sL-U<%5n04ig8?(A5joxz+|7(Nx=dnaCuU%tc+V35mLCB!gFr15GT5S3LvI4cg
zLcVAM`k3_CE8_?5eY|nx&RzEP7FJzTbQAJbK(S&>2^wk9w~+Yw&kO0v6~N<@(=H&v
z;axxu8!^-d)wA^d)%M3vI^VFY$9;Ihk!x0!+1)?n{Ixnm7Jp`4gsjuhCH*6b!5o7f
z)<N?Tzjq=e6)h;{CCuMhacnI|9Z=?Lq(AxUaF#}8HQkpdO2Xsu3>81x@S&lwkEvko
z0sv83x#I-!-$x^xrCJqxL-yfxxl#6Uh7W<H1pSvC9Qkm|jWF@_h7y9no;}G0_OwpL
zKo+P|QMc;%Jv*%_UI#x!5{8pRJf547!=&0tGvN@}`_h<Nw1!NJ#2qvIAtdr=f;aD^
zhgyI20D1TJ$#=v<TNs$b<l2DlWROZ!;B}91>l7-Q_`}zcnYN9VtX4i-(@aMys75O5
z*byyV2CpBs4naQ?0gj#mu2D@#Xh$_={qX>U^AHr8ETyP0?aW(Bp8>m>mV!9RKVt8W
zWgcztZwNHp7WMC60g*6Ik>R2E{CiaL$R=YN`0RYpUIxZe>(1BUOcOW+A8Rw+z{4p4
z14=0-G!24&5Gs<4Ti)&V(w`{(7yWI{7t2(X78!c?Zxyc-c;?=i`d2W!elBf+!ns_j
zn-BrepR;k^ckMIfx2`#pGVQin9w66ygc<R%t~Yihe^8K{4&atLLGTPry5JZX6QE3+
z5|}R30+r`0et0WH8AXtRE4B>J1MEJOu6)Q0wt>kVN+Q)`=%|8invyryl^I%k5A+9%
zcZmMO=j;%PyFx&Ky>Y)NF>SiNj-drH=<B*{hGcY?`OW4Pntd;oIaKFuf6F=1T^pc@
z97pkW=Z*2$#$jK<xot}zF5RK@PrO6N0)lLm6^Fu7OS>RmK<b6$8kV&J@Dg)JY;VE2
zf?fH6ithtp2;5LYqafeOE3TQ;T3253_o~$C(ARsr^mjlFP!lZjIXJ|zm9EqZcQyX%
zcz^Vmx}cfe4Y?z&g^;X~?+t;&1r@Fe?D3+AvnQ8{1RLl5u=!}Hx*ht>%|_w?VprC$
zZQB5PsQZnOtZJH?7n#QvuqyM~DMaz~=ut?xWZce}HKG+uH%SS=TX`PbAOt18Jgu!%
z0M0g{3JW)-##sA7DY=Le6l@_Mf4rWz{azTUmf2y9M?q1r4s__!s(p?cTljm~7KQSG
zi8GL{B_*?%3mzFH0N<LshEy}yE!UEjTb}#+z%=eVt;4y?|Ir2jEu+Qq;4Y26cr(qp
zQL_mdx+OAlK3y#6s#turhkvvbJ&Rd(9)E<$rz#o+n*0^6TV1soyBP{9uabN3HCw9C
zMh(JU+Gj3>%z98;54iI(&YsoJ-p`I|M#3G+6>y|Kt!jg$Nbp*a|M3k(F4+)ol`z35
zD~hZQq7c@KXk4)ga1ThZ6=QD&vC6Yd_giQ2=Vfe}@OZQ^AZ=LlNt^haG|a!?AbPNO
zt^H3#VT^jZQFdJ;Zcr*2-A@L@tfN3<Oi|qsV-;URMpip$KJfb@F`^)dI!AEDNe-FD
z$uT57_~Ac-@)c3R>ZIT5Zub=I8qw+@-6iQ8GEKK@9Ca-`a7$#TXQ<M@f{b3HbTqpl
zMd8lfv!E=Pm8)UrDcr{$cMPBCVsf;h$%#zt#U!P(S^ax|VNfbQ?C}Mi#E&sq1H4=L
zyQyCI+KwTf(4Rn4mlu;D`NKdiqk`w0K?-ynv?tBpMc8l4Kd8OA^?1rGH18m>Nb<L<
zXsMkY?Wnv)048(SmGms^mHBE*Y|yF~Pwb>Z661>a^r$MOH8a$)RqfdzsERqHLXfU3
zx5MKTSEqX&6Se|=x^<*VOP_c2SgX^6kVhzfiHmcdNFNCy^(eik8wj#3ju$m;BtG7#
z(1b@xCZt@EhLDn5EwSOAZuQS|4u8svXP+cO_<4070AhJZ_1UXf>3El8=_7lr*lTmB
z{63<(*vov*<qOjV^5w_WS^`1Q3{E4f&(rx=nu*6nBd^z;eI70%N8hF)4$&a(DDh7-
zg6&sA_|NQLv1q&ScxmrdDfctpp+Ot$?|0K?6Tvep4oO$9PRuEX6EY(T-&iimY%w2|
zSyL9_0R=^l`0Ifu)Rb+!V@D-jnHW!)I)r4IIb8=XHIM>(@Q>m@0tmy%c)^^8n0vV5
zELk*V7fHcY6JaG3;1~l(=7ltxHB|(ZE;>KXVVH?EyPEY+V2UPIK4J8lF|K@@MzgGA
z{xyo*0!Qm(7ymI%hBmZrxUbEH@w^3i+8M<X0O&Ec<gt?qIM#~<a0?gi!-{YrDm^t$
z>wC4|jUSe=$a{4ahPZ!5=Bq|UT$DOWVC1rRpNU!J3JSP!iX)v6iAgkOTQNL6CoI_=
zx7)|BLZFH*HlEKliUtcNqAskDm@g;t$jU1gF_O4H96%!i7RzAHF?aJ2kS?_%wNx}h
z0Wh%KItr8p3rJZU+N-=a!asc_WmPfR)F)?*k?L8bhRbk7X9q>D{xZ)+q{sB8EOkV8
zHcRaqEWdi@aicnZB_AJfZ#Rd$$&wjMOpgB}%w0em2%d+@fCSgfLh^TfH&hPsC?!`s
z3}2i*cJ4-)sQ}#&$L?0GwQQ)wGiiOw0c7rOHbsW2#IiZ}_2po&h_N?o5JMhg!J5%@
z;7}3&<`+j}uAmgjC+bC=#&R@$>$HQQ!HBrR)N}GyS7H(oi!o3LE}(E972MDVMP$&R
z`lidr29<|6GU3Al)1>#eV3QRQi~56ka-bcm0Do_gVCIW-o}B2^Ye#sdje1($80eKn
zTTLE^g}D1E9MSR(bVMIY#W`KnLMW~Wnf`|U-|Rd4xqGo@28Y1!he^pNtp$~{PH@Jw
zvlM=o7v(5h=)$yvLh+s87xWtq!k1q^tPRqtRCt)lJE$?SzhDo_o+?y?I`c9+fAm$Y
z2O0wQ#l#fJ0t1`EN;=M?M336mInez^rq~t~JV5)>KmlaFR~IfFU!E~6kBq!p@qc`*
zgDs`hsh0lT=4_q!7kO&bc+eR*p#2pKrXnIEM$S4+0gi2^Sa;q1O!`xmvwoKQKN+04
zYP}k@;5MBe5l-+eO=*00Xe@WvDZh7iYK!*tY&;s8v7Df*mpg`&^50=#ink^4#_G1!
zlntc{K^Gw<d#;+$+Z1`Rjqm(n5EJDB3(fO9_GyXKnqZPJ@FzE4aG9?lG`!ew7R|%0
zx=Qp=E?;mH@$lADMi8&(35PJ^drZy8vezl#J%G_W9t!TTkW4iaMZowyixeF_D;jR6
z2aOOzkW(duytSWLNQxEM{j)aHUd)^AA#q_Xut4V}u@!nje-t4Sb5PPD?sW$!amSl~
zOPOt+OZi70>PAop^~ugGgHc`bEXCZ)l<TNs3hvs$^_q2ntxO`UjFhEkf-Jrj609UU
zL{<4^2$b_e_^<XtSjEz$HaDH|aQs<qGa9ZE$v!;wV#|Bh38w){#_(*y_rEtqhIW)&
z5U@Lc^eXsEz(WSfCxB;yMTxZJ7M>-6ot(BR*c$O_CfmI?I=~V1Z4`rT3nvxBQsS{l
z4jj8hE`prEqxxPAh@yh`BC#lz%t}Kq^2IX$HWJxlN-Wcu_ff2UG26?KldyG&tI6@Q
zb_*j2V!F&f-LD7!Hhn1t<Spl9a9XG^z@^ucO(fEO7n1?r8%1b5i)oUnQ<*gjU%Gdh
zF&gi#b%m1iL}&~p=Ir<}C<fvu%1}G`HF#ufD8_XbjN<x;N1q{6+H%v*Y(Q(!Vl<QE
z9j%UDeE-mFcNISh=5LV9g%TR)?~!AhlHd_2&N&I&1ZV+LbNkZ*nc?c$?^()?mFp2P
z&9dk*8`)7%5^!Al>iz0dVFWLn7-mg$sc*y4@@0JOyigwt@t0-Zx4z2m$MxoNrTW`(
z!-bU&8QQUKvE8N1SQmOnR4D%PW`Are-603;@xtSU$kbqA^EGrVUex7o!xO_c1L3on
z_cW6$*TsQq!}aCj>&-^vlVGeCq*wjxc8u@8dh*<tl7}C%OA8Jq*>KeQ8!YO@mDFys
zv<hHAY|7_*1=T5GOiT+{P2>u(GFZ`QR_}Vz7|Fx!e`JAa$dxAE+_Z&6>V)u889ZAF
zpUJbp#4{IKTs11w<_}mHSr7?&(HUAwCk``^9!UX(-@NQ8=K8Qy3$>ZR8d+e?xql_|
zy{^>qh^vnEuO$fh>G5d(_Dv6o7sr$!(?eY4bj}lt5wBXgTrU<?3%SWHyGFQaY+B}7
z$z-9?3(;d()n=@Z#d&JTy^UwX0Fh)aZgh!DH&Vk5`A@kFp{X+GJY7X*>9uR*kCi~j
zK&0}oYED4v#PwGSFaG1=Z@gS`Rd6m*Q@fv%5Ewt9JU{8&O<IE<qobbiZDLof=LPas
z+mB)z+{Z4CUnBql=7|<f5yLGC2bMMNr#k6szgjY4O-sVXJU-y0+i!B@_Zh--((2qe
zEDuF~wL^PZ;lbcj@4z|~aRQWJS^>dfXIT~_j5(G+(Rvo%KdKJ%W9$ipF7NuU4^tL7
zv@NAmyOnI54nwV>^C@iIrdIN?o|Bi|+5R=wZC0)2KWv64CCrwN3mBR@?`);Y*(e9J
zF(Hd<g0zhh=m9TlidlC4aBv^~xBcFcaclaqaofq_0<aVkwiHgc)oDIXx1|Fj-P<E$
zx@L7oTk8dPyY;#@qrNJU?xmCKv7mUUlfX5(n>A^=C37045=FA>H^_&vp9T&=^5+mR
zlnFA1*_<sC5&a*_YWMoC6~|Qh?zS@y3qJH?1<uHjO#qVXeux)q7POtmZZIeZXOYAl
z6jE|8+q%ix4$Y$AScBu!DG%Fx@63C}+cV8q<LAeaJH~G~l0nAi*mNYeU5?&y!Wl<5
z^w`Xdm572%T59T@(Mrm1ehxV6B`Jl<SPT3fHu$ekOk&~#m(i@dqg-8{;Ab}6*y9t{
zy|hcC$Up;@9ezEsG`$RLJ6>&b$G_xB5;}~=O%TIMKk(n*Zp|(1%u|3S^lh<3es8-s
zo>?eo3hP1^9aTg!)D+D)<<iO}II(JFM=UsUVLNysHmaE{&n9k`C4LmaawN$Q@`vPF
z7;<}|MthJa&+n4ec|6aEv*DfNd-z2W?0{F~FRZ_@U@?5>ywrzrmyhg}cj8C>iBNAY
za{#u8A4WyGkH?>&3N8goesjj|w0YISWID%8EAd0z5zAPVwIQE1qljes(Lkpp#UGom
z-jr~J<fYq2xZyv4&vK6-Nyln5A0=<Vi|s9i^OA0nBY2!P5p+JK$cPf#Mc5bXMFa1y
zBzw?YAWv_nT*_7m<y*?f`?N<p7lIOqc*!Z%rt#!XLw8baQ1@2to6Klu{gT))f#1>P
zi8HG8GFH)4cmG{+Osq5=Mxb)xKc$N%bDhce&c1YdVqtrbpNr}1>y1q+FiJ~7I+PBu
zql(g;Cg9JC!rV8LR-@1e2IcE;05u<2*}n<{DNcqNbx|bHga>~9@#<u9yT*Ihgx2aZ
z6?xcIQDakkKx_#v(U!~>Zer|^Dqg0L!WaB83Q{;YiJ{$rUa1Z8k&xt~A2Nnk2u=>n
zwTv)*8MZWwM05B!7_tS)lO1%k1eVM$bi3sZ+TcOkos%GjP&u}68TIBIxHg-4ZQ%Hv
z%O?rvRvP00taF!-clUY2?HY|3)T@%d<x!*l7f<gLUP-jIjmEZZ+jhER+qUgw1)Zd0
zo1J9EwvCQ$+cx{p-ury#x~}S(Rb$LCUV$OmWjtBxWH9y!g%DE;v1`kQ!VpbitB_K~
z+U2&DY*1PsS&%i&YDwomt9Z=P#X@$No`E)k=(m=EpMdUrRd*4Aguj2OZQfP=;2~R5
zfl%3Q@Bx9}>+O>WsRkqowRi$>*>5)nP~2Ow9C`&?im_>Smk(&+_rx!}&lb1+_lX64
zt~;26?b?m5hme9#!NIrf05tG35+UOZb#E0KnZu7@3$yBO?))#0j9Fi&En9q_SFmg%
z<g?T>_1Z+{1tp8OIzI=x>-y`!8B-{pS46d|7M~=Dx-%CxE&#q&e%X&*OJaz6DQ!hO
zWED6kf|fyuzS@gueMo}~A#m0HWMfAA<$84g*O)hIca})EUk$e7V7s=JHiijqY$Nwn
zn>x3(hw??Z)ko{N5+qz9AxNlzfhKyaR>pi3)~R5LPpY~Ear9}or|r@a2ON6zy+SHk
zRQVnV03*VsL>ra(GbgH+b6?g3iYWYnGPO0mMY>Zb==Ky@yJhoogY;jsQHiS->xX!c
zaSpWnXex06p=*B8IVCeoe$l+J(`?5U=<SVzIGJb)!HF8nMY3~=ZfSj)g{{o36OgBi
zja$khxG7FND3mmDaHdJSQAx(5hib4?Jt`eCfP(UYm6bnABBSqWhE5sqnbuR72ciAD
zV`OYx@;-Zg<(kp&6m!UfZHRl(Qmj<i4sxTX{3VdGcc(#YA*(R`_s(<uM|EVs3!fPo
z8Kx0qn$En+ihwD$x1k|I;eO74DdxQcS1IO6>Op7wyX4s>;b)vDT=SH$wx<;@s8046
z0Ke$3rcNDQJUuiF#5;Gtkb6Q9h;OPz9Q(TpJ;ht&z}fPr2OJ_{B#4W`@|w5=@vmg_
zLFhRsP^$AAPTRJ1AEzCc1*#3LOP@kruQ!<3ZfPV}Pp<6>q;!78ZY?WfjMj)%$Vot|
zXN&HN{A_2Zu_kkc-BLS5hz()8kcsG)0q80PI08}NQn$<^Ip*waL>+HvtWqu_C9*Py
zSOm{2d6D4L*-4JTVjX_k^SYXxwijt|jB)+`OK@7*IOTNNoqY4MAv#<wnae=*Y%6iC
znV6OwN1libz_y^sLaLaV9~{Lqqppv<mvMO#n<z`*JG=;kWO_xmg*BIA5Ojk23Bb#z
z&>EC=+x}umsw-)nGCIwLzk6x(?yD)7PMd$W7W)fLbM=rG|ChGTpy|^0MygjHaU&t`
z10KnqLI2-#UT%2p`6Ie#skx~}-jvpoUZfhnYnNKvlsm=W-Krj`L0cAeZ0q&uX@yQX
zjpGz1irWa>?2{Zt^7W@CS<NUadjLv(&rhA_#P|fhC(1wE&|0UAod`b=je)viS04iz
zZIRRf?rO+qizFJA)|XWItq-Y}F3Mswhpg%km-Wr}m2|hou`Hb|kUZ)8(}fyDN|PQc
zb8E48{V(s$%NotL-pt`cY2Dew46qse*?+n4`Oss)Z#pr?cd4Z5;?|KN1Z;U<AvP38
zRabN7WTiKEyOPs8$!8_Yx|mR&{h>0bFOVHKYyTk+QZa>D-RmBxm#BQQiPV96aB=!<
zt8lHkrkmAuMr9>jy?+=B7gnzxQ}J>!a+E_8@5#4`IoFBfvO2^t5P2TSfil&Kn}*d}
z(s_GmDR+~Z1?-VcgE`zS1;|SPN7zxn+J*!-Z;NLJ`ZIibEdR=0i?~!5cwQo@zu_%5
zr^^`QL(OjEoloZ$#78Pqh#F)yRUK1%S@FD%87?`seDCmEuyV+MDcG5;B3^@wTHf??
zP9L9VuzE{sRnh2^_0<_$oCH^i;QbPBMsmBSkxu>KPLGyRaoUm_05J9h7mMrE-W;$y
z^=d^r&G<&+)0B4|`^eUAl6`97yNNVGU%L6Tb63HgP~>M`wPTmT_1Xoe@7j`PUu%J`
z2rF_M9Jv)u@OmTc<hb4y^%&}U?e_T>NO0h84oSto?pEl;(?etRpX(OV$QKo!H0_&S
z*^h8}dCsBJ6cch303>c6Os%sJ*T8~ARFzPjf+u13|6}?r62{~E@OiIqal!E$Ym{aB
z&bN?jA>+x|W7tqnKVqy=(%*Q19XH-?$cmn`er)})W<=Md^5Wkc+_gs7M?M#ciB;T1
z;Hn9sMBu+cUL9}(yUf3chmrdYkJHV=*wZ0yufA(<zhFm%0U#9%j@`|xJK!|PIE1^D
z-_?AgM4wrOdMK#A%G31%W$T?1e5>?9jq5aEL}mq#f6U(LHHe;(;cVWJPm&uxeP~J(
ziKiFzFOTz}ygisZ`@gfcAvd22v@|Mifru(ZlCRqVlgr?w%N%X?j_KU}250)ozLN;B
zx4_(*uh9|!VD}Kv@t2;D^U7+GAZd?a%5uVvHC?VtjR2k?#z_73J?WSwkF%@bQcB2&
zsO9L@Y0ZX0M!p=gu=0RBc#;PHm#1pF)~XI}jBSH~h#`?+g<dNs#L{M`HSqd7l1qWP
zV~ho=f94aB{bDEfy2IVg9`-oGb3iBgv!-GQI~Oh%Q2nK&H(FX;UC{<FCo-|9ud9*;
zJ&Ik4FrSY-3F3FF;nSNu`-sLpup$<AbnKR8pley{HVx_hvCvGi{3nmO@_IRYE~V)y
zpdsnyJ_T=WTGM5*Lkzm(G&R1S8k1r-y6gm9iE4yIUa)09bo4XTTs%C%!x**0W0zj9
zeVWo6@US5+Q6-*J)%<M9hrDsqizvtq;nTL+U9>d1=Zmw?bm51?(DP_K1DL#>R^##g
z41aXI-KUaRlT7>Du)w>8G4bo?_!mOR`PS@sk55{v8#XW)&6vq$Mhc_9W1o&7t}$=*
z{H<-ps@{`fc8`M!nzZ0=bKb74s@rzUoM877V8Anj@|Np3oF2d|-I>!qU@Ka8>0LAU
zP)KtDZ0YjkL$uCB@iW2~W`Rn^U&rO&2IUMeiUy6?l0N;=8-rg-{4MW0oAsbP_cLNR
zu6`8$W#5L;>yCJ;OV?;QA^jA1L_;uW0rsk~cG}C1ZkUImvl^C)4&~RG>UfDjKL3OV
zkRbM6H-kbn5;>|#ok^l3mM)bhoh?mMO~P6BUG@9?V0E)3m^loLj%U$}K`m#VI-x^o
z`Gt21;G^z6KVFJ#T7}Tu@mL+Cnx0FQ?|u_b=An8?|6(<GkS&|e{h-19<fPfP6n^i~
zpmJhvkz>heEgqBrrSiR3o<Gi`5JF%9Ouqeq^ZfG-KizXOvF)wbV)Xl%(({Qt1S7d^
z7v2jm2IPM9+;9uoLT`aAjI}C$`A>Ef{=?Jq$@nwzRJm@?&rYDtyoQ%*o8EA48YSQ?
z2|lBXMdX-}CE9V*GCqk%j2BE0G1X$-fLZ+ST@jz@LpcV%@?Xu`aa4~x1XeK+z=sCU
z-TXNQGbDKfqagrTkH!smxmCu!my}*)U9l8=dwlSYLrz&!Gqb%l)JY(}-F8O<S*<Mw
zi!b)?=sfvU0u?cU@L*G5XUF1vcjS^&BTrjavh)d?epo#YXu8|8{im*KNh-X1&Vzet
z5>TK`8Bk9^=O$u<MveSemeYd@5RMe-@HxpadGCQslm5rXnFWgOZpW1pX)c%`=s6c#
znT7H1C7X4!YUHG7`a@i%r}{s8ADzk|*dU6YyqJ`yiBF2#!U4@g#efbCpSvDPTxAgV
z55U(Pa;g*d<N?eE=OI5&26B}UQKlbhA9f>E<}eQT;g|~aM}Hf-Et{DRU_jU6FAH4A
zik5LC1((-0M;^vg-H2cPcM4|Fg<Er{F<hbqp1>2WeAJAL|NF6p-`CVlBV5aPjLJ#^
z@GEuYR*{7T*1})Q=ZIP{fYI@F<`}aRiJ2SkdLpaWmjQjo=W^t6&dpO-vyDVT)73u(
z8&T}3rl!e}2<!SE-O!!}fUC200!+f!`StX=>EcDWWLmrkn=a3WN%xE0D*8%-PQM?b
zjh+mK)F?r@n3>zyJa~DxHZ7}u!)k6eR(k?JHIre(yU@C6<H50W-g{C}(E{M-VG^Tr
zdCPr)J{OI?#uJ1;y5Kv_oGT2aj7pK0P9J$1{>M<jbF2Clh<XMJz>?rV7Qa<>S+$nW
zXVFQhK--+LuFCsSwJh+VPI)^to!sLiquaxr)9m+KB0v0batlIL7vWB+{#X1mX{FwT
zK{!~b7naQ<s@^be1?gw?bM0~jXBxrw`lGDDHRSx3Cd4Q)_#WOPVMI%C94aQbZ+{kX
z*%;<b`6}^0yJdVd01=^1*6HzwLP24D<{hS1j0r3-)`UC2tj66P8d_q#@%Y=&w*1za
zI^{gqrG$K1NoE}Urw%47&}N(ZA1NJy_O(Q)X<SkGFT~m)r}Zx1qa<Hqp7H^m2(;U7
zpDA3Jv_DC|IV^%F>N?enY6*EG2nOVjx<p40rR~vqIL}hi0G2PS+(?n@G@!7QP|ONY
zkZI_UOT+g0><5j5;2@ywv+Q=RbTh`I=CsyFyt*nH^l@35?0?i<uO4OdX0Kexg_Mq$
zO22K4epFhjH5M~xKj1g0Na3Ho4`hIRbM5!1Q!56*AsctGKbEBfOCH<hiYA61<sQa_
zKleJK_Q6Yz0JQL1B=pCwne<7^g_K`SKTXRv+d05v+;PSu_x;CE-ndizLVhY*deVO`
zxTh^T<&Ub;)D+jgS8E2K%cB#c99#HMmp*koOfh5H-@A!{f8IqiwF|pLd(1xzy$omy
z^_-agO5H4x0@b_q*FB~c^5Wo@x@n4OSSGQ)fYo`H1Hjc(h$s>bFAEyUfwd?PEPnYv
zCmluvl!iMj;>&kuR@lIFjiwvX<~sKJp0=Mil?<5C)TU_!9FJ8rEE}`}YJCOKT)O94
zlX_gPKCeigR-pfi4XYbNA->NwGre}q&ag}u0D5i^Z}G>)PE6-_Q#0j77&-6h6yOE5
z6?FJ70Qfa8g4<>}IFW+j%{~m6qf>F+|AzCJi`~zjEE<WR@Oyn+x#=tJK^UhmFUO~l
zDYF?9EQw`NWGm||nLie70gkvCeyJ{4KWwr)6tn!o)jdDR^9mbHpp|uyWTb^}5@|ha
zUx*HJj;=HKSB5x-TAlerzcXTWQ{$ei=W@sjlWYzV03nL^yc!mW^P`kElM5#qA@w>H
z*W-ht6bcjS{4j$V_)vm4PH<Jt8fP||l<2xyb0n1@nsEt9g`(1IS5843ZnNhF<nU@i
z=16`Svcbn#3!+9z>Y{%SC<cc|k1S>UH1N<@9;P6@z3g<I&J&LF!Jcg-l3$qjTv4t|
zS@b2e0JKPM=%CvV5(6H1cKbpBUtNBoJJTP+6#(J4s<&s&o&`PmPv^B+mT+%>V7Zz<
zSOkFC8#uN?GohTbe<b(qH|v8rOR*)bZT;pX)x}#)wUrSg#j{#`&w?wNriVfm2bRhJ
zM+56Z0SxfWDEmXvMLbO@L+5$M8XiS2VitQ2=#>QniiI2tSaEcROc#P&&}vccCj4(q
zG>h<D?~Tu98%Oy=D6F>OR6A3M_vS4h<o$Dw#Jve56hSXKHO;w_q&UHkq_3Ug1j|n@
z!BWja6+o+Z_vfBO7G*$%sk8lFt{B7i^V&tGE@vIjy;{j<lt|Z~k2S|NLjKC?1Q5>U
z+~+h;c-e}|dw-yhe#8xbG3PYLg5Id6ZA6@$*n1U{Cq=1IgPW;la>)s9SB<V)0rv51
zQT&QakEnX-Z9T087iX@7leOzGVzv|ES=8<E4YG1&`g1jAEjDD5=;Du-)y%p#(*C(D
zV79e!_Xk3(E;Yf{bNa0t)6gC#116}PK5`NjGiA)Cuwsli+@X){a)3YHnesUNX6=Qn
zp|bqufWg+fS>3Mlu{rn_8+-@v5UbB7V%IGgnhMjZe&wmQaXoD^I#X)5oq;lI$?3o0
zK{#Nv_#|NClNWxA9=DP;xmqi?*AXsqmA`63mrusvR_Y&v5%Dxl(me900)j8TC;vf^
znIg?(6$c0ajXW%I(YJN8ObrFQT`kV*bJlAe#?TWj0Pwk?+aTLXGJ#R5V<0f1qk35%
zal(T+(GsECCKsf#WXHElxCBJsO8Ij^q^-l~gu44*?gMIgOL8sG<UW>m7K&}rYxj;z
zIZ0-f(FK$gsTDp1oF3rEo9KTETyZ;)f*B`97aL>7=HNXSB-*3KSa9Z~*?J+t>_@$&
z+JWXmUm(hhk`W<cG~d7YGb4dleqc!1H(tMnCQcn1b)9bQ)H?%dPwBW=WiXNfd8wDa
zIAR3K<>6*=IeUoO+Ur6V+_liqS+Nk)er1R*qZ7>_O0T%84QTttmE2uf#;G#Lg5g+E
z1SwcigqsjjWD)aAHgY&vJ0%e;kux19oKL>7O99=yWc~;5g7tTvd^4B-aWP>QKGyev
z@Kas}$enzq?x{Cq=D(;_(RgU=F32P`MY<IFRr>sbi+qGpVWZ1#idX5kf#bBqEFKEt
zAUNd5l-ljq0Ay0-Kgp3GU+|~c26EBbJexDo0&Akv`?-PUM?Wm@lp^s?iqa>Q2X0lG
z+e#dPSu}E%vzF}dK1p8}()Z6TwiXR-(U!YCrMS}u!uk(Vu`KKlHtx2=4W}&sHU$F;
zArt2HAQl+~2THDr(aj&oq~2wG&W)lT7*=fI)N2$70OoQNkg-e!K=cS(x|84A-%Y3u
zWWh%fde|>W#yQhlBv9ZfaOI$fSwZK-1;jfNSrA!r-Q&WP+YS`ADk@2|&zz}LbzLPM
zD;#=4R`SK{q(JvL+CFp_-G^k*8HQEwEth3l;chpos}0j2jt_%Zk@eUGh5pLzF~V9v
z_k|!Gz%n4YVXU(5g0}zS7MB0IK+{qsbh!HKV6{`$$)hjBL-vr6sIjCj6C(SRH=t0n
zU%{@Lsd_@}#iYaX4?cn2LKN!Dh7TRYt!a1~gEEtVTl)+_a#6J}_WnDC2t7*nkt<^`
zGAAX;NqI83GkrA8^V@0RHFE(@6W2?D9tZIWAjZmd92VkU4{9M(o{0jCg{<s+7}_Im
z(BC0m&q}H0)k|HPLTw%)Mp)l**&JktyY6$I5Yn`8({GnZ;q!Wg%#-q;TJD5_;lmcj
zK$o8g>uc!p*Cd&Z(t0f3;u=pzVQc&K6RnMPfn7Y<Wf$<UswiXJm46HR1K6Kgf}VE=
zNNe$5cvxtYS=LhuT^J?{{kBvkwx+p$7UkT$l5tV_8tCcy&TZBe_wij{k$`w_DE@F1
z&jWSWP&dsocH6JX?r5dArz9`q$c#Bo*}{{t=F?dYO5Vz-TzGKMj53DiepoT{r%5uP
zb3SW4$RU1gu<yZcGOqH)!m@n#O~qUR91YumZ<*n<)^IUQlzK@nKtY!L9?!0sHYSKR
zU+ZRKJ4V-J!t%T}0`k7E@XA@0qEwC$NI&R@@_JY{9nId#U<o}x>900f`@fseP6H|b
zZH{?+lVBDdr^J=)6#O=Q7Wl{hU`PCHWkl-e0d-i|job%o@3b+xQBE(*Es(Sixb55j
znK%*j5EuIv1=O~YUFdS0W0=15dgyNBIQOIet#=3(QB2VN;~rz594cYE7Pb&R{a~|s
zhi*vmJm8r$N0D{y;J1r9T(+@ciiE`z>igYCz@%iJjf*IXR|^KXccYoqjVwdh{Bzim
zk<FQUdG_03&#X&Uw%=G>w35RZ!05CM1E*S{3bz95&`tAsW17^QSzQAWMwsG4FD12_
zT|FJUG_r2e1r!H9JyWv?KAk!R-fM0l75mp4<2Yo#)iS-eYFRVmfc$YAMckAi#sS{o
z>F`&s++olc^24)OgK#(rAVkl|-J67!#^!86mW4Tqyd~k44-M%9!QEd8z_fWP6y~l%
zy-s&inxsDF_fgzWL_uin-%fkb!?}G&38Ns|iE_Y&!;egQmDmffG-VQ`=hKpfZ$aa!
zv%^8sWctHL;8euhz*$maPKG)I%nQMHyev+=Df}Ww5?VsN<iu;Qp2K=;7iA9$VwhOX
z@uTId069T-VlVHbP=AaT5L56|W%hXULcH@-UWWNi+PcyXa+y}pLPc%MBx4TajCFqR
z?8mwmt$4sh`s#|h6n=pZvZ2L_?$cmaDETAQzL(@a3)=t4ZzGTzCpnM@Uqg^sf)U<!
zU%KeB%`=pu<_fAPRT5XZX>`cbJ3~&!^ua)omk;AdO`XqK6F}Tw(Dis(7N8e4G)Kly
z1kzs)4o42W#uS~6XgHg`W2tlq6OzKj&1#wOzxmBWwolsx+<II8<ng&Rqpcee6vo<D
zUweuALul4$<XW~wab)R|)+^JaYQwG1uXNs@A#Z(uRmzriZNnFqZLgC*e$k%4I1}3Z
z>Y_3Z_q-mi{s|z3^<)1@jslaWM8he}67yG&+n&~rh-eWzp<>&7h5;I*Q(P05s&beJ
zRov$3g0(^iBRs2QJO3StbYpcsPkg*teagvd&rica--*B@MX{%Yd-?~BG-Q_e?rd8`
zE9;;-F8$>F728q`_GlJ`w6!V+O9*JILeJyUsi$JJH2}~v=7buP_a`T(5|ydPwf=<W
z;!L&_>&UPPsm&kWFhOtQ<LuXPhXj$JD9gXubDHt$iPlwBVOCydcDc(FTI9!c!&jDM
zA`s^+jOmHIBPLu3R)MkRUMR(>g^kw04OgZeV^`Z@t3apv5P^S5A|byg<MxlF_*DDO
z`kCi3zcDx=^<ICJ0ZR(o1kPU=*gLLDaF2g#2f$P;S%50}Wqd8e;jJvd1<p@I_onKe
z(pKwCbDHNd7Uaw|Rw2atA4kX7@6c~sfH#Sn`B-GKay3e_{oRQSI0`uL$m>FJjdQB)
zzQV(N0CZlxIBkU_@?w2wutJ}<fi~3+8k>$ck2PwGu3$xQlZRUZemkk5Y<_oclHUy>
zfbB${B7DwzM&~L;!q`-|FXaCN4k9?(FU^Z7xUha^i2XBTfMN0ei`8jXJLQ0O;Jzz*
zmub#`(~VQ*8e&b`=i3VHLJ&?+I7Ezof|~*?5P4fQ*2hY5PG?tw<iIp^>_N~uy7pej
zk^;9%-rY#1UDR2@-bmo?-N!Y&2YiSRVzhaZ`~AkSP|pR^o<R1t5v~v_rmoL7zP4Pj
z9BkxT?6`R4JU?D-%ywtUs=)|QM{)tv0v_j|<G-|F$4n;-39{TCzivSFJ(pNXDJT0x
zb_cX8#TGB&Ax}J^XzRx6FSBG@F3x?s<R7z_y5Y;VKj`184*sPWm=vHa0Mwu2&i@Br
z&{VzD#Dl-Wp6XgZteYylkTiOu={T11#?JFQSdhqUX+^EHshU*nTw3Pu98Dn0RA7lK
zPO!~Wemkt3RmB9lm}x7Ujft*e%2w-R#@hc_nyJtcF*b*m&U0m1ix+&xiBMC?O!O3k
zgoN*J3k-%{K9W)PR}DI&>CpsGU3abt3^e^y>4!NWVhccgTg1HGlB3}*lEH?KW+i*o
zO9|U^O%k~y0|<AlRC`0&F1H0jE7-Hk2u=-xKbw#tH~w>)7aBRZHBf@-MbXm@G{eVO
z<jW*WZE|ltIipZ1&Z~|+c*iTv!YRU7>HjIZ%b0}hrj3p9X9AKmBgEV%cU8nLZmL$+
zU=&y;Yf1WezS4+Bp_}+J5)I8g`Jbvi)7!>rx|p90Xx(qi6R#gA(UZ|V<<%V;o8W6u
zXKBLL+>O^-b43}ma@P&ir)UQL_JVXHc&o*tDW9scZx?6i((P7>rh3&(%Tu?P1{^z}
z51P8*OO#6TBz(N)4T4V!XLF>z&?qbp`Zt1xdbLX7K~3RDO%dYj&e5exVUxZd^gB!7
zsy09ZaOb(ZJ4ryGo~zW8>Jt!g+vBEs$bJ1L@1-<icQ_3dc)#;BO)Cu0Pr7~@@JDkR
zCpF8{w>*04`Lr8sG7r3etl>07&<a*@dD}}=1TGO7gz~h(xO1*^^kdBW_GKnQ&%&Q>
z@)5|hYey{0=M2E3LUsd>LQ69m>4_c<@>K!=I3*O2f2wgWY!mg}PHZmn`f6l!W{3|-
z?r+9vm!cjs5%4`i9DgTbqMHKCe$z^-A`<$%+0+x;eg3i*K)eG5Sl~GBZ5rwZk`E7Q
zG+cNRhH1yIdFlHSOqcE#;!`(qkzL8y=%Z`(=zsYLB#r4vID>?(4})6iT=P132lzSw
z{9z38N4aU;U%@1JaPJ`zvZEx8!Z?7W>;&93U43e{;N=X6=zaG5nKOj67A{1uRy!6v
zFzCupVwp7I5w&Yg6jeRkgZlh(5Yv}dhG&y=)8jjQw>#y@`Ie@mGz4Pp57XwFKnQWr
zanUM05B0eGY7IjTTkjQ?v)`i;^U~S?x;Cxet@^BRNaJdf@T=A~kT(?&B?${Kv%jxC
zupD{`YqvB&)37=Zl*#EW;947NNRurc4Y=uguu2@ew%gUvk1a=QJ+ffAc`rTq?sR>1
zF_}vq)iNgxI>I)P-gFm^4lszkyfyUn5{XNm5rxy%B9g?Hp0@^Z;l8!>zBNt&W^z!S
z{m-(24BQ<dIf}y|ktfv`iS0w^-QnMpePHA!S`aIuJNc7oM{xlS23>%=maM;}|M++%
z>3CqLaz8*Xg8S$eF1DmcSF=Gu+l%VBkcgdd5L~dnpVg)cy*@W_wR;*xOJYtL_|?U}
zrc4$r|A2L7)_?rC7?8xa9QXUSU{JFv)L)|K@i_v`azEc>eRU~%ZICE1ICzx8<z^#H
z>0=4wjTyLboK~R8kH4ey-rL$~n@W``I8oTE-2VNMZ8n-*h3+#2dsH`D+yDOL^2;j3
z`i!Ws>Y!|znpp8x>HN^`Ft3QLz)y=MrUF%Vw_!0?i+lfUxTGxNDRMB${0SR?c#KFP
zGQu`6qAA3;yP0Y1N!^Uygg0)z(TUvWlJqW0{1a<((xvK3@=qD^6hWh!<oE2~Ju#5x
zMPC;o9WjU0!Or=sh+$JFUcV0}o(!pWcLJeSsAR?lk=HzC=IovZ!c9pCq)!J>K01JY
z0=b4H^_%_?*@j=vPTd9A)II<pe%i_)mSo$B>8T=6ZEP+x^ToxQghgm=*7$eM|1hhw
zSr1Xmpmv(8x4W?WYw}WUJp3V<-;&-ct$P;*25$R!Q>{W59QYWASnxMI=(&?8eqog=
z=Bx?p;e%^T5n4G+6@C~r*@4b{!)xPFkzHq<+-0_YXYEfzfF3IX&8jjW5ykE-e2L}!
zV7C*$VEbeyYoK|hrT!5PQSXG$x=IGB`U2tK*|kQ+QdZoWRiv<lDQs<Yf~DdY_>mOU
zPdtT@>CaLwuiYA~uqLoyf;s~ZlL%amM{+i&4?a+W$Y;<jr}x6>5dtj+X7=nDk_~Jr
z34cT+&JgLv>x00&XCH0=lmj~au_A2HN#sPa;DC~CoQVIslbw8)cwh{Id2b`-kd72S
z-cSy>n>0A-U=dI=<B%uxed`ghIBY@vB9S??QlJVciBS)6F)}1hg-fR+F<6Y<jo#~!
z0?o4{*4$d;{&M&uTgKt{xaP_^tY$wkr)=8It#umW$(aI{$@vJ_O++5lx!ybd21e3G
z5pTfNz!0|jw#RlPVL+wEH&~aOCVx;}j6<!Hca?z>Bm78H7W!$MTB2HX)n#=AppaQc
zuFyZ^8$<QL%Kb1H-2SJrVn6W+`>|Hj`7ttn<)Hd}j*e3ty)12;7*)bXvP@Wy+Aq|$
zC6P}Xs5cIvuKBvkiraeIBIC+mBE+9Cghz4&q25Q5$91|2B;}oUtBG5C!-TaSl*$&r
z<b)moyKI8G{@6Mg`FHm3b4(IjIVY^$z5LiWkH6{le(hq2TA^~3+L!{g`?>GBBah*k
z=!og)#PC!Dtcq*6LCCEFUMCE9U)OZ96#q<iga;Mi70}`vsLP)?)6RlelfADi=8?IQ
znY5&#ZI`WAtG{ORNBbWaRpBDj9Zfov->t5x^+g_tT1-*V18e7VAE1RHyrSF$rRMTD
z!CsxE9Z_}TLYDw{d}OC2Wu&lDh&*7tf>^SC#FzLZF7E5q_jvpMpWPn_F@HDTS+n>$
z=|8T39SNt2$2fB5y_fUr&2F-RDB<gWQ)FzjO0JT_*@ntnMNpt!;ndOr?i7`$uw7q6
z2DvMjxtM*?QxDjHZaQC)LfSpSru6((h+Q$_fzR)irDFrK(^OzLMK1rJdDM3ww=9y6
zgD%GuP+MHLGr_%v^54CxogFfT#^P>uo0jZ+o)H7pWSi@KPh#qg($7w9B!{SHQJH)g
zAzc+o1NG!|HcFCs<>;J(V$6`$Kc;^Cd%Mh$({v&g4$Dibc_Rm0Z>*IVAp<?ZSpTTM
zlSARqGUCz^TBZ*-A<77johA(Wrw_l6kbe4WmB0URc7X_-A92=m{*`Pd_-qsl0t$|H
zK=|eq3leqx7{ZOCZXD|S3Av|=<(jtHI*-YKP7x~6i-IZ_!`L&&2;>sk!XIJZaF@qU
z+_pbf95fL}P2mK<u^Z^jep=t&(wyk<NuCb{4gzCBgd2nV-gM=V?}Q1mKSlU2G*o>a
z2x0if&#`ZHJeWk^b#g7$&0g2IM2D`%1=jENBS4??-QV$=nXdZwd*5l8JbO8$RdMV4
zADJna-xf}{D#<ne@h}?A3AkP`|DHKZt-|4=r+cgr9wSehc_#oYH>cpt=Nf7v49qe~
z3Ptu&rE0{I@!v-26C$VFKpgE3lntnn%d+R<>{7Gm2BQ7zZz(tWmeQ=8y#901j69B(
z5~08IfCbJ4$m}af_=Y<6Zd7;G+z;R!z)4}v4lC4BY6hl9{;m`6hV8@5q+?ddLHyaC
z@p-u_{rhFmfY%a0GcrUf&Kcssv`PEBu+~H_(EqP=7q9Ybx#9*2$MDEXTDl}sreeb#
zj+GAMsz34_l9%HcT^7+{OS1k;4D-ZXA2?6;vRi5_OuX*pe20BoDt7+<xAQyr&yVEz
z0UHFdhlo)XnfX6~O(WruEFU)80s$f7Q&u&PLZCEs)S)SWY)Npld#N^#AnAhbjK0XX
zxb(A%t*0gfu0q}T*c<xr8R`eVdckdE<7P{)dvKMW=RV@@yH{YwU%%pg59o@^+;Uy>
z8O)QcnX41u2VX|HU35u!03&wz#?OwA=h2~{W9|>6IA41p%h@7Ej)6DXzc};PpwbYJ
zhKh47;j|pUlq5RYfU=4l%2&%rQy>Csvice0hlz?4^Ck2>!NvglT8n%T3oSZ^>La~0
zJ-d~z&%-D8*GH)1?`^HjP)jka^t+FYyYy-E&Be25!3UgVIP%fmm*hJSw<1MznTFaw
z*JH_H*f);*UE;mKv#yJp9GaM0xIdXvZ$GTjuzq?1G|xSGl<_7ldIo66%I6FzrEE`S
zkD`L=B%!)1_HOLnoSv2JELdxo!)ukW^;icOO+#8#&++_Ii$i2u3_|=2$uaX2svUA$
zu;h6Wt8V|WL2D|q-~~}E&3<r)-N<97GP+3*lNGKy8l%Z9&n<L_S@aWG-~3;fP@w^2
zG1<1HTCFyNwVK2SB`RvPv{Kb7*rFXA{w+NC&hR#SF==haT+|8nXoiNXlnA;Fj<ZUv
z%0OdQq0r_+vKiyxQUjEB$!9=K1=X8x;j0!mwXa<`*wy1%q;~D9s;&qu??SUpyMNSL
z%4jDiM?2dnN=KkH^aq-JeaOlPWTgUt9x^fm2!-6{gdJ$-@e#GAIrs;OhXyPp*TycR
zSiFZC1{n8#4xw|<Y`>6b+Ii9#nxIyRrs8ai@irx!_0~}o8f;Fz?cFuNE|*`SMg>+J
zx5E|5WWQ&oRYGYq^M~5(mb4$KC0<q29z|n5%fBaJ)KBkmBO@$K@%6c}dqDx(e)w+%
zMaanI50pR&?sy7Gg&6_f(Sm#gjkcmw>bfa6;X*u}C$z^On54dH^)hMnJ_A18Xov)?
zK9RRz&V@ZWg)8(3wB?j{Mp`vU@~0gXZD_}NKS|8m>_J^e+5#mft8o7y>5u6=`Az3f
zYU75QR4KeR2i{4&jq*8tzYVcl2wCZOLqRH$kEW4p;iVV9p%kXd{Ndrot{JLfY?}fO
zN(W$P6LHA+V%kJgQ_*OKafea$m^cnVyB41L5SMnP9o1VW@NXN;ykj%dN>!;0@0QVx
z2S}n@3kjLuxjP~WS?hV8sjJyw>WhMaxsxQaQirS^3iP#+R6(==(@mPr3H0P;etyxm
z1<%Q=g2{})P7Jto1gnL!TdH&;qkH$DsRL{j0tCs<ZamrE9IMD^eGXeAO+<ed<c4)Q
z!S+5_YsrDE^aW3P0Dtf~^a)C_QDYHss2`I!KU(%Jwt0u0g8+Xi{}nXD$ihWI-e}<k
zG6?W_jCQ>ghZkj?Z#+zlqz#v(`0FfUi{gsb>F;JGjm*uvl5@O)cK4UD=c$P783Krh
zTAQRt`-CYo|1}D};}>N?nWs^PQ4s9V-$Fv)?%VOtT8{5^C{bgnhS*K-j%|f#*lwO#
zai&p+f<pKg%X2M%@TO?g7yF*0Ett<E;xZNuz|5_yhE7pLs7s8>ABMoFJr%R{HRlCI
zArStcKSXVEdJ4*10saPZy3KJ%7z3bXTLsw}x-DFIkt)A&%%NMA{=31T+aDQTK0}9{
z>XDPAa25_zx8op(83_CN`~!aT<Td#r0`DtrD(ZRAKnr!7UDKm;mGin(wE5<%;&8-@
zY97+<su$<PlBMM6Pwes=?OC4%7qDK?roTA9{^-D1!b%AS#~@fh(Zm9{1^}J?^gkl0
zIUIwSI+E7tOxL?^>9DorabfxA5v1I^r%kF^;7^RFbkdj-CBhkVC5FxK%bJ_@YIl!z
z=09;6KyqurrcD}On*rP-jF&=8D>K9a-kWz;R+j`h{>o>R?~H03@JI~N=d;v|p2glY
zU5}pMf|=lsCGJqFwm$B~ctFtdPs<3SS<=QwmU$96yFg~m1c6x3jYD^IFIbePkH1yQ
z9YS|+qSJ@n>P%PTl=muS4L7ghLX2#N)H|M|%dn@4?FuL&Eq*y9LH1bs)HgIl-4?7V
z3w+e2#kN5>W0>H@KdW^G4d5#?;CY#c1D|Bk)W>ZNM(z9h3b9u>DFN74=3EBMFU?Ds
z`fN`lZ$8C8(?000)$-|^>~%PSc8{ObEzg>V2qyxcn!taVIp9GFhX0H`kdiG8Up-|p
zgs+qfC2SB47pS^80>uy|$%@-*#mY2(e$u`e^fPrO`*InZ!VMT#?qW}J-kfz`;BwXl
zupQ15358{he+GC7nFGL@{Kh;x12q<{!#q1DiwXRg9hHNy%m3=aHHW%6r`?;;kGFxf
z{i1s`Ur8b}Y^hG|Kdxar6zw)aAx@9`!9T7U8-}hdE@}j?N2h$FKCAvmDhG4rXkw-5
zhco<DAB2ObczU)MKHT2}RXUpOMg@^ef<87bZiZI(ztmC7pP2w9Hc#Fc9M5>)Vj1z<
zHo6INwVx+g_?47?;dx1Rx#l12dL^1NUQcb|ogCiL7PlsL8cbC8e%ky{=V!{I+QN3a
z@!x0b(dy{xv-2A|Hhl*sC7ACK%eichaKv~^Nb7QDyi9dIFZhQs!f>+M3DnsnQ(G>-
zGSp!E<&%}i)B-@k-NcOz5xz-eUV|#b2Y;U#A$Rd&mDri`w7`o|+*GH=K=0W4l)`%;
z7;H7!jw-7YO_P%ZO=Y$(5SnAP+$k_+qd$R*^5#-qIUpuvT!SE9begutIj~8^EKEO0
zvCZ{z)?S}$YG??nMl=ANwPuZ%FW8*5xyeDGoT_ZrR|ary?t0I9Cn;19n@6>ME8g6V
z`*MW02QaBm-dN9R0;lx?B$iP0B92aXKW*pryxXo*C#~gYy~ZbIpN#$4R<=VJApA7)
zu8JJnMx#W#Bcxp7AZ4y)qTRmC`BnoKoR<@vVHfz0CPt6&5zv943k|Y|JbUE<jpC`o
z&~Vs3F9GvNJJIr7r6VsUpv^5;f(BiNF|ya1u%PLBZtHnFmr{PLxHjFs7eWE~wdAsj
z=jh#nol~jd9!_AMjwviUMeypCD{uS;^?X#q9h}q>yz#VXsk{gTSvArhlH1#l0TIv<
zf8IE2L`ET*8<!uAORNhB@?+7*&9(V-4mHj4S^=!!Pp@lnTQ5kpgJ|EZCxZ+|D$~eh
z7RpH$bmJPNX)^0ENwWm=KmLtcaX<a;%uYPh<G5?qL|*zJPM{R#OY-{g8RG$Fa?E=K
z82EkzwJU66AypG9s+e)vz!)l@W1MdTGuTnsLetciub%0yhm;<_>yVzNUtb$vRu6fw
z>VVC#Fx}^gKd_#Dfxh^^JA;XB;7WFtl0%-wy;brATUf!ix$sKxJEf1ocrJ!$xM)sR
zyR;%>VZ!TEr5X>2mDoPl;%wZ0b9bx$!|GA}m&&}@)AORZ266nDa`{N9mkY~hWaI9J
z+TuOK{Z~Y?u9Yh9YcsRfjs`8@P<Y>eJRUGi@3Wt_v4=|+gzEE>Xl&lJjg*x<6(25B
zeVsm(r8N3K9iN_2m5pyY0}Nz+HKCyRuk|6=K6fT|mKunstmWU(RedN>Q93hc1<C@I
zA8_=-Iwz>KxuOXMl22mGW3BBzBZa-BVEvbZOV@V-K?R~41;J^6&1+14k}fpBJZ(#Y
zc(HG!vEFV&!q>&AB6xKl9k6|QZo3i?Q2zCLc~7!wAsWkw*SOy|kmKu4n3dP#;~;3%
zKsRz*89U;vx=M${d}R7$Bxsh<GH+mpnAjEbz8EI{s+fgBW6zT;#I?d?usf?8Vyd6d
zg<#sz0TS2xKp~@WY_N`s<TDBYIbSFCIwKU<=bs2(w3&~Dg;;jQN|H?&BjN0ESYkCd
zH04o0m0<x5vdb!>GXS-FF=iK?i*rMf+YLjE*-5qw+7faGHDFa9v974dF92`Hm^m+<
z%QR3qoPrHr+j6o0(q2qGy`Ezf<*;xV#QDBo;8h&^BVCs?N;>e1TG9d3GN;r^qs@0<
zG%m$}zFRs*Jb1X|`l7kYwE3s0OO0s2=S~%g%p=J<YaKQ<zA2WNtToo}2@X41@a#2j
z7<@=L8pDzp*IN2<6gg(!-7x0rAz_xb&?@zyTh-LB`$bnDYm4$ZYM~Hy^3Sp_E%y2N
zjagdlOi^=SaCvwJcsXEAjC-)ju0Ah;`)W_mZ8WdAn$G|`%S||4ww^t9@K{A;1nP)|
z>Ra`vQt*qtL$-4#Ks>^H2Swqx`OTi0k`u3TKJ8W?15O91(u)-;P3<^2(zp6Zntjop
zve8JuL0jnuJvg>F7|R-_+?NtEN4q}WBL!|kWjhdvv<Ww*b^rhio6}mg!V2RuNIeRJ
zW~mjMr`@HXL6|}2SL^GZgMP&?YLf=#)P9cPiY6?#$;^@tFW-munt<P#vEuxVONS^4
z%~_jH$FGhkGg>wVEsV<ED5PzTKzo^lsW%<*?(Q+G8&k0oRlQ$sn9aJ^)tsDEsu~hd
zYm=CyLUpz>6b{H@KLs}2E@=f@&eae4Nwr<o$?nGwy|yeD8oP*|TYKGr1PerhT2n1h
z{AN!8iP&~zL^B$8SFDHSBR%^wPWjkq!vM*47b-#BHD-l$ylc<myCdTB6B|0Fdkm@h
zGtahC!+vJFWx9*Tw%dHu3k1WWYn5q&>z#9bo!n`0;vP_A3s)4J9AdE>sy69d!4hi1
z+lu?wL;>Cat<;QVy_cqRnd7%uVkks?q}a{SXzhVZImDu3PsNW@50Z&pm3R^ov(;iq
zW>`BaZp69z84~kRoG6I`+)9_B#xw!q-_8go(WwD)xt40pTf8Q7z9Wwia%TXIZaW26
z%KUQ}do(~nPxS5Ob=gFOt%=;4*K-0dGG2)RYy(}^Zo*1K#`~x*ap&zCa_Wk1ZBq!O
zDiJe!b0ldJRjRWI*a5<eT~2PQ9+aF|i$+p&rr)kf2xrAM_OZJaZV9UMn{*5qJ9p9=
zUrJfUwLegOr<`Zy+i#QimF@YsqV>)E2TZAz`3Ycf<)IXjx=YsY=X2x)_k0^4bs0~c
zxSf-|U_OtBT7kZ~{@8H_0?qd3Iuxn<%!oVWb{?xp;{`4_IYY7<gm9&{yvB?J#BktQ
zOG=+KdSTN%gLs>wno=#eyF&uJN%3}b@!);#ssxse4A}lT2Ur18%r8j3L`0U#6hHpH
z{6)aea2xnq!Jlz<6$s;NI_e^c4-DAefu;*OlI7fK4|w>9wq~MHkAifd>E>)XOwoAh
z<atYIm~D{HB89ggk)Z++OoZK^8J%k~wotauZGj`xlkfqU{*jbEHB=7)l20V3#Q~8Q
z--05-HOrBdA}3dMhz{x~Em4p}J+m%qOiDlqpRJnS4%w+#SyjVmw0=7kjxBVHH9ds9
zY>uvFtB0YCm)}*s(K4x`;_3BrG@2~M5L`&;ykF7%sPSOxrG=7P$`vLwr`+5~Fm|W;
zAsFF!EI2+EuO{CRKa!nLmJW!~pn<gug4t!VXr`otrBy1>G`Oz$c5*se#v!|J&OHqa
z5flY5_tY3u&#tc1Kcz-$u|rp&%ZvcfQi|#p=YQ*KbOBZ5Z<>@%e5)GAe7Us$;;j{S
zbkN<I^QPUM{T4m)vKD=PrjLPt5})Li7lbOpyD*VMqejlSk)U@BQ3sc#XOt8z4P%Gm
z6f^SHv`B{o_&y0mgor5chB3^=PV|crh~NQ8Jv_C|)505NXMIHjzQ<yE?5B+N9RtBp
z_01$gVd+d)->|_0eS`;u)OfHFya5}I%WxPji)S(vtaYCvEF=_@0^f}b0-p=!icWuZ
zsCnQF!juS>qV7#%A77btd>VON;xgTS-_6gSX2b#@#L#p2qoMO>IJ{8)-v%|294UZ|
zpR-j5^`+}l|8e(1x5KZVF#jCro9eSWaOhYnG6l9Tj|fcYVK?FsVgZA6_Tp*2V&c_w
z1^D>f2&9<PmXrr|i7qBh<C|hq&6tZa1vvU!Gq#ziKxyI6BVMZe$k}TXx+~#9`SiN1
zSQQu#xrTb&?3r_^fXbFL$Fv@z8Y=)6XFlUPXwV_H!8>;plWeO!8Bt5s_LZ5;b32*)
zQ&M%w{P6ug6y46N`$A8E$#iMEDR<Bzh<KrijLO^^b6M|eW@0&Wzk%6_Z6oA|ujd<u
z<ldGCt)8tP{t6RrnazbNxM^l&3@|3pBwW_0d9Ex7HO{wML+I3(Jb$4pfd%kiP;%gy
z2+o1=&aR_V5#2{vRgd=LshC#iL%-BOETgo*o&M-Soxqiu_u3V<_h7vyn0&Ofmp8?q
z_BL172{~Cb7W(h$A;^NB;J<9Y5840!XJG$^IR|0B1<^&#^+vd~+w`GY>@UNoA~F?E
zt%yD%a=-EEtI`4Ygxn|i6d=<uI0zJNiB$aEs=BG&>CAO$*1dgy#i$l~ReBTjKuB;2
z$bcf1wWe9awFmXdR?!5x2uixL0?$zcHWf4``2X<&`md^aHtJi|EXt=L^Gwq1S*V%L
z-C+D*%5NL+muA!mV}<m0^C~d>2=-#^?b;0zY5_>)k%~e=_@=_OM!A^~>MgTEq5Ju6
zI1kX_aUkcbBLe4bXE1`_ziehYLF$}Ay4?}^UfkQp=t{R;7ZGDct{{KPEb_*)I0|Us
zg$B3YtnAeq+W$%{X6IlTQCBTId~M8TxyDH(D~To)S5eARmk#H^OT2oVHzy@?wcY0?
z;{X`G$NY93-!;9{gF4WeMJm98ya!1!*GKB*@LU((+T&dMq3wH5zWa<-2jkg;9fgrL
zd-1%uHQ|Kg4_xvjm`GYZPZIjYJB|$FLFk%FthC>q(eR-xyoZ-??6&8+b#xigBE=wt
zWi3#TQ!aDE`tcFPdKuYABleFUJ9!&F0u3O9+AicWL_{Lpah%wPU&*1z0_5-ZD?kf8
zy>)>xYo@JzUd2(8;jn&ggC1G)$Lk$pK%-wK182dtlDP*<19g#>AbnO+s$@6v{VSL?
z|DJNiS6}8T_r2(sd$3oRE9rhvXM3I<Y%5|wNNtggu*9nQ$)sHAdq|XA&2E~n-43{8
zXO^?h-Q^RZHO6p3h8*Gx2_w9k%|_$b3c5hEXN}v{@M0-JLga68EkSx?R@8j1jpKCr
z<y|t2<oyUOe-Yo4j=?YVD%sH=&RX7$DBICZStZO%K{Hb?_-;`^6RWsxU(9LiwM|7=
z7_|KxOlG{8K(wU@vT+q`8&mHHEC%2+Rvj!t-s`l+vo?s6g<zPCAj?!DL(qn6#|&GK
zv@aGe2FfcmmH%yrz%ifAoc~`%W&4F4>MEsY>lx<0P9l>b(QjAyLEHorIi?N#m_i~=
zrM$-Qw_4Uc>7Fprn73!NHz(C64j@ZMac9dDM=n50?1hlEM7xJfxKGX<Fs-=E4OFH!
zC?Dehm(_8*$!I+uOdOuK_BJY6(zj@!uFBC$T6*CsDs1vTUL@{(#1?*^D+F{#Ppt$k
zJCNV^Z^)r!z#aRUp_OFlMGcbc(n^`1&%#Zi3;(2#mr7Hj`{v;Q|JJkEFIaKC(rr}R
z6Ypyym3oEijXE(^)WJXj{3FD%R;xAzJ|*^TUtGQ51}F|WKj7zUE9}5L>3Gqn@0r-s
zWa@3zK}+*xrb(jS(mP9=7_NA?{x<)zc{JDjnS4bD2@WZw3x!_#!=GIbLz3q}MK_Wv
zuRJj)LAJFdeG8I3e$$aHJ$u+z{O*ue5PO;EI;ljdN+jaW1{#tnEgu~e1HeG?q6bVp
zyBB;ti-*<QuEws;UqFmZR6f9E(JD!Y_d--z?-Xe}Z~xVAw}y#PZ!IHo$`j<R<&c(e
z=4_$R`n^xv34}(Hay+)b*NKR3-7~T_Gya>bV^m}5t%|jw_$j8Yxcw3G6EzPPJNtUi
zPuDly>a@4I#DCG==D8}!41gk%1QB8$^h^OIX9>sG8Hcb4Bm9rNJ8jXSVGAD{KG96;
z{!oo*NBrF-5_?CXD_do*YD`VWaWJsVp%&MP`Ncy(PKQSxB*$>`;~m(ww}caN#O-J3
zE;t{S*vH9i2lF7Brpb89SmI9U6;(|#WIp?OjiJ_5MMh32`~rLL4`9Jgw~?*^l?WYP
z3W7iY;T0xGp&^BQcI3qZT8+r|QMV1YKeTr}7;%maE<pC;&*H#qp%fNFPWUf_jW3#p
zXov7Xd$kd(lA;FRb=y%sq{^hs>C(MYt;MBn_-YHnNvSzMBxojS*7TY`x=0&zZHOCm
z34}4SI;uEj>hxt41Kh!Ejv?+=HmdWNNT(;9YAhal(UApMC(-Mg)F{;lia|P{)wwjB
zuyOxlbGxD%KZrPhoIb}2Hsg7B5lPz5R(DBC!iH?WI>DYY`O)WrX6?^#>`(^j@NaP!
zi|&jqp!UG`KbX@FBmR$!4oihJ>ws@{Luh@flwrXECIhH#!s?``%^2dKX(eCv6M_vr
zOJ>oN8?JN3_SU))XY%Ul+<&Y&dz9f8)_&EUg#QJd?g@U%Hojr_xMms#<2kZ$-jp7R
zIg(oDP-)=VP4cYNb%nF9HAN~jtd0w^zg6n*AJm#=KP6JDR4X+d!LF1$ZI9vyi1c|`
z2*dFIbOU4{!?rw~P;CW_aih>($4^V;s>@E>O6Du~4pgy(8l@=bE<$hB(rJf_8%C@2
zO4K)(p0(Ihep6Lyg2L}y(dgnI(oL<XWIgYAC8|+I_wr<u<NYRywQJ~EM(ipnNoyHt
zZ`?U7-BF7{%yjq8J{*2I7cN0gY%T}e1r!`X_5h$h?HD>F(QPKk*CV=tD!?~C%A=Ge
zfw^kZ3^2M_GrCe+t)2R?Hj0|>TDvqej>R<m>p$oA-(#~757~Arb^q&ml;F!&2%YP-
z6Cs@|LOPl%n^vKMqQ<ar^$i_XQJtMKV*j3V3#1vnzG^Kxm(H9+@3GBC3mnbIp#Vri
zPdSYeXvku;)L!<Qi$N5N9Ci<Z8_hRT<-6tf3UF~(wl@8BMLB%u_>)R1hNAmhu-uf&
z4!uxjf{Z=o1&*bLIAvk+HugdiQo~M}iIT}F>H}$|@f_QwGOrz>O-!e7gAcUH70mnM
zKbm{8ZT7*gbd(&tkKD-q%({QELV#rHO{1}bK;!=U<c|kJlvh@e=IETmkF3Y(mPC8~
zq79*{$<Ol`!SW{gO%f<>awz(`@wAfppXE!+oXx|VUTn%MdS?GGnhs_0vL*sV=dnDU
zw(DAtE)`otnW#~mI&HE)&)jdo3&s&IM7f6Ng@fe{rx+`$<N-udYn!sPtww4d7UMvF
zPkU;B#t16f;YoJe)<>FndMO`{;(ER;G>r1=a#;kjjJT}i3i}q4z)GMj@EB}|)?wPP
zC-u*7*S8E!*yIC7R%Qfo_G%nh`S7eanYr*bV>i<R9FZ@-G{Ki&TQPJq9=`(?#85Y{
z{mK%188=SsaSvnN(DXXuU*B%#x+Cm=Di;{3L~#r&XCXe(Gs>nY7JOToBDo$$!jTH&
zZ%Ki%Z!~W=PboFGB{u<#?`(uEXO}UWHVaH&xofk?-Q!K7oRm|-M&YO2e7_AvQ@%v}
z);TR|v}$yNrUWqBK(5djP<AX=P#TuJm@?o+M&O0~`=|I^$nt;x0pR}2^Yx#9olsf^
z_=#eJhy$JgAh~&iBmq5y*X(Kfge=St$*^$gxf_tWb2pTYSONiQkCj%av#*|GK0CYS
zj+s#bjZn#U$5cAHocYtaC>t{OJ0^(vR@06NyKI=OM>}SS(;McPE#i741UWDcNGN_s
zzO-cj%uO4z4Ic!id8Z2?Sh1IX`2TMJhrlNr+O^5Q;fW|Vt0v^kXdjEjU*1C4y<Z)p
z1l3aS>{IW(cmD3LZGD8xZ5p!GNi{oKy5e!#Db7p^XJLD;)vMhje3lvK`#`fKtPD0y
zlh)NJRLFh_@Cg<c9$n&q7{*1<(lnrco$OaUP($clE0qLRgL#?T&$m*4e-x|m@UM6o
z>3czG5Qqkp{@Rb;_|C%Esoc1sUX@OhPze%wD@~C2X^gYOu&If7bs0usQ&-+_^Gt5@
zO#Rx5WVUuB1>r7S{4ieoov|Nk5>1=Wn{u*C(2vfZeugyQ=ygrLzB9YF9f?q_)57Gr
z{8HhKf!!oA*5sLhdW+A0=&W_&Z;va2%|+wvnIv=q_Em;`sF66c?5>q&ajnsWobrbY
zw}(l6)lF2P$GEmy#IrB{6AbdRaZbygC)s9f<+yG6d%|j*#$r>VMcMyJ^LN|N(!(oH
z5naT$s$*lTaiVl(<bl<=iCl35B`&KX^Y&*_@+K@wT4fiSYEhzp*-Uq_NKe$1eZBIf
zwy|=aHKdUz*ZvGSLw6EAe3{{(!gg45-x2>#m!}yC1}{zq1()Lj_z2VYv!%d`0>MHz
zLuZH(yEy6L%M6!^&B3%RX&hd#j0A%h!{x1LmV%^@lMensi&becTKW-jo<Y${YH}1C
zH;~yUE>sS_3-Yi$Ky6{03zf95ed_$N6KE6Hhu?$RZEh$S9OFWT<_+r&0?H9Yfa&WL
z{&D0IiiIPO&}6F`Z`3-j#gKjzm){!!7k_IRTVV@;_3`kP_DM*SqR=W3gR8PdCfL+@
z!w17#tYj3Jzr|Wvg-qzR%t1F97Uwv)$q2!lbd!+`iU(8jqy(1eKe*5RH_Pssa?@sY
zXOyc6Gh4HtAJ-7WSnsvyMw(445HVcjif8GHx?U$;6`11Uv^A&%`%r@#eMza&h<^oe
z>Lp1*>g)jSBwb@^JLpB}FxShl20p1$+pECmF%(gX=-$-Tv^b9HvYe#^^{$gIQUwKh
zq?H1dT#!m@m14=|&K1XZHsnTKeiltj(RC}DF>@ovs6#k;X+8IINRC;Wba_lpN*<Si
z*o6xc2lYi)Ny%4(I+o;7d=gL0oPP_*FEG_{X?%RtK)!sArpyHj1z@X_a7=$w_ZKG&
z(fh{SNU2nj`y>de+Q6vM&lwADT)^COF5qEvYsRQUm|XLo_c<WZwFuj(Ia8sMa;AbQ
ziDNY-C9Mmkg=q`4@Ga5>%#*4G{0iT+OHz6-OBP*SugJ?u%ax(LS`71IrGIuAr4Hpp
z?)xx}2a10fDV`is8h=~#g^MY&-XT3wMn1Qgq8d*8r167%0Sw}@?bV_^@;7Uo-%tK_
z{agIF{{6~F7YUX$zV|h<?}1!vN#}1o;Tj#P3anjbwTU;slU`8Q^{{nu(>fqI-8xZ|
z+lw|a`Q;ag(~$S@Wp<L0GJlZJHwUZq#nVUtrN;pYjSO6zbl~L>lse8s#x!-M>BcOe
z<Y+8|g3DY`CshmRk#XuiuMZBL|Gwy#lJKe!d=C#xeXynO*LJY**(a+y=3d)Ou)~3=
z^N5^`@!kB1)(p_#^_>6oWBBZGAKAO3_3ef<`-nb#<0zAp55Al2sDBG+F^-h8-_!88
z8pX+<siXJ-HtsHy<~UeUooXN0NC94(-ii9S7_4rnq~-2d?6!TXZ{p6d!`13&>~w>8
z1CN8m_mlRn;k9z^j6|0s^4;$A27^0k8GB!GE~w}6vlA(j&IB0e6bM{knvAA>QB$X$
zpLj-FiX)YV3ZVdfY7~P!UdTa9MS9B1umss&<2>;EPJfpK9|0zRL$u#-N$15p>4tTX
zcH4euTF+ErE=p5nI4y#4zAR78a+e@W;vl!Nww(@xv^)&NlEf|)AorL-pO+`&(4*K<
z^?5?OsL>MN$<%ipBncl<jW%sUPWkcbJ}3T{CKt}zNu>sj+SChm*wmiB+&p#7K67%B
z`fP%&;i*~1Q-;-lXV3(^=<Z_%;%<>Z^64@a9BYeqOL|aV+=wZ}eR(l6|6|r5;5VNy
z8V{&Gq=b!b{A6x8dFa;klYgvS#2>D=Wa~eMqIp^AHsLtQfv)=!F78FoUGF=HpxH+C
zi)5EFF%%nB`unwo(FVCsI4{KHJ6{=bpNWldRKJBg6&#L#CNkuTYi5;GD^ZRFzK(LA
z`^^{s`RD#?|92K;l%wXDF+R_&S$hF9irTtPQ>zoMEZv#wFurhH^`f7!o}&nQxH#B#
z^v>tF(+@C*j_-2d-kZ1D?B1)iEx}u=OzDCe9ET`J9qKeR0*3BSL-YtQr`tQ-Nk?vH
zR_A!g#yC}f9eVL(`~>+0V>$i}+-eLcJWu7~^l=FvnC|eD92%J$wWzN7q?$gJ7rQkn
zwR9Q~tvNL&tU1dPWn-*EKR8%JA>g*3F)<Qd`_%6}J*q#*;fwd*HuRr7$rIMa6p9fL
z0j0|yJEkHdW;MPZX2eRGze?+uCS;#UQ(Ao&-zwFA!xVwi+kKaM%V&m8`h&H;?sv8{
z4Qn1Ns(N4^i1D-i;?}}#^4vPsxb48Zd-DeD>T$puZ+;~F-XdCa+m_b*ZH$viHtPp=
zj8mB>)e-snf)Xr1yRTlA5~ZCe$E>B8xgxO7m~<)eKrTpi`l6J;PLAr}4Y7!kZBYce
zP~vod*5h0z0S@X)R?D3-1(f)3Cv}}X+AGLj>7~F&u8wUzT?v)0eZCfQ(r#>9K{ZVi
zP&+1&hvjw|sUBxCFWifXBr}quC=)vfJX@)u@_Z%Y460<qreC+@FjSGmq`+kY1eD1o
zFi)J@<wfCs>!Mjh*pv!_mzCRRxOQJkc=X&ELq@Gbo%!JYOy_|c9=M_BhNmb0KSX%V
z(3i3<0aF4oG?xc20W5zrK0b4Fa%Ev{3V582RcmY8NEH1m^RcCbd1#(c3W*&jruEj?
zP6I3aLA7UXfnynI0?EJMGc%Uzq`T}2gznrq_ce3wl^~2r!V66-;ffJOxY5KB!8qZ9
z6ddY;I4cMTjB7(U!-mkn!2no%jMC)uXS#Ylc{;Clp3eNXu5N#tmy*G~l`!Uxuj!%*
zRq(_yy6|1|+-`gavw7QWmOhkpKAzB(e+g@P`x5S!2`k}XK_|^IAT@|zzR(dC{unx<
z)84#lu|gVYH|DW0C}vottOkel`+P?D8OJ#)jXoAOmNl5%RGp6@>BG1C`#<NOX3K}^
zT@&{8hOU~2W4(WAwjL!V)8syZZ;#N|#~qz+kx(68ukPvCcN>4)R>u$_U5O)w(V8xw
ze}-rnt=WGDjq2#Btxut8<AuD9JerPI&E0f7t4>33I(|e=jM2wZFkOgJG2AX=Yh0~X
zth8Kb(L|BhLJ*^5QfX6aTvrlZX+)7k!%Hh|7ENia$|8RNS|rhmL2K3E-`dhDMfx2F
zFBbO`L#m`Q-1Xs%;L#faA}u8^mDPP-M#?@JBXwzH3TqT>c=n`<KCDqHIwi)iKD1H4
z;%MF%otLsq^=q9IJNqy=CA2|rWK^k)&7v)Puwgk@R1a_#hw4qNUfLlLst2B!!V+yV
z!l|;a&z*m-BHLOf`W?$;+Bs)p87k3i0P-T$8jmVvq$D|?lNANdDWgDvXt0iKS-y6`
zKTVH+HL<NDnR-HEGg2yYOI-BNTLz}(AJvop7p~sK*1vKX4p(uqI2SM5t?A@Y?a;PL
zX-ltTV}z)uqv~|;>)k%Da?6BdN~fVZ)SK($?%;n3qe~?H0~xzigAW)$!+4m~2ah?U
zFUEl1)m>;`KU{B{pZ+8L-fn%1{`~M*A4mJDg@Xy6kEs20I{2p;^nEXW{V~0}9er9=
z`{t?otq)D^!(Su8zH7`$-F6|yBAkA!&Z5%vvEGJ#S4wAzQg~%SKxZO^BMPHcsUp1v
zI=z3ekS+Lv(QBB+@DwE3X)x1dy;3IO3InW!y>&zj?8lb35;pMb4A#*`Wz5A}6cRq6
zSJ=laS0Z)}PdTKV%mrS#a}1vHiL#77Ku9GNzD24@SaC7t+Gih6<$o~h_Y==-!Vz6z
zeqc5@Fnl1B?1^OF5XoE;31<IHq@tj+y6YpriF6@(US5#Nz59#Ae_MzD&ojJo`nBG6
zWuE82{0+d)?x2?kGXW+6HkU3l0XRZ9VmLE3GcY$dHZ?S2H8o{3GB-J4IW}QrWjHW1
zWo2bPJUKZxVm3BmV=*>0HZ?ajG&C_aWo9xnVP!NnIW;gcVwb2h0WMO(5kNo;h2j70
zvWo-dxamR%dUG(UP!SCTndI<I=DnE&z)Ubff(+7l$1XREGet7E$!*+DXpXjZi(5t6
pziZSd+Fl&XpKPmtx$rT20Y(}MgqJBa0V@kIGd4I1B_%~qMhca;0A~OI

diff --git a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
new file mode 100644
index 000000000..f0e222bbb
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
@@ -0,0 +1,27 @@
+package org.support.project.knowledge.dao;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import org.support.project.knowledge.dao.gen.GenActivitiesDao;
+
+/**
+ * アクティビティ
+ */
+@DI(instance = Instance.Singleton)
+public class ActivitiesDao extends GenActivitiesDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static ActivitiesDao get() {
+        return Container.getComp(ActivitiesDao.class);
+    }
+
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/BadgesDao.java b/src/main/java/org/support/project/knowledge/dao/BadgesDao.java
new file mode 100644
index 000000000..d9947622b
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/BadgesDao.java
@@ -0,0 +1,48 @@
+package org.support.project.knowledge.dao;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import org.support.project.knowledge.dao.gen.GenBadgesDao;
+
+/**
+ * 称号
+ */
+@DI(instance = Instance.Singleton)
+public class BadgesDao extends GenBadgesDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static BadgesDao get() {
+        return Container.getComp(BadgesDao.class);
+    }
+
+
+    /**
+     * ID 
+     */
+    private int currentId = 0;
+
+    /**
+     * Get Next id
+     * @return next id
+     */
+    public Integer getNextId() {
+        String sql = "SELECT MAX(NO) FROM BADGES;";
+        Integer integer = executeQuerySingle(sql, Integer.class);
+        if (integer != null) {
+            if (currentId < integer) {
+                currentId = integer;
+            }
+        }
+        currentId++;
+        return currentId;
+    }
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/UserBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/UserBadgesDao.java
new file mode 100644
index 000000000..4ce1a6862
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/UserBadgesDao.java
@@ -0,0 +1,27 @@
+package org.support.project.knowledge.dao;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import org.support.project.knowledge.dao.gen.GenUserBadgesDao;
+
+/**
+ * ユーザの称号
+ */
+@DI(instance = Instance.Singleton)
+public class UserBadgesDao extends GenUserBadgesDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static UserBadgesDao get() {
+        return Container.getComp(UserBadgesDao.class);
+    }
+
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java b/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
index 6db445678..46102cb4c 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
@@ -20,7 +20,7 @@ public class DatabaseControlDao extends AbstractDao {
 
     /** Drop all tables */
     public void dropAllTable() {
-        String[] sqls = new String[44];
+        String[] sqls = new String[47];
         sqls[0] = "DROP TABLE IF EXISTS KNOWLEDGES CASCADE;";
         sqls[1] = "DROP TABLE IF EXISTS SERVICE_LOCALE_CONFIGS CASCADE;";
         sqls[2] = "DROP TABLE IF EXISTS ACCOUNT_IMAGES CASCADE;";
@@ -52,19 +52,22 @@ public void dropAllTable() {
         sqls[28] = "DROP TABLE IF EXISTS KNOWLEDGE_ITEM_VALUES CASCADE;";
         sqls[29] = "DROP TABLE IF EXISTS KNOWLEDGE_TAGS CASCADE;";
         sqls[30] = "DROP TABLE IF EXISTS LIKE_COMMENTS CASCADE;";
-        sqls[31] = "DROP TABLE IF EXISTS SURVEY_ANSWERS CASCADE;";
-        sqls[32] = "DROP TABLE IF EXISTS SURVEYS CASCADE;";
-        sqls[33] = "DROP TABLE IF EXISTS MAIL_TEMPLATES CASCADE;";
-        sqls[34] = "DROP TABLE IF EXISTS NOTIFY_CONFIGS CASCADE;";
-        sqls[35] = "DROP TABLE IF EXISTS SURVEY_ITEMS CASCADE;";
-        sqls[36] = "DROP TABLE IF EXISTS MAIL_HOOKS CASCADE;";
-        sqls[37] = "DROP TABLE IF EXISTS DRAFT_KNOWLEDGES CASCADE;";
-        sqls[38] = "DROP TABLE IF EXISTS STOCKS CASCADE;";
-        sqls[39] = "DROP TABLE IF EXISTS STOCK_KNOWLEDGES CASCADE;";
-        sqls[40] = "DROP TABLE IF EXISTS KNOWLEDGE_USERS CASCADE;";
-        sqls[41] = "DROP TABLE IF EXISTS PARTICIPANTS CASCADE;";
-        sqls[42] = "DROP TABLE IF EXISTS TAGS CASCADE;";
-        sqls[43] = "DROP TABLE IF EXISTS TEMPLATE_ITEMS CASCADE;";
+        sqls[31] = "DROP TABLE IF EXISTS BADGES CASCADE;";
+        sqls[32] = "DROP TABLE IF EXISTS SURVEY_ANSWERS CASCADE;";
+        sqls[33] = "DROP TABLE IF EXISTS SURVEYS CASCADE;";
+        sqls[34] = "DROP TABLE IF EXISTS ACTIVITIES CASCADE;";
+        sqls[35] = "DROP TABLE IF EXISTS MAIL_TEMPLATES CASCADE;";
+        sqls[36] = "DROP TABLE IF EXISTS USER_BADGES CASCADE;";
+        sqls[37] = "DROP TABLE IF EXISTS NOTIFY_CONFIGS CASCADE;";
+        sqls[38] = "DROP TABLE IF EXISTS SURVEY_ITEMS CASCADE;";
+        sqls[39] = "DROP TABLE IF EXISTS MAIL_HOOKS CASCADE;";
+        sqls[40] = "DROP TABLE IF EXISTS DRAFT_KNOWLEDGES CASCADE;";
+        sqls[41] = "DROP TABLE IF EXISTS STOCKS CASCADE;";
+        sqls[42] = "DROP TABLE IF EXISTS STOCK_KNOWLEDGES CASCADE;";
+        sqls[43] = "DROP TABLE IF EXISTS KNOWLEDGE_USERS CASCADE;";
+        sqls[44] = "DROP TABLE IF EXISTS PARTICIPANTS CASCADE;";
+        sqls[45] = "DROP TABLE IF EXISTS TAGS CASCADE;";
+        sqls[46] = "DROP TABLE IF EXISTS TEMPLATE_ITEMS CASCADE;";
         for (String sql : sqls) {
             LOG.debug(sql);
             executeUpdate(sql);
@@ -72,7 +75,7 @@ public void dropAllTable() {
     }
     /** Delete all table data */
     public void dropAllData() {
-        String[] sqls = new String[44];
+        String[] sqls = new String[47];
         sqls[0] = "TRUNCATE TABLE KNOWLEDGES;";
         sqls[1] = "TRUNCATE TABLE SERVICE_LOCALE_CONFIGS;";
         sqls[2] = "TRUNCATE TABLE ACCOUNT_IMAGES;";
@@ -104,19 +107,22 @@ public void dropAllData() {
         sqls[28] = "TRUNCATE TABLE KNOWLEDGE_ITEM_VALUES;";
         sqls[29] = "TRUNCATE TABLE KNOWLEDGE_TAGS;";
         sqls[30] = "TRUNCATE TABLE LIKE_COMMENTS;";
-        sqls[31] = "TRUNCATE TABLE SURVEY_ANSWERS;";
-        sqls[32] = "TRUNCATE TABLE SURVEYS;";
-        sqls[33] = "TRUNCATE TABLE MAIL_TEMPLATES;";
-        sqls[34] = "TRUNCATE TABLE NOTIFY_CONFIGS;";
-        sqls[35] = "TRUNCATE TABLE SURVEY_ITEMS;";
-        sqls[36] = "TRUNCATE TABLE MAIL_HOOKS;";
-        sqls[37] = "TRUNCATE TABLE DRAFT_KNOWLEDGES;";
-        sqls[38] = "TRUNCATE TABLE STOCKS;";
-        sqls[39] = "TRUNCATE TABLE STOCK_KNOWLEDGES;";
-        sqls[40] = "TRUNCATE TABLE KNOWLEDGE_USERS;";
-        sqls[41] = "TRUNCATE TABLE PARTICIPANTS;";
-        sqls[42] = "TRUNCATE TABLE TAGS;";
-        sqls[43] = "TRUNCATE TABLE TEMPLATE_ITEMS;";
+        sqls[31] = "TRUNCATE TABLE BADGES;";
+        sqls[32] = "TRUNCATE TABLE SURVEY_ANSWERS;";
+        sqls[33] = "TRUNCATE TABLE SURVEYS;";
+        sqls[34] = "TRUNCATE TABLE ACTIVITIES;";
+        sqls[35] = "TRUNCATE TABLE MAIL_TEMPLATES;";
+        sqls[36] = "TRUNCATE TABLE USER_BADGES;";
+        sqls[37] = "TRUNCATE TABLE NOTIFY_CONFIGS;";
+        sqls[38] = "TRUNCATE TABLE SURVEY_ITEMS;";
+        sqls[39] = "TRUNCATE TABLE MAIL_HOOKS;";
+        sqls[40] = "TRUNCATE TABLE DRAFT_KNOWLEDGES;";
+        sqls[41] = "TRUNCATE TABLE STOCKS;";
+        sqls[42] = "TRUNCATE TABLE STOCK_KNOWLEDGES;";
+        sqls[43] = "TRUNCATE TABLE KNOWLEDGE_USERS;";
+        sqls[44] = "TRUNCATE TABLE PARTICIPANTS;";
+        sqls[45] = "TRUNCATE TABLE TAGS;";
+        sqls[46] = "TRUNCATE TABLE TEMPLATE_ITEMS;";
         for (String sql : sqls) {
             LOG.debug(sql);
             executeUpdate(sql);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
new file mode 100644
index 000000000..308493eae
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
@@ -0,0 +1,388 @@
+package org.support.project.knowledge.dao.gen;
+
+import java.util.List;
+
+import java.sql.Timestamp;
+
+
+import org.support.project.knowledge.entity.ActivitiesEntity;
+import org.support.project.ormapping.dao.AbstractDao;
+import org.support.project.ormapping.exception.ORMappingException;
+import org.support.project.ormapping.common.SQLManager;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.ormapping.common.IDGen;
+import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.connection.ConnectionManager;
+import org.support.project.common.util.PropertyUtil;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.aop.Aspect;
+
+/**
+ * アクティビティ
+ * this class is auto generate and not edit.
+ * if modify dao method, you can edit ActivitiesDao.
+ */
+@DI(instance = Instance.Singleton)
+public class GenActivitiesDao extends AbstractDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenActivitiesDao get() {
+        return Container.getComp(GenActivitiesDao.class);
+    }
+
+    /**
+     * Select all data.
+     * @return all data
+     */
+    public List<ActivitiesEntity> physicalSelectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql");
+        return executeQueryList(sql, ActivitiesEntity.class);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data on limit and offset
+     */
+    public List<ActivitiesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql");
+        return executeQueryList(sql, ActivitiesEntity.class, limit, offset);
+    }
+    /**
+     * Select data on key.
+     * @param  no no
+     * @return data
+     */
+    public ActivitiesEntity physicalSelectOnKey(Long no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql");
+        return executeQuerySingle(sql, ActivitiesEntity.class, no);
+    }
+    /**
+     * Select all data that not deleted.
+     * @return all data
+     */
+    public List<ActivitiesEntity> selectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql");
+        return executeQueryList(sql, ActivitiesEntity.class);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data
+     */
+    public List<ActivitiesEntity> selectAllWidthPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql");
+        return executeQueryList(sql, ActivitiesEntity.class, limit, offset);
+    }
+    /**
+     * Select count that not deleted.
+     * @return count
+     */
+    public Integer selectCountAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_count_all.sql");
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Select data that not deleted on key.
+     * @param  no no
+     * @return data
+     */
+    public ActivitiesEntity selectOnKey(Long no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql");
+        return executeQuerySingle(sql, ActivitiesEntity.class, no);
+    }
+    /**
+     * Count all data
+     * @return count
+     */
+    public int physicalCountAll() {
+        String sql = "SELECT COUNT(*) FROM ACTIVITIES";
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Physical Insert.
+     * it is not create key on database sequence.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public ActivitiesEntity rawPhysicalInsert(ActivitiesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_raw_insert.sql");
+        executeUpdate(sql, 
+            entity.getNo(), 
+            entity.getUserId(), 
+            entity.getType(), 
+            entity.getTarget(), 
+            entity.getPoint(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
+        if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
+            String setValSql = "select setval('ACTIVITIES_NO_seq', (select max(NO) from ACTIVITIES));";
+            executeQuerySingle(setValSql, Long.class);
+        }
+        return entity;
+    }
+    /**
+     * Physical Insert.
+     * if key column have sequence, key value create by database.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public ActivitiesEntity physicalInsert(ActivitiesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_insert.sql");
+        Class<?> type = PropertyUtil.getPropertyType(entity, "no");
+        Object key = executeInsert(sql, type, 
+            entity.getUserId(), 
+            entity.getType(), 
+            entity.getTarget(), 
+            entity.getPoint(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        PropertyUtil.setPropertyValue(entity, "no", key);
+        return entity;
+    }
+    /**
+     * Insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public ActivitiesEntity insert(Integer user, ActivitiesEntity entity) {
+        entity.setInsertUser(user);
+        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setDeleteFlag(0);
+        return physicalInsert(entity);
+    }
+    /**
+     * Insert.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public ActivitiesEntity insert(ActivitiesEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return insert(userId, entity);
+    }
+    /**
+     * Physical Update.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public ActivitiesEntity physicalUpdate(ActivitiesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_update.sql");
+        executeUpdate(sql, 
+            entity.getUserId(), 
+            entity.getType(), 
+            entity.getTarget(), 
+            entity.getPoint(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag(), 
+            entity.getNo());
+        return entity;
+    }
+    /**
+     * Update.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public ActivitiesEntity update(Integer user, ActivitiesEntity entity) {
+        ActivitiesEntity db = selectOnKey(entity.getNo());
+        entity.setInsertUser(db.getInsertUser());
+        entity.setInsertDatetime(db.getInsertDatetime());
+        entity.setDeleteFlag(db.getDeleteFlag());
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        return physicalUpdate(entity);
+    }
+    /**
+     * Update.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public ActivitiesEntity update(ActivitiesEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return update(userId, entity);
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public ActivitiesEntity save(Integer user, ActivitiesEntity entity) {
+        ActivitiesEntity db = selectOnKey(entity.getNo());
+        if (db == null) {
+            return insert(user, entity);
+        } else {
+            return update(user, entity);
+        }
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public ActivitiesEntity save(ActivitiesEntity entity) {
+        ActivitiesEntity db = selectOnKey(entity.getNo());
+        if (db == null) {
+            return insert(entity);
+        } else {
+            return update(entity);
+        }
+    }
+    /**
+     * Physical Delete.
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(Long no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_delete.sql");
+        executeUpdate(sql, no);
+    }
+    /**
+     * Physical Delete.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(ActivitiesEntity entity) {
+        physicalDelete(entity.getNo());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, Long no) {
+        ActivitiesEntity db = selectOnKey(no);
+        db.setDeleteFlag(1);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Long no) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        delete(user, no);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, ActivitiesEntity entity) {
+        delete(user, entity.getNo());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(ActivitiesEntity entity) {
+        delete(entity.getNo());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, Long no) {
+        ActivitiesEntity db = physicalSelectOnKey(no);
+        db.setDeleteFlag(0);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Long no) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        activation(user, no);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, ActivitiesEntity entity) {
+        activation(user, entity.getNo());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(ActivitiesEntity entity) {
+        activation(entity.getNo());
+
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
new file mode 100644
index 000000000..e15451c26
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
@@ -0,0 +1,388 @@
+package org.support.project.knowledge.dao.gen;
+
+import java.util.List;
+
+import java.sql.Timestamp;
+
+
+import org.support.project.knowledge.entity.BadgesEntity;
+import org.support.project.ormapping.dao.AbstractDao;
+import org.support.project.ormapping.exception.ORMappingException;
+import org.support.project.ormapping.common.SQLManager;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.ormapping.common.IDGen;
+import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.connection.ConnectionManager;
+import org.support.project.common.util.PropertyUtil;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.aop.Aspect;
+
+/**
+ * 称号
+ * this class is auto generate and not edit.
+ * if modify dao method, you can edit BadgesDao.
+ */
+@DI(instance = Instance.Singleton)
+public class GenBadgesDao extends AbstractDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenBadgesDao get() {
+        return Container.getComp(GenBadgesDao.class);
+    }
+
+    /**
+     * Select all data.
+     * @return all data
+     */
+    public List<BadgesEntity> physicalSelectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql");
+        return executeQueryList(sql, BadgesEntity.class);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data on limit and offset
+     */
+    public List<BadgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql");
+        return executeQueryList(sql, BadgesEntity.class, limit, offset);
+    }
+    /**
+     * Select data on key.
+     * @param  no no
+     * @return data
+     */
+    public BadgesEntity physicalSelectOnKey(Integer no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_on_key.sql");
+        return executeQuerySingle(sql, BadgesEntity.class, no);
+    }
+    /**
+     * Select all data that not deleted.
+     * @return all data
+     */
+    public List<BadgesEntity> selectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql");
+        return executeQueryList(sql, BadgesEntity.class);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data
+     */
+    public List<BadgesEntity> selectAllWidthPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql");
+        return executeQueryList(sql, BadgesEntity.class, limit, offset);
+    }
+    /**
+     * Select count that not deleted.
+     * @return count
+     */
+    public Integer selectCountAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_count_all.sql");
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Select data that not deleted on key.
+     * @param  no no
+     * @return data
+     */
+    public BadgesEntity selectOnKey(Integer no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_on_key.sql");
+        return executeQuerySingle(sql, BadgesEntity.class, no);
+    }
+    /**
+     * Count all data
+     * @return count
+     */
+    public int physicalCountAll() {
+        String sql = "SELECT COUNT(*) FROM BADGES";
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Physical Insert.
+     * it is not create key on database sequence.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public BadgesEntity rawPhysicalInsert(BadgesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_raw_insert.sql");
+        executeUpdate(sql, 
+            entity.getNo(), 
+            entity.getName(), 
+            entity.getDisplayText(), 
+            entity.getDescription(), 
+            entity.getImageCategory(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
+        if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
+            String setValSql = "select setval('BADGES_NO_seq', (select max(NO) from BADGES));";
+            executeQuerySingle(setValSql, Long.class);
+        }
+        return entity;
+    }
+    /**
+     * Physical Insert.
+     * if key column have sequence, key value create by database.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public BadgesEntity physicalInsert(BadgesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_insert.sql");
+        Class<?> type = PropertyUtil.getPropertyType(entity, "no");
+        Object key = executeInsert(sql, type, 
+            entity.getName(), 
+            entity.getDisplayText(), 
+            entity.getDescription(), 
+            entity.getImageCategory(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        PropertyUtil.setPropertyValue(entity, "no", key);
+        return entity;
+    }
+    /**
+     * Insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public BadgesEntity insert(Integer user, BadgesEntity entity) {
+        entity.setInsertUser(user);
+        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setDeleteFlag(0);
+        return physicalInsert(entity);
+    }
+    /**
+     * Insert.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public BadgesEntity insert(BadgesEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return insert(userId, entity);
+    }
+    /**
+     * Physical Update.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public BadgesEntity physicalUpdate(BadgesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_update.sql");
+        executeUpdate(sql, 
+            entity.getName(), 
+            entity.getDisplayText(), 
+            entity.getDescription(), 
+            entity.getImageCategory(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag(), 
+            entity.getNo());
+        return entity;
+    }
+    /**
+     * Update.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public BadgesEntity update(Integer user, BadgesEntity entity) {
+        BadgesEntity db = selectOnKey(entity.getNo());
+        entity.setInsertUser(db.getInsertUser());
+        entity.setInsertDatetime(db.getInsertDatetime());
+        entity.setDeleteFlag(db.getDeleteFlag());
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        return physicalUpdate(entity);
+    }
+    /**
+     * Update.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public BadgesEntity update(BadgesEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return update(userId, entity);
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public BadgesEntity save(Integer user, BadgesEntity entity) {
+        BadgesEntity db = selectOnKey(entity.getNo());
+        if (db == null) {
+            return insert(user, entity);
+        } else {
+            return update(user, entity);
+        }
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public BadgesEntity save(BadgesEntity entity) {
+        BadgesEntity db = selectOnKey(entity.getNo());
+        if (db == null) {
+            return insert(entity);
+        } else {
+            return update(entity);
+        }
+    }
+    /**
+     * Physical Delete.
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(Integer no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_delete.sql");
+        executeUpdate(sql, no);
+    }
+    /**
+     * Physical Delete.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(BadgesEntity entity) {
+        physicalDelete(entity.getNo());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, Integer no) {
+        BadgesEntity db = selectOnKey(no);
+        db.setDeleteFlag(1);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer no) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        delete(user, no);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, BadgesEntity entity) {
+        delete(user, entity.getNo());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(BadgesEntity entity) {
+        delete(entity.getNo());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, Integer no) {
+        BadgesEntity db = physicalSelectOnKey(no);
+        db.setDeleteFlag(0);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param  no no
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer no) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        activation(user, no);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, BadgesEntity entity) {
+        activation(user, entity.getNo());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(BadgesEntity entity) {
+        activation(entity.getNo());
+
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
index edfa1ffb7..0497b7936 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
@@ -130,6 +130,7 @@ public KnowledgesEntity rawPhysicalInsert(KnowledgesEntity entity) {
             entity.getViewCount(), 
             entity.getTypeId(), 
             entity.getNotifyStatus(), 
+            entity.getPoint(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -163,6 +164,7 @@ public KnowledgesEntity physicalInsert(KnowledgesEntity entity) {
             entity.getViewCount(), 
             entity.getTypeId(), 
             entity.getNotifyStatus(), 
+            entity.getPoint(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -218,6 +220,7 @@ public KnowledgesEntity physicalUpdate(KnowledgesEntity entity) {
             entity.getViewCount(), 
             entity.getTypeId(), 
             entity.getNotifyStatus(), 
+            entity.getPoint(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
new file mode 100644
index 000000000..7b347930a
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
@@ -0,0 +1,416 @@
+package org.support.project.knowledge.dao.gen;
+
+import java.util.List;
+
+import java.sql.Timestamp;
+
+
+import org.support.project.knowledge.entity.UserBadgesEntity;
+import org.support.project.ormapping.dao.AbstractDao;
+import org.support.project.ormapping.exception.ORMappingException;
+import org.support.project.ormapping.common.SQLManager;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.ormapping.common.IDGen;
+import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.connection.ConnectionManager;
+import org.support.project.common.util.PropertyUtil;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.aop.Aspect;
+
+/**
+ * ユーザの称号
+ * this class is auto generate and not edit.
+ * if modify dao method, you can edit UserBadgesDao.
+ */
+@DI(instance = Instance.Singleton)
+public class GenUserBadgesDao extends AbstractDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenUserBadgesDao get() {
+        return Container.getComp(GenUserBadgesDao.class);
+    }
+
+    /**
+     * Select all data.
+     * @return all data
+     */
+    public List<UserBadgesEntity> physicalSelectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql");
+        return executeQueryList(sql, UserBadgesEntity.class);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data on limit and offset
+     */
+    public List<UserBadgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql");
+        return executeQueryList(sql, UserBadgesEntity.class, limit, offset);
+    }
+    /**
+     * Select data on key.
+     * @param  no no
+     * @param  userId userId
+     * @return data
+     */
+    public UserBadgesEntity physicalSelectOnKey(Integer no, Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_key.sql");
+        return executeQuerySingle(sql, UserBadgesEntity.class, no, userId);
+    }
+    /**
+     * Select all data that not deleted.
+     * @return all data
+     */
+    public List<UserBadgesEntity> selectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql");
+        return executeQueryList(sql, UserBadgesEntity.class);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data
+     */
+    public List<UserBadgesEntity> selectAllWidthPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql");
+        return executeQueryList(sql, UserBadgesEntity.class, limit, offset);
+    }
+    /**
+     * Select count that not deleted.
+     * @return count
+     */
+    public Integer selectCountAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_count_all.sql");
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Select data that not deleted on key.
+     * @param  no no
+     * @param  userId userId
+     * @return data
+     */
+    public UserBadgesEntity selectOnKey(Integer no, Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_key.sql");
+        return executeQuerySingle(sql, UserBadgesEntity.class, no, userId);
+    }
+    /**
+     * Select data that not deleted on NO column.
+     * @param no no
+     * @return list
+     */
+    public List<UserBadgesEntity> selectOnNo(Integer no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_no.sql");
+        return executeQueryList(sql, UserBadgesEntity.class, no);
+    }
+    /**
+     * Select data that not deleted on USER_ID column.
+     * @param userId userId
+     * @return list
+     */
+    public List<UserBadgesEntity> selectOnUserId(Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_user_id.sql");
+        return executeQueryList(sql, UserBadgesEntity.class, userId);
+    }
+    /**
+     * Select data on NO column.
+     * @param no no
+     * @return list
+     */
+    public List<UserBadgesEntity> physicalSelectOnNo(Integer no) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_no.sql");
+        return executeQueryList(sql, UserBadgesEntity.class, no);
+    }
+    /**
+     * Select data on USER_ID column.
+     * @param userId userId
+     * @return list
+     */
+    public List<UserBadgesEntity> physicalSelectOnUserId(Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_user_id.sql");
+        return executeQueryList(sql, UserBadgesEntity.class, userId);
+    }
+    /**
+     * Count all data
+     * @return count
+     */
+    public int physicalCountAll() {
+        String sql = "SELECT COUNT(*) FROM USER_BADGES";
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Physical Insert.
+     * it is not create key on database sequence.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public UserBadgesEntity rawPhysicalInsert(UserBadgesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_raw_insert.sql");
+        executeUpdate(sql, 
+            entity.getNo(), 
+            entity.getUserId(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        return entity;
+    }
+    /**
+     * Physical Insert.
+     * if key column have sequence, key value create by database.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public UserBadgesEntity physicalInsert(UserBadgesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_insert.sql");
+        executeUpdate(sql, 
+            entity.getNo(), 
+            entity.getUserId(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        return entity;
+    }
+    /**
+     * Insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public UserBadgesEntity insert(Integer user, UserBadgesEntity entity) {
+        entity.setInsertUser(user);
+        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setDeleteFlag(0);
+        return physicalInsert(entity);
+    }
+    /**
+     * Insert.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public UserBadgesEntity insert(UserBadgesEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return insert(userId, entity);
+    }
+    /**
+     * Physical Update.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public UserBadgesEntity physicalUpdate(UserBadgesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_update.sql");
+        executeUpdate(sql, 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag(), 
+            entity.getNo(), 
+            entity.getUserId());
+        return entity;
+    }
+    /**
+     * Update.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public UserBadgesEntity update(Integer user, UserBadgesEntity entity) {
+        UserBadgesEntity db = selectOnKey(entity.getNo(), entity.getUserId());
+        entity.setInsertUser(db.getInsertUser());
+        entity.setInsertDatetime(db.getInsertDatetime());
+        entity.setDeleteFlag(db.getDeleteFlag());
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        return physicalUpdate(entity);
+    }
+    /**
+     * Update.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public UserBadgesEntity update(UserBadgesEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return update(userId, entity);
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public UserBadgesEntity save(Integer user, UserBadgesEntity entity) {
+        UserBadgesEntity db = selectOnKey(entity.getNo(), entity.getUserId());
+        if (db == null) {
+            return insert(user, entity);
+        } else {
+            return update(user, entity);
+        }
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public UserBadgesEntity save(UserBadgesEntity entity) {
+        UserBadgesEntity db = selectOnKey(entity.getNo(), entity.getUserId());
+        if (db == null) {
+            return insert(entity);
+        } else {
+            return update(entity);
+        }
+    }
+    /**
+     * Physical Delete.
+     * @param  no no
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(Integer no, Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_delete.sql");
+        executeUpdate(sql, no, userId);
+    }
+    /**
+     * Physical Delete.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(UserBadgesEntity entity) {
+        physicalDelete(entity.getNo(), entity.getUserId());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param  no no
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, Integer no, Integer userId) {
+        UserBadgesEntity db = selectOnKey(no, userId);
+        db.setDeleteFlag(1);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * @param  no no
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer no, Integer userId) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        delete(user, no, userId);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, UserBadgesEntity entity) {
+        delete(user, entity.getNo(), entity.getUserId());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(UserBadgesEntity entity) {
+        delete(entity.getNo(), entity.getUserId());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param  no no
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, Integer no, Integer userId) {
+        UserBadgesEntity db = physicalSelectOnKey(no, userId);
+        db.setDeleteFlag(0);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param  no no
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer no, Integer userId) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        activation(user, no, userId);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, UserBadgesEntity entity) {
+        activation(user, entity.getNo(), entity.getUserId());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(UserBadgesEntity entity) {
+        activation(entity.getNo(), entity.getUserId());
+
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/ActivitiesEntity.java b/src/main/java/org/support/project/knowledge/entity/ActivitiesEntity.java
new file mode 100644
index 000000000..edbb7647c
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/ActivitiesEntity.java
@@ -0,0 +1,49 @@
+package org.support.project.knowledge.entity;
+
+import org.support.project.knowledge.entity.gen.GenActivitiesEntity;
+
+import java.util.List;
+import java.util.Map;
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import java.sql.Timestamp;
+
+
+/**
+ * アクティビティ
+ */
+@DI(instance = Instance.Prototype)
+public class ActivitiesEntity extends GenActivitiesEntity {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static ActivitiesEntity get() {
+        return Container.getComp(ActivitiesEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public ActivitiesEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param no 番号
+     */
+
+    public ActivitiesEntity(Long no) {
+        super( no);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/BadgesEntity.java b/src/main/java/org/support/project/knowledge/entity/BadgesEntity.java
new file mode 100644
index 000000000..f68781ee4
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/BadgesEntity.java
@@ -0,0 +1,49 @@
+package org.support.project.knowledge.entity;
+
+import org.support.project.knowledge.entity.gen.GenBadgesEntity;
+
+import java.util.List;
+import java.util.Map;
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import java.sql.Timestamp;
+
+
+/**
+ * 称号
+ */
+@DI(instance = Instance.Prototype)
+public class BadgesEntity extends GenBadgesEntity {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static BadgesEntity get() {
+        return Container.getComp(BadgesEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public BadgesEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param no 番号
+     */
+
+    public BadgesEntity(Integer no) {
+        super( no);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/UserBadgesEntity.java b/src/main/java/org/support/project/knowledge/entity/UserBadgesEntity.java
new file mode 100644
index 000000000..060308566
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/UserBadgesEntity.java
@@ -0,0 +1,50 @@
+package org.support.project.knowledge.entity;
+
+import org.support.project.knowledge.entity.gen.GenUserBadgesEntity;
+
+import java.util.List;
+import java.util.Map;
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import java.sql.Timestamp;
+
+
+/**
+ * ユーザの称号
+ */
+@DI(instance = Instance.Prototype)
+public class UserBadgesEntity extends GenUserBadgesEntity {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static UserBadgesEntity get() {
+        return Container.getComp(UserBadgesEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public UserBadgesEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param no 番号
+     * @param userId ユーザID
+     */
+
+    public UserBadgesEntity(Integer no, Integer userId) {
+        super( no,  userId);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenActivitiesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenActivitiesEntity.java
new file mode 100644
index 000000000..201cbe360
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenActivitiesEntity.java
@@ -0,0 +1,423 @@
+package org.support.project.knowledge.entity.gen;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+import java.sql.Timestamp;
+
+
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.common.validate.Validator;
+import org.support.project.common.validate.ValidatorFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+/**
+ * アクティビティ
+ */
+@DI(instance = Instance.Prototype)
+public class GenActivitiesEntity implements Serializable {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenActivitiesEntity get() {
+        return Container.getComp(GenActivitiesEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public GenActivitiesEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param no 番号
+     */
+
+    public GenActivitiesEntity(Long no) {
+        super();
+        this.no = no;
+    }
+    /** 番号 */
+    private Long no;
+    /** ユーザID */
+    private Integer userId;
+    /** 種類 */
+    private Integer type;
+    /** ターゲットID */
+    private Long target;
+    /** 獲得ポイント */
+    private Integer point;
+    /** 登録ユーザ */
+    private Integer insertUser;
+    /** 登録日時 */
+    private Timestamp insertDatetime;
+    /** 更新ユーザ */
+    private Integer updateUser;
+    /** 更新日時 */
+    private Timestamp updateDatetime;
+    /** 削除フラグ */
+    private Integer deleteFlag;
+
+    /**
+     * Get 番号.
+     * @return 番号
+     */
+    public Long getNo() {
+        return this.no;
+    }
+    /**
+     * Set 番号.
+     * @param no 番号
+     * @return this object     */
+    public GenActivitiesEntity setNo(Long no) {
+        this.no = no;
+        return this;
+    }
+
+    /**
+     * Get ユーザID.
+     * @return ユーザID
+     */
+    public Integer getUserId() {
+        return this.userId;
+    }
+    /**
+     * Set ユーザID.
+     * @param userId ユーザID
+     * @return this object     */
+    public GenActivitiesEntity setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    /**
+     * Get 種類.
+     * @return 種類
+     */
+    public Integer getType() {
+        return this.type;
+    }
+    /**
+     * Set 種類.
+     * @param type 種類
+     * @return this object     */
+    public GenActivitiesEntity setType(Integer type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get ターゲットID.
+     * @return ターゲットID
+     */
+    public Long getTarget() {
+        return this.target;
+    }
+    /**
+     * Set ターゲットID.
+     * @param target ターゲットID
+     * @return this object     */
+    public GenActivitiesEntity setTarget(Long target) {
+        this.target = target;
+        return this;
+    }
+
+    /**
+     * Get 獲得ポイント.
+     * @return 獲得ポイント
+     */
+    public Integer getPoint() {
+        return this.point;
+    }
+    /**
+     * Set 獲得ポイント.
+     * @param point 獲得ポイント
+     * @return this object     */
+    public GenActivitiesEntity setPoint(Integer point) {
+        this.point = point;
+        return this;
+    }
+
+    /**
+     * Get 登録ユーザ.
+     * @return 登録ユーザ
+     */
+    public Integer getInsertUser() {
+        return this.insertUser;
+    }
+    /**
+     * Set 登録ユーザ.
+     * @param insertUser 登録ユーザ
+     * @return this object     */
+    public GenActivitiesEntity setInsertUser(Integer insertUser) {
+        this.insertUser = insertUser;
+        return this;
+    }
+
+    /**
+     * Get 登録日時.
+     * @return 登録日時
+     */
+    public Timestamp getInsertDatetime() {
+        return this.insertDatetime;
+    }
+    /**
+     * Set 登録日時.
+     * @param insertDatetime 登録日時
+     * @return this object     */
+    public GenActivitiesEntity setInsertDatetime(Timestamp insertDatetime) {
+        this.insertDatetime = insertDatetime;
+        return this;
+    }
+
+    /**
+     * Get 更新ユーザ.
+     * @return 更新ユーザ
+     */
+    public Integer getUpdateUser() {
+        return this.updateUser;
+    }
+    /**
+     * Set 更新ユーザ.
+     * @param updateUser 更新ユーザ
+     * @return this object     */
+    public GenActivitiesEntity setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+        return this;
+    }
+
+    /**
+     * Get 更新日時.
+     * @return 更新日時
+     */
+    public Timestamp getUpdateDatetime() {
+        return this.updateDatetime;
+    }
+    /**
+     * Set 更新日時.
+     * @param updateDatetime 更新日時
+     * @return this object     */
+    public GenActivitiesEntity setUpdateDatetime(Timestamp updateDatetime) {
+        this.updateDatetime = updateDatetime;
+        return this;
+    }
+
+    /**
+     * Get 削除フラグ.
+     * @return 削除フラグ
+     */
+    public Integer getDeleteFlag() {
+        return this.deleteFlag;
+    }
+    /**
+     * Set 削除フラグ.
+     * @param deleteFlag 削除フラグ
+     * @return this object     */
+    public GenActivitiesEntity setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
+    /**
+     * Get key values 
+     * @return values 
+     */
+    public Object[] getKeyValues() {
+        Object[] keyValues = new Object[1];
+        keyValues[0] = this.no;
+        return keyValues;
+    }
+    /**
+     * Set key values 
+     * @param no 番号
+     */
+    public void setKeyValues(Long no) {
+        this.no = no;
+    }
+    /**
+     * compare on key 
+     * @param entity entity 
+     * @return result 
+     */
+    public boolean equalsOnKey(GenActivitiesEntity entity) {
+        Object[] keyValues1 = getKeyValues();
+        Object[] keyValues2 = entity.getKeyValues();
+        for (int i = 0; i < keyValues1.length; i++) {
+            Object val1 = keyValues1[i];
+            Object val2 = keyValues2[i];
+            if (val1 == null && val2 != null) {
+                return false;
+            }
+            if (val1 != null && val2 == null) {
+                return false;
+            }
+            if (val1 != null && val2 != null) {
+                if (!val1.equals(val2)) {
+                    return false;
+                }
+            }
+            
+        }
+        return true;
+    }
+    /**
+     * ToString 
+     * @return string 
+     */
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("no = ").append(no).append("\n");
+        builder.append("userId = ").append(userId).append("\n");
+        builder.append("type = ").append(type).append("\n");
+        builder.append("target = ").append(target).append("\n");
+        builder.append("point = ").append(point).append("\n");
+        builder.append("insertUser = ").append(insertUser).append("\n");
+        builder.append("insertDatetime = ").append(insertDatetime).append("\n");
+        builder.append("updateUser = ").append(updateUser).append("\n");
+        builder.append("updateDatetime = ").append(updateDatetime).append("\n");
+        builder.append("deleteFlag = ").append(deleteFlag).append("\n");
+        return builder.toString();
+    }
+    /**
+     * Convert label to display 
+     * @param label label
+     * @return convert label 
+     */
+    protected String convLabelName(String label) {
+        return label;
+    }
+    /**
+     * validate 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate() {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.userId, convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.userId, convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.type, convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.type, convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.target, convLabelName("Target"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.point, convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.point, convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.insertUser, convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.updateUser, convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.deleteFlag, convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+    /**
+     * validate 
+     * @param values value map 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate(Map<String, String> values) {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("userId"), convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("userId"), convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("type"), convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("type"), convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("target"), convLabelName("Target"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("point"), convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("point"), convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("updateUser"), convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("deleteFlag"), convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenBadgesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenBadgesEntity.java
new file mode 100644
index 000000000..d1ac98afb
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenBadgesEntity.java
@@ -0,0 +1,413 @@
+package org.support.project.knowledge.entity.gen;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+import java.sql.Timestamp;
+
+
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.common.validate.Validator;
+import org.support.project.common.validate.ValidatorFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+/**
+ * 称号
+ */
+@DI(instance = Instance.Prototype)
+public class GenBadgesEntity implements Serializable {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenBadgesEntity get() {
+        return Container.getComp(GenBadgesEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public GenBadgesEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param no 番号
+     */
+
+    public GenBadgesEntity(Integer no) {
+        super();
+        this.no = no;
+    }
+    /** 番号 */
+    private Integer no;
+    /** 名称 */
+    private String name;
+    /** 表示名 */
+    private String displayText;
+    /** 説明 */
+    private String description;
+    /** 画像の種類 */
+    private Integer imageCategory;
+    /** 登録ユーザ */
+    private Integer insertUser;
+    /** 登録日時 */
+    private Timestamp insertDatetime;
+    /** 更新ユーザ */
+    private Integer updateUser;
+    /** 更新日時 */
+    private Timestamp updateDatetime;
+    /** 削除フラグ */
+    private Integer deleteFlag;
+
+    /**
+     * Get 番号.
+     * @return 番号
+     */
+    public Integer getNo() {
+        return this.no;
+    }
+    /**
+     * Set 番号.
+     * @param no 番号
+     * @return this object     */
+    public GenBadgesEntity setNo(Integer no) {
+        this.no = no;
+        return this;
+    }
+
+    /**
+     * Get 名称.
+     * @return 名称
+     */
+    public String getName() {
+        return this.name;
+    }
+    /**
+     * Set 名称.
+     * @param name 名称
+     * @return this object     */
+    public GenBadgesEntity setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get 表示名.
+     * @return 表示名
+     */
+    public String getDisplayText() {
+        return this.displayText;
+    }
+    /**
+     * Set 表示名.
+     * @param displayText 表示名
+     * @return this object     */
+    public GenBadgesEntity setDisplayText(String displayText) {
+        this.displayText = displayText;
+        return this;
+    }
+
+    /**
+     * Get 説明.
+     * @return 説明
+     */
+    public String getDescription() {
+        return this.description;
+    }
+    /**
+     * Set 説明.
+     * @param description 説明
+     * @return this object     */
+    public GenBadgesEntity setDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get 画像の種類.
+     * @return 画像の種類
+     */
+    public Integer getImageCategory() {
+        return this.imageCategory;
+    }
+    /**
+     * Set 画像の種類.
+     * @param imageCategory 画像の種類
+     * @return this object     */
+    public GenBadgesEntity setImageCategory(Integer imageCategory) {
+        this.imageCategory = imageCategory;
+        return this;
+    }
+
+    /**
+     * Get 登録ユーザ.
+     * @return 登録ユーザ
+     */
+    public Integer getInsertUser() {
+        return this.insertUser;
+    }
+    /**
+     * Set 登録ユーザ.
+     * @param insertUser 登録ユーザ
+     * @return this object     */
+    public GenBadgesEntity setInsertUser(Integer insertUser) {
+        this.insertUser = insertUser;
+        return this;
+    }
+
+    /**
+     * Get 登録日時.
+     * @return 登録日時
+     */
+    public Timestamp getInsertDatetime() {
+        return this.insertDatetime;
+    }
+    /**
+     * Set 登録日時.
+     * @param insertDatetime 登録日時
+     * @return this object     */
+    public GenBadgesEntity setInsertDatetime(Timestamp insertDatetime) {
+        this.insertDatetime = insertDatetime;
+        return this;
+    }
+
+    /**
+     * Get 更新ユーザ.
+     * @return 更新ユーザ
+     */
+    public Integer getUpdateUser() {
+        return this.updateUser;
+    }
+    /**
+     * Set 更新ユーザ.
+     * @param updateUser 更新ユーザ
+     * @return this object     */
+    public GenBadgesEntity setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+        return this;
+    }
+
+    /**
+     * Get 更新日時.
+     * @return 更新日時
+     */
+    public Timestamp getUpdateDatetime() {
+        return this.updateDatetime;
+    }
+    /**
+     * Set 更新日時.
+     * @param updateDatetime 更新日時
+     * @return this object     */
+    public GenBadgesEntity setUpdateDatetime(Timestamp updateDatetime) {
+        this.updateDatetime = updateDatetime;
+        return this;
+    }
+
+    /**
+     * Get 削除フラグ.
+     * @return 削除フラグ
+     */
+    public Integer getDeleteFlag() {
+        return this.deleteFlag;
+    }
+    /**
+     * Set 削除フラグ.
+     * @param deleteFlag 削除フラグ
+     * @return this object     */
+    public GenBadgesEntity setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
+    /**
+     * Get key values 
+     * @return values 
+     */
+    public Object[] getKeyValues() {
+        Object[] keyValues = new Object[1];
+        keyValues[0] = this.no;
+        return keyValues;
+    }
+    /**
+     * Set key values 
+     * @param no 番号
+     */
+    public void setKeyValues(Integer no) {
+        this.no = no;
+    }
+    /**
+     * compare on key 
+     * @param entity entity 
+     * @return result 
+     */
+    public boolean equalsOnKey(GenBadgesEntity entity) {
+        Object[] keyValues1 = getKeyValues();
+        Object[] keyValues2 = entity.getKeyValues();
+        for (int i = 0; i < keyValues1.length; i++) {
+            Object val1 = keyValues1[i];
+            Object val2 = keyValues2[i];
+            if (val1 == null && val2 != null) {
+                return false;
+            }
+            if (val1 != null && val2 == null) {
+                return false;
+            }
+            if (val1 != null && val2 != null) {
+                if (!val1.equals(val2)) {
+                    return false;
+                }
+            }
+            
+        }
+        return true;
+    }
+    /**
+     * ToString 
+     * @return string 
+     */
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("no = ").append(no).append("\n");
+        builder.append("name = ").append(name).append("\n");
+        builder.append("displayText = ").append(displayText).append("\n");
+        builder.append("description = ").append(description).append("\n");
+        builder.append("imageCategory = ").append(imageCategory).append("\n");
+        builder.append("insertUser = ").append(insertUser).append("\n");
+        builder.append("insertDatetime = ").append(insertDatetime).append("\n");
+        builder.append("updateUser = ").append(updateUser).append("\n");
+        builder.append("updateDatetime = ").append(updateDatetime).append("\n");
+        builder.append("deleteFlag = ").append(deleteFlag).append("\n");
+        return builder.toString();
+    }
+    /**
+     * Convert label to display 
+     * @param label label
+     * @return convert label 
+     */
+    protected String convLabelName(String label) {
+        return label;
+    }
+    /**
+     * validate 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate() {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.no, convLabelName("No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.name, convLabelName("Name"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.MAX_LENGTH);
+        error = validator.validate(this.name, convLabelName("Name"), 128);
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.displayText, convLabelName("Display Text"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.MAX_LENGTH);
+        error = validator.validate(this.displayText, convLabelName("Display Text"), 32);
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.imageCategory, convLabelName("Image Category"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.insertUser, convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.updateUser, convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.deleteFlag, convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+    /**
+     * validate 
+     * @param values value map 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate(Map<String, String> values) {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("no"), convLabelName("No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("name"), convLabelName("Name"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.MAX_LENGTH);
+        error = validator.validate(values.get("name"), convLabelName("Name"), 128);
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("displayText"), convLabelName("Display Text"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.MAX_LENGTH);
+        error = validator.validate(values.get("displayText"), convLabelName("Display Text"), 32);
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("imageCategory"), convLabelName("Image Category"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("updateUser"), convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("deleteFlag"), convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
index 381eefd72..97f242a7e 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
@@ -71,6 +71,8 @@ public GenKnowledgesEntity(Long knowledgeId) {
     private Integer typeId;
     /** 通知ステータス */
     private Integer notifyStatus;
+    /** ポイント */
+    private Integer point;
     /** 登録ユーザ */
     private Integer insertUser;
     /** 登録日時 */
@@ -258,6 +260,22 @@ public GenKnowledgesEntity setNotifyStatus(Integer notifyStatus) {
         return this;
     }
 
+    /**
+     * Get ポイント.
+     * @return ポイント
+     */
+    public Integer getPoint() {
+        return this.point;
+    }
+    /**
+     * Set ポイント.
+     * @param point ポイント
+     * @return this object     */
+    public GenKnowledgesEntity setPoint(Integer point) {
+        this.point = point;
+        return this;
+    }
+
     /**
      * Get 登録ユーザ.
      * @return 登録ユーザ
@@ -397,6 +415,7 @@ public String toString() {
         builder.append("viewCount = ").append(viewCount).append("\n");
         builder.append("typeId = ").append(typeId).append("\n");
         builder.append("notifyStatus = ").append(notifyStatus).append("\n");
+        builder.append("point = ").append(point).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
         builder.append("insertDatetime = ").append(insertDatetime).append("\n");
         builder.append("updateUser = ").append(updateUser).append("\n");
@@ -455,6 +474,16 @@ public List<ValidateError> validate() {
         if (error != null) {
             errors.add(error);
         }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.point, convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.point, convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
         error = validator.validate(this.insertUser, convLabelName("Insert User"));
         if (error != null) {
@@ -516,6 +545,16 @@ public List<ValidateError> validate(Map<String, String> values) {
         if (error != null) {
             errors.add(error);
         }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("point"), convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("point"), convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
         error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
         if (error != null) {
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenUserBadgesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenUserBadgesEntity.java
new file mode 100644
index 000000000..fbabbd8ee
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenUserBadgesEntity.java
@@ -0,0 +1,341 @@
+package org.support.project.knowledge.entity.gen;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+import java.sql.Timestamp;
+
+
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.common.validate.Validator;
+import org.support.project.common.validate.ValidatorFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+/**
+ * ユーザの称号
+ */
+@DI(instance = Instance.Prototype)
+public class GenUserBadgesEntity implements Serializable {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenUserBadgesEntity get() {
+        return Container.getComp(GenUserBadgesEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public GenUserBadgesEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param no 番号
+     * @param userId ユーザID
+     */
+
+    public GenUserBadgesEntity(Integer no, Integer userId) {
+        super();
+        this.no = no;
+        this.userId = userId;
+    }
+    /** ユーザID */
+    private Integer userId;
+    /** 番号 */
+    private Integer no;
+    /** 登録ユーザ */
+    private Integer insertUser;
+    /** 登録日時 */
+    private Timestamp insertDatetime;
+    /** 更新ユーザ */
+    private Integer updateUser;
+    /** 更新日時 */
+    private Timestamp updateDatetime;
+    /** 削除フラグ */
+    private Integer deleteFlag;
+
+    /**
+     * Get ユーザID.
+     * @return ユーザID
+     */
+    public Integer getUserId() {
+        return this.userId;
+    }
+    /**
+     * Set ユーザID.
+     * @param userId ユーザID
+     * @return this object     */
+    public GenUserBadgesEntity setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    /**
+     * Get 番号.
+     * @return 番号
+     */
+    public Integer getNo() {
+        return this.no;
+    }
+    /**
+     * Set 番号.
+     * @param no 番号
+     * @return this object     */
+    public GenUserBadgesEntity setNo(Integer no) {
+        this.no = no;
+        return this;
+    }
+
+    /**
+     * Get 登録ユーザ.
+     * @return 登録ユーザ
+     */
+    public Integer getInsertUser() {
+        return this.insertUser;
+    }
+    /**
+     * Set 登録ユーザ.
+     * @param insertUser 登録ユーザ
+     * @return this object     */
+    public GenUserBadgesEntity setInsertUser(Integer insertUser) {
+        this.insertUser = insertUser;
+        return this;
+    }
+
+    /**
+     * Get 登録日時.
+     * @return 登録日時
+     */
+    public Timestamp getInsertDatetime() {
+        return this.insertDatetime;
+    }
+    /**
+     * Set 登録日時.
+     * @param insertDatetime 登録日時
+     * @return this object     */
+    public GenUserBadgesEntity setInsertDatetime(Timestamp insertDatetime) {
+        this.insertDatetime = insertDatetime;
+        return this;
+    }
+
+    /**
+     * Get 更新ユーザ.
+     * @return 更新ユーザ
+     */
+    public Integer getUpdateUser() {
+        return this.updateUser;
+    }
+    /**
+     * Set 更新ユーザ.
+     * @param updateUser 更新ユーザ
+     * @return this object     */
+    public GenUserBadgesEntity setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+        return this;
+    }
+
+    /**
+     * Get 更新日時.
+     * @return 更新日時
+     */
+    public Timestamp getUpdateDatetime() {
+        return this.updateDatetime;
+    }
+    /**
+     * Set 更新日時.
+     * @param updateDatetime 更新日時
+     * @return this object     */
+    public GenUserBadgesEntity setUpdateDatetime(Timestamp updateDatetime) {
+        this.updateDatetime = updateDatetime;
+        return this;
+    }
+
+    /**
+     * Get 削除フラグ.
+     * @return 削除フラグ
+     */
+    public Integer getDeleteFlag() {
+        return this.deleteFlag;
+    }
+    /**
+     * Set 削除フラグ.
+     * @param deleteFlag 削除フラグ
+     * @return this object     */
+    public GenUserBadgesEntity setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
+    /**
+     * Get key values 
+     * @return values 
+     */
+    public Object[] getKeyValues() {
+        Object[] keyValues = new Object[2];
+        keyValues[0] = this.no;
+        keyValues[1] = this.userId;
+        return keyValues;
+    }
+    /**
+     * Set key values 
+     * @param no 番号
+     * @param userId ユーザID
+     */
+    public void setKeyValues(Integer no, Integer userId) {
+        this.no = no;
+        this.userId = userId;
+    }
+    /**
+     * compare on key 
+     * @param entity entity 
+     * @return result 
+     */
+    public boolean equalsOnKey(GenUserBadgesEntity entity) {
+        Object[] keyValues1 = getKeyValues();
+        Object[] keyValues2 = entity.getKeyValues();
+        for (int i = 0; i < keyValues1.length; i++) {
+            Object val1 = keyValues1[i];
+            Object val2 = keyValues2[i];
+            if (val1 == null && val2 != null) {
+                return false;
+            }
+            if (val1 != null && val2 == null) {
+                return false;
+            }
+            if (val1 != null && val2 != null) {
+                if (!val1.equals(val2)) {
+                    return false;
+                }
+            }
+            
+        }
+        return true;
+    }
+    /**
+     * ToString 
+     * @return string 
+     */
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("no = ").append(no).append("\n");
+        builder.append("userId = ").append(userId).append("\n");
+        builder.append("insertUser = ").append(insertUser).append("\n");
+        builder.append("insertDatetime = ").append(insertDatetime).append("\n");
+        builder.append("updateUser = ").append(updateUser).append("\n");
+        builder.append("updateDatetime = ").append(updateDatetime).append("\n");
+        builder.append("deleteFlag = ").append(deleteFlag).append("\n");
+        return builder.toString();
+    }
+    /**
+     * Convert label to display 
+     * @param label label
+     * @return convert label 
+     */
+    protected String convLabelName(String label) {
+        return label;
+    }
+    /**
+     * validate 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate() {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.userId, convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.userId, convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.no, convLabelName("No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.no, convLabelName("No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.insertUser, convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.updateUser, convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.deleteFlag, convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+    /**
+     * validate 
+     * @param values value map 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate(Map<String, String> values) {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("userId"), convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("userId"), convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("no"), convLabelName("No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("no"), convLabelName("No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("updateUser"), convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("deleteFlag"), convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+
+}
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_delete.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_delete.sql
new file mode 100644
index 000000000..deec12bff
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_delete.sql
@@ -0,0 +1,4 @@
+DELETE FROM ACTIVITIES
+WHERE 
+NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_insert.sql
new file mode 100644
index 000000000..abd8c0132
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_insert.sql
@@ -0,0 +1,24 @@
+INSERT INTO ACTIVITIES
+( 
+NO
+ , USER_ID
+ , TYPE
+ , TARGET
+ , POINT
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+DEFAULT
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql
new file mode 100644
index 000000000..102b8deff
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql
@@ -0,0 +1,2 @@
+SELECT * FROM ACTIVITIES
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql
new file mode 100644
index 000000000..23c6aa4ac
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql
@@ -0,0 +1,3 @@
+SELECT * FROM ACTIVITIES
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql
new file mode 100644
index 000000000..d45f96d47
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql
@@ -0,0 +1,4 @@
+SELECT * FROM ACTIVITIES
+ WHERE 
+NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_raw_insert.sql
new file mode 100644
index 000000000..b4011813e
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_raw_insert.sql
@@ -0,0 +1,24 @@
+INSERT INTO ACTIVITIES
+( 
+NO
+ , USER_ID
+ , TYPE
+ , TARGET
+ , POINT
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql
new file mode 100644
index 000000000..c91673718
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql
@@ -0,0 +1,3 @@
+SELECT * FROM ACTIVITIES
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql
new file mode 100644
index 000000000..04fd4dd78
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql
@@ -0,0 +1,4 @@
+SELECT * FROM ACTIVITIES
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_count_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_count_all.sql
new file mode 100644
index 000000000..199c26999
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_count_all.sql
@@ -0,0 +1,2 @@
+SELECT COUNT(*) FROM ACTIVITIES
+WHERE DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql
new file mode 100644
index 000000000..a3507a4ca
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql
@@ -0,0 +1,4 @@
+SELECT * FROM ACTIVITIES
+ WHERE 
+NO = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_update.sql
new file mode 100644
index 000000000..0c776a106
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_update.sql
@@ -0,0 +1,14 @@
+UPDATE ACTIVITIES
+SET 
+   USER_ID = ?
+ , TYPE = ?
+ , TARGET = ?
+ , POINT = ?
+ , INSERT_USER = ?
+ , INSERT_DATETIME = ?
+ , UPDATE_USER = ?
+ , UPDATE_DATETIME = ?
+ , DELETE_FLAG = ?
+WHERE 
+NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_delete.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_delete.sql
new file mode 100644
index 000000000..1245387a7
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_delete.sql
@@ -0,0 +1,4 @@
+DELETE FROM BADGES
+WHERE 
+NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_insert.sql
new file mode 100644
index 000000000..678b16284
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_insert.sql
@@ -0,0 +1,24 @@
+INSERT INTO BADGES
+( 
+NO
+ , NAME
+ , DISPLAY_TEXT
+ , DESCRIPTION
+ , IMAGE_CATEGORY
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+DEFAULT
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql
new file mode 100644
index 000000000..672bd3f10
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql
@@ -0,0 +1,2 @@
+SELECT * FROM BADGES
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql
new file mode 100644
index 000000000..8148bf1cc
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql
@@ -0,0 +1,3 @@
+SELECT * FROM BADGES
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_on_key.sql
new file mode 100644
index 000000000..1e0328d3c
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_on_key.sql
@@ -0,0 +1,4 @@
+SELECT * FROM BADGES
+ WHERE 
+NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_raw_insert.sql
new file mode 100644
index 000000000..7185b80af
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_raw_insert.sql
@@ -0,0 +1,24 @@
+INSERT INTO BADGES
+( 
+NO
+ , NAME
+ , DISPLAY_TEXT
+ , DESCRIPTION
+ , IMAGE_CATEGORY
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql
new file mode 100644
index 000000000..39228e58a
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql
@@ -0,0 +1,3 @@
+SELECT * FROM BADGES
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql
new file mode 100644
index 000000000..537924423
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql
@@ -0,0 +1,4 @@
+SELECT * FROM BADGES
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_count_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_count_all.sql
new file mode 100644
index 000000000..2a9f07b6d
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_count_all.sql
@@ -0,0 +1,2 @@
+SELECT COUNT(*) FROM BADGES
+WHERE DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_on_key.sql
new file mode 100644
index 000000000..4f1a4f87a
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_on_key.sql
@@ -0,0 +1,4 @@
+SELECT * FROM BADGES
+ WHERE 
+NO = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_update.sql
new file mode 100644
index 000000000..4a7eec486
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_update.sql
@@ -0,0 +1,14 @@
+UPDATE BADGES
+SET 
+   NAME = ?
+ , DISPLAY_TEXT = ?
+ , DESCRIPTION = ?
+ , IMAGE_CATEGORY = ?
+ , INSERT_USER = ?
+ , INSERT_DATETIME = ?
+ , UPDATE_USER = ?
+ , UPDATE_DATETIME = ?
+ , DELETE_FLAG = ?
+WHERE 
+NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_insert.sql
index f40c1b718..d3768942d 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_insert.sql
@@ -11,6 +11,7 @@ KNOWLEDGE_ID
  , VIEW_COUNT
  , TYPE_ID
  , NOTIFY_STATUS
+ , POINT
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -33,4 +34,5 @@ DEFAULT
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_raw_insert.sql
index 11925a065..3560bb8e9 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_raw_insert.sql
@@ -11,6 +11,7 @@ KNOWLEDGE_ID
  , VIEW_COUNT
  , TYPE_ID
  , NOTIFY_STATUS
+ , POINT
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -33,4 +34,5 @@ KNOWLEDGE_ID
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_update.sql
index 88ac91462..825629212 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_update.sql
@@ -10,6 +10,7 @@ SET
  , VIEW_COUNT = ?
  , TYPE_ID = ?
  , NOTIFY_STATUS = ?
+ , POINT = ?
  , INSERT_USER = ?
  , INSERT_DATETIME = ?
  , UPDATE_USER = ?
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_delete.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_delete.sql
new file mode 100644
index 000000000..764be295d
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_delete.sql
@@ -0,0 +1,5 @@
+DELETE FROM USER_BADGES
+WHERE 
+NO = ?
+ AND USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_insert.sql
new file mode 100644
index 000000000..85e3dfebe
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_insert.sql
@@ -0,0 +1,18 @@
+INSERT INTO USER_BADGES
+( 
+NO
+ , USER_ID
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql
new file mode 100644
index 000000000..2716b818a
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql
@@ -0,0 +1,2 @@
+SELECT * FROM USER_BADGES
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql
new file mode 100644
index 000000000..44cd4f122
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql
@@ -0,0 +1,3 @@
+SELECT * FROM USER_BADGES
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_key.sql
new file mode 100644
index 000000000..e9763e138
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_key.sql
@@ -0,0 +1,5 @@
+SELECT * FROM USER_BADGES
+ WHERE 
+NO = ?
+ AND USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_no.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_no.sql
new file mode 100644
index 000000000..6d824b86d
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_no.sql
@@ -0,0 +1,4 @@
+SELECT * FROM USER_BADGES
+ WHERE 
+NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_user_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_user_id.sql
new file mode 100644
index 000000000..326332e4d
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_user_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM USER_BADGES
+ WHERE 
+USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_raw_insert.sql
new file mode 100644
index 000000000..85e3dfebe
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_raw_insert.sql
@@ -0,0 +1,18 @@
+INSERT INTO USER_BADGES
+( 
+NO
+ , USER_ID
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql
new file mode 100644
index 000000000..be3e4b966
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql
@@ -0,0 +1,3 @@
+SELECT * FROM USER_BADGES
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql
new file mode 100644
index 000000000..4c7e11199
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql
@@ -0,0 +1,4 @@
+SELECT * FROM USER_BADGES
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_count_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_count_all.sql
new file mode 100644
index 000000000..f8d6d444a
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_count_all.sql
@@ -0,0 +1,2 @@
+SELECT COUNT(*) FROM USER_BADGES
+WHERE DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_key.sql
new file mode 100644
index 000000000..3268f3642
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_key.sql
@@ -0,0 +1,5 @@
+SELECT * FROM USER_BADGES
+ WHERE 
+NO = ?
+ AND USER_ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_no.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_no.sql
new file mode 100644
index 000000000..8c7789e96
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_no.sql
@@ -0,0 +1,4 @@
+SELECT * FROM USER_BADGES
+ WHERE 
+NO = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_user_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_user_id.sql
new file mode 100644
index 000000000..420fcb6dc
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_user_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM USER_BADGES
+ WHERE 
+USER_ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_update.sql
new file mode 100644
index 000000000..4e7b159bb
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_update.sql
@@ -0,0 +1,11 @@
+UPDATE USER_BADGES
+SET 
+   INSERT_USER = ?
+ , INSERT_DATETIME = ?
+ , UPDATE_USER = ?
+ , UPDATE_DATETIME = ?
+ , DELETE_FLAG = ?
+WHERE 
+NO = ?
+ AND USER_ID = ?
+;

From 331c05efc938244eac641a0c50bc4ea5dceddbaa Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 31 Aug 2017 23:57:16 +0900
Subject: [PATCH 039/138] #840 Add add point process at knowledge insert

---
 document/database/A5M2_knowledge.pdf          | Bin 78943 -> 75518 bytes
 document/database/knowledge.a5er              | 203 +++++++--
 .../project/knowledge/config/UserConfig.java  |  11 +
 .../control/open/KnowledgeControl.java        |  10 +
 .../control/protect/AccountControl.java       |   9 +-
 .../control/protect/EventControl.java         |  11 +
 .../control/protect/KnowledgeControl.java     |  17 +-
 .../control/protect/SurveyControl.java        |   5 +
 .../project/knowledge/dao/ActivitiesDao.java  |   5 +
 .../project/knowledge/dao/KnowledgesDao.java  |   8 +
 .../dao/PointKnowledgeHistoriesDao.java       |  30 ++
 .../knowledge/dao/PointUserHistoriesDao.java  |  31 ++
 .../knowledge/dao/gen/DatabaseControlDao.java | 192 ++++----
 .../knowledge/dao/gen/GenActivitiesDao.java   |  77 ++--
 .../knowledge/dao/gen/GenBadgesDao.java       |   9 +-
 .../gen/GenPointKnowledgeHistoriesDao.java    | 425 +++++++++++++++++
 .../dao/gen/GenPointUserHistoriesDao.java     | 425 +++++++++++++++++
 .../deploy/v1_11_0/Migrate_1_11_2.java        |  45 +-
 .../entity/PointKnowledgeHistoriesEntity.java |  50 ++
 .../entity/PointUserHistoriesEntity.java      |  50 ++
 .../entity/gen/GenActivitiesEntity.java       | 119 ++---
 .../knowledge/entity/gen/GenBadgesEntity.java |  55 ++-
 .../gen/GenPointKnowledgeHistoriesEntity.java | 428 ++++++++++++++++++
 .../gen/GenPointUserHistoriesEntity.java      | 428 ++++++++++++++++++
 .../activity/AbstractActivityProcessor.java   | 151 ++++++
 .../AbstractAddPointForCommentProcessor.java  |  19 +
 ...AbstractAddPointForKnowledgeProcessor.java |  19 +
 .../knowledge/logic/activity/Activity.java    | 112 +++++
 .../logic/activity/ActivityLogic.java         |  79 ++++
 .../logic/activity/ActivityProcessor.java     |  36 ++
 .../activity/KnowledgeInsertActivity.java     |  63 +++
 .../ActivitiesDao/ActivitiesDao_delete.sql    |   2 +-
 .../ActivitiesDao/ActivitiesDao_insert.sql    |   6 +-
 .../ActivitiesDao_physical_select_on_key.sql  |   2 +-
 .../ActivitiesDao_raw_insert.sql              |   6 +-
 .../ActivitiesDao_select_on_key.sql           |   2 +-
 .../ActivitiesDao/ActivitiesDao_update.sql    |   5 +-
 .../dao/sql/BadgesDao/BadgesDao_insert.sql    |   4 +-
 .../sql/BadgesDao/BadgesDao_raw_insert.sql    |   4 +-
 .../dao/sql/BadgesDao/BadgesDao_update.sql    |   3 +-
 .../PointKnowledgeHistoriesDao_delete.sql     |   5 +
 .../PointKnowledgeHistoriesDao_insert.sql     |  24 +
 ...wledgeHistoriesDao_physical_select_all.sql |   2 +
 ...riesDao_physical_select_all_with_pager.sql |   3 +
 ...oriesDao_physical_select_on_history_no.sql |   4 +
 ...dgeHistoriesDao_physical_select_on_key.sql |   5 +
 ...iesDao_physical_select_on_knowledge_id.sql |   4 +
 .../PointKnowledgeHistoriesDao_raw_insert.sql |  24 +
 .../PointKnowledgeHistoriesDao_select_all.sql |   3 +
 ...edgeHistoriesDao_select_all_with_pager.sql |   4 +
 ...KnowledgeHistoriesDao_select_count_all.sql |   2 +
 ...ledgeHistoriesDao_select_on_history_no.sql |   4 +
 ...intKnowledgeHistoriesDao_select_on_key.sql |   5 +
 ...dgeHistoriesDao_select_on_knowledge_id.sql |   4 +
 .../PointKnowledgeHistoriesDao_update.sql     |  14 +
 .../PointUserHistoriesDao_delete.sql          |   5 +
 .../PointUserHistoriesDao_insert.sql          |  24 +
 ...ntUserHistoriesDao_physical_select_all.sql |   2 +
 ...riesDao_physical_select_all_with_pager.sql |   3 +
 ...oriesDao_physical_select_on_history_no.sql |   4 +
 ...serHistoriesDao_physical_select_on_key.sql |   5 +
 ...istoriesDao_physical_select_on_user_id.sql |   4 +
 .../PointUserHistoriesDao_raw_insert.sql      |  24 +
 .../PointUserHistoriesDao_select_all.sql      |   3 +
 ...UserHistoriesDao_select_all_with_pager.sql |   4 +
 ...PointUserHistoriesDao_select_count_all.sql |   2 +
 ...tUserHistoriesDao_select_on_history_no.sql |   4 +
 .../PointUserHistoriesDao_select_on_key.sql   |   5 +
 ...ointUserHistoriesDao_select_on_user_id.sql |   4 +
 .../PointUserHistoriesDao_update.sql          |  14 +
 .../project/knowledge/database/ddl.sql        |  84 +++-
 .../deploy/v1_11_0/migrate_v1_11_2.sql        |  85 +++-
 72 files changed, 3214 insertions(+), 325 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/config/UserConfig.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/PointKnowledgeHistoriesEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/PointUserHistoriesEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/Activity.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_delete.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_history_no.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_knowledge_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_count_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_history_no.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_knowledge_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_delete.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_history_no.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_user_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_count_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_history_no.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_user_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql

diff --git a/document/database/A5M2_knowledge.pdf b/document/database/A5M2_knowledge.pdf
index 0874648cef844ad429883d16bab8a5f35e9af92c..8c0a55c7fed957289992cb0480665f3058551910 100755
GIT binary patch
delta 73994
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

delta 77494
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
GBK#jdO6_t0

diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
index 735705f81..729651da1 100755
--- a/document/database/knowledge.a5er
+++ b/document/database/knowledge.a5er
@@ -46,6 +46,127 @@ SqlSeparator=0
 ShowTag=1
 ShowCommonAttributes=0
 
+[Relation]
+Entity1=ACTIVITIES
+Entity2=POINT_USER_HISTORIES
+RelationType1=1
+RelationType2=3
+Fields1=ACTIVITY_NO
+Fields2=ACTIVITY_NO
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,5105,3901,4800,R,R
+Dependence=0
+Caption=
+PName=
+LineMode=0
+Bar1=510
+Bar2=390
+Bar3=480
+TermPos1=R
+TermPos2=R
+
+[Relation]
+Entity1=USERS
+Entity2=POINT_USER_HISTORIES
+RelationType1=4
+RelationType2=3
+Fields1=USER_ID
+Fields2=USER_ID
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,3441,6398,4308,R,R
+Dependence=0
+Caption=
+PName=
+ModifiedDateTime=20170831112338
+LineMode=0
+Bar1=344
+Bar2=640
+Bar3=431
+TermPos1=R
+TermPos2=R
+
+[Entity]
+PName=POINT_USER_HISTORIES
+LName=ユーザのポイント獲得履歴
+Comment=
+TableOption=
+Page=MAIN
+Left=3500
+Top=850
+Field="ユーザID","USER_ID","INTEGER","NOT NULL",0,"","",$FFFFFFFF,""
+Field="履歴番号","HISTORY_NO","BIGINT","NOT NULL",1,"","",$FFFFFFFF,""
+Field="アクティビティ番号","ACTIVITY_NO","BIGINT","NOT NULL",,"","",$FFFFFFFF,""
+Field="獲得のタイプ","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Field="獲得ポイント","POINT","@INT",,,"","",$FFFFFFFF,""
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20170831113951
+Position="MAIN",3500,850
+
+[Relation]
+Entity1=ACTIVITIES
+Entity2=POINT_KNOWLEDGE_HISTORIES
+RelationType1=4
+RelationType2=3
+Fields1=ACTIVITY_NO
+Fields2=ACTIVITY_NO
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,5388,4612,4310,R,R
+Dependence=0
+Caption=
+PName=
+ModifiedDateTime=20170831112218
+LineMode=0
+Bar1=539
+Bar2=461
+Bar3=431
+TermPos1=R
+TermPos2=R
+
+[Relation]
+Entity1=KNOWLEDGES
+Entity2=POINT_KNOWLEDGE_HISTORIES
+RelationType1=4
+RelationType2=3
+Fields1=KNOWLEDGE_ID
+Fields2=KNOWLEDGE_ID
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,2911,5347,6275,R,R
+Dependence=0
+Caption=
+PName=
+ModifiedDateTime=20170831112209
+LineMode=0
+Bar1=291
+Bar2=535
+Bar3=628
+TermPos1=R
+TermPos2=R
+
+[Entity]
+PName=POINT_KNOWLEDGE_HISTORIES
+LName=ナレッジのポイント獲得履歴
+Comment=
+TableOption=
+Page=MAIN
+Left=2450
+Top=1100
+Field="ナレッジID","KNOWLEDGE_ID","BIGINT","NOT NULL",0,"","",$FFFFFFFF,""
+Field="履歴番号","HISTORY_NO","BIGINT","NOT NULL",1,"","",$FFFFFFFF,""
+Field="アクティビティ番号","ACTIVITY_NO","BIGINT","NOT NULL",,"","",$FFFFFFFF,""
+Field="獲得のタイプ","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Field="獲得ポイント","POINT","@INT","NOT NULL",,"","",$FFFFFFFF,""
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20170831112825
+Position="MAIN",2450,1100
+
 [Relation]
 Entity1=BADGES
 Entity2=USER_BADGES
@@ -55,15 +176,15 @@ Fields1=NO
 Fields2=NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,5330,5968,5735,R,R
+Position="MAIN",0,4598,5968,5732,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20170829163644
 LineMode=0
-Bar1=533
+Bar1=460
 Bar2=597
-Bar3=574
+Bar3=573
 TermPos1=R
 TermPos2=R
 
@@ -76,13 +197,13 @@ Fields1=USER_ID
 Fields2=USER_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4363,5637,3229,R,R
+Position="MAIN",0,4363,7074,3229,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
 Bar1=436
-Bar2=564
+Bar2=707
 Bar3=323
 TermPos1=R
 TermPos2=R
@@ -92,32 +213,16 @@ PName=USER_BADGES
 LName=ユーザの称号
 Comment=
 TableOption=
-Page=Main
-Left=2950
-Top=850
+Page=MAIN
+Left=2900
+Top=800
 Field="ユーザID","USER_ID","INTEGER","NOT NULL",0,"","",$FFFFFFFF,""
 Field="番号","NO","INTEGER","NOT NULL",1,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170829163555
-Position="Main",2950,850
-
-[Comment]
-Comment=種類 / ターゲット : 意味\n------------------------\n1 / knowledge_id : ナレッジを登録した [+]\n2 / knowledge_id : ナレッジを参照した [+]\n3 / knowledge_id : ナレッジにイイネを押した [+]\n4 / knowledge_id : ナレッジにイイネが押された\n5 / knowledge_id : イベントに参加登録した [+]\n6 / knowledge_id : イベント参加者が増えた\n7 / knowledge_id : ナレッジがストックされた [+]\n8 / knowledge_id : ナレッジのアンケートに回答した [+]\n9 / knowledge_id : ナレッジのアンケートに回答があった\n10 / knowledge_id : ナレッジにコメントが登録された [+]\n11 / knowledge_id : コメントにイイネが押された [+]\n\n101 / knowledge_id : 参加をやめた（マイナス）\n\n1002 / comment_no : コメントを登録した\n1003 / comment_no : コメントにイイネを押した\n1004 / comment_no : コメントにイイネが押された\n\nユーザのポイントは、USER_CONFIGSテーブルへ格納する\n\n\n\n
-FontName=Tahoma
-FontBold=0
-FontItalic=0
-FontUnderline=0
-FontSize=6
-FontColor=$000000
-LineColor=$000000
-BkColor=$FFFFFF
-Page=Main
-Left=3500
-Top=950
-Width=564
-Height=586
+Position="MAIN",2900,800
 
 [Relation]
 Entity1=USERS
@@ -128,15 +233,15 @@ Fields1=USER_ID
 Fields2=USER_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,3081,6033,4726,R,R
+Position="MAIN",3,9500,5578,9500,R,R
 Dependence=1
 Caption=
 PName=
-ModifiedDateTime=20170829161626
-LineMode=0
-Bar1=308
-Bar2=603
-Bar3=473
+ModifiedDateTime=20170831112359
+LineMode=3
+Bar1=950
+Bar2=558
+Bar3=950
 TermPos1=R
 TermPos2=R
 
@@ -145,28 +250,27 @@ PName=ACTIVITIES
 LName=アクティビティ
 Comment=
 TableOption=
-Page=Main
-Left=3500
-Top=800
-Field="番号","NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
-Field="ユーザID","USER_ID","INTEGER","NOT NULL",,"","",$FFFFFFFF,""
-Field="種類","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
-Field="ターゲットID","TARGET","BIGINT","NOT NULL",,"","",$FFFFFFFF,""
-Field="獲得ポイント","POINT","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Page=MAIN
+Left=3450
+Top=1100
+Field="アクティビティ番号","ACTIVITY_NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
+Field="イベントをおこしたユーザ","USER_ID","INTEGER","NOT NULL",,"","",$FFFFFFFF,""
+Field="アクティビティの種類","KIND","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Field="ターゲットID","TARGET","@VARCHAR(64)","NOT NULL",,"","",$FFFFFFFF,""
 Index=IDX_ACTIVITIES_USER_ID=0,USER_ID
-Index=IDX_ACTIVITIES_TYPE_TARGET=0,TYPE,TARGET
+Index=IDX_ACTIVITIES_KIND_TARGET=0,KIND,TARGET
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20170829163512
-Position="Main",3500,800
+ModifiedDateTime=20170831112153
+Position="MAIN",3450,1100
 
 [Entity]
 PName=USERS
 LName=ユーザ
 Comment=
 TableOption=
-Page=Main
+Page=MAIN
 Left=3500
 Top=500
 Field="ユーザID","USER_ID","SERIAL","NOT NULL",0,"","",$FFFFFFFF,""
@@ -184,26 +288,27 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170829160846
-Position="Main",3500,500
+Position="MAIN",3500,500
 
 [Entity]
 PName=BADGES
 LName=称号
 Comment=
 TableOption=
-Page=Main
+Page=MAIN
 Left=2900
-Top=600
+Top=550
 Field="番号","NO","SERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="名称","NAME","@VARCHAR(128)","NOT NULL",,"","",$FFFFFFFF,""
 Field="表示名","DISPLAY_TEXT","@VARCHAR(32)","NOT NULL",,"","",$FFFFFFFF,""
 Field="説明","DESCRIPTION","text",,,"","",$FFFFFFFF,""
-Field="画像の種類","IMAGE_CATEGORY","@INT",,,"","",$FFFFFFFF,""
+Field="画像","IMAGE","@VARCHAR(64)",,,"","",$FFFFFFFF,""
+Field="獲得ポイント","POINT","@INT",,,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20170829161444
-Position="Main",2900,600
+ModifiedDateTime=20170831113107
+Position="MAIN",2900,550
 
 [Relation]
 Entity1=COMMENTS
diff --git a/src/main/java/org/support/project/knowledge/config/UserConfig.java b/src/main/java/org/support/project/knowledge/config/UserConfig.java
new file mode 100644
index 000000000..708eda64f
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/config/UserConfig.java
@@ -0,0 +1,11 @@
+package org.support.project.knowledge.config;
+
+/** ユーザー設定（USER_CONFIGSテーブル）の設定キーを管理 */
+public class UserConfig {
+    
+    public static final String DEFAULT_PUBLIC_FLAG = "DEFAULT_PUBLIC_FLAG";
+    public static final String DEFAULT_TARGET = "DEFAULT_TARGET";
+    public static final String POINT = "POINT";
+    
+    
+}
diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index e96e66c8d..2d34a4140 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -50,6 +50,8 @@
 import org.support.project.knowledge.logic.TemplateLogic;
 import org.support.project.knowledge.logic.TimeZoneLogic;
 import org.support.project.knowledge.logic.UploadedFileLogic;
+import org.support.project.knowledge.logic.activity.Activity;
+import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.knowledge.vo.LikeCount;
 import org.support.project.knowledge.vo.ListData;
 import org.support.project.knowledge.vo.MarkDown;
@@ -215,6 +217,8 @@ public Boundary view() throws InvalidParamException, ParseException {
         List<StocksEntity> stocks = StocksDao.get().selectStockOnKnowledge(entity, loginedUser);
         setAttribute("stocks", stocks);
         
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, getLoginedUser(), entity);
+        
         return forward("view.jsp");
     }
     
@@ -658,6 +662,9 @@ public Boundary like() throws InvalidParamException {
         LikeCount likeCount = new LikeCount();
         likeCount.setKnowledgeId(knowledgeId);
         likeCount.setCount(count);
+        
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, getLoginedUser(),
+                KnowledgesDao.get().selectOnKey(knowledgeId));
         return send(likeCount);
     }
     /**
@@ -672,6 +679,9 @@ public Boundary likecomment() throws InvalidParamException {
         Long count = knowledgeLogic.addLikeComment(commentNo, getLoginedUser(), getLocale());
         LikeCount likeCount = new LikeCount();
         likeCount.setCount(count);
+        
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_COMMENT_LIKE, getLoginedUser(),
+                CommentsDao.get().selectOnKey(commentNo));
         return send(likeCount);
     }
 
diff --git a/src/main/java/org/support/project/knowledge/control/protect/AccountControl.java b/src/main/java/org/support/project/knowledge/control/protect/AccountControl.java
index 18970dab0..cc5d4734b 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/AccountControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/AccountControl.java
@@ -16,6 +16,7 @@
 import org.support.project.di.Instance;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.SystemConfig;
+import org.support.project.knowledge.config.UserConfig;
 import org.support.project.knowledge.control.Control;
 import org.support.project.knowledge.logic.AccountLogic;
 import org.support.project.knowledge.logic.TargetLogic;
@@ -315,11 +316,11 @@ public Boundary confirm_mail() throws InvalidParamException {
     @Get(publishToken = "knowledge")
     public Boundary targets() {
         UserConfigsEntity publicFlag = UserConfigsDao.get().physicalSelectOnKey(
-                "DEFAULT_PUBLIC_FLAG", AppConfig.get().getSystemName(), getLoginUserId());
+                UserConfig.DEFAULT_PUBLIC_FLAG, AppConfig.get().getSystemName(), getLoginUserId());
         if (publicFlag != null) {
             setAttribute("publicFlag", publicFlag.getConfigValue());
             UserConfigsEntity targets = UserConfigsDao.get().physicalSelectOnKey(
-                    "DEFAULT_TARGET", AppConfig.get().getSystemName(), getLoginUserId());
+                    UserConfig.DEFAULT_TARGET, AppConfig.get().getSystemName(), getLoginUserId());
             if (targets != null) {
                 if (StringUtils.isNotEmpty(targets.getConfigValue())) {
                     String[] targetKeys = targets.getConfigValue().split(",");
@@ -336,11 +337,11 @@ public Boundary targets() {
     public Boundary savetargets() {
         String publicFlag = getParam("publicFlag");
         String viewers = getParam("viewers");
-        UserConfigsEntity publicFlagEntiry = new UserConfigsEntity("DEFAULT_PUBLIC_FLAG", AppConfig.get().getSystemName(), getLoginUserId());
+        UserConfigsEntity publicFlagEntiry = new UserConfigsEntity(UserConfig.DEFAULT_PUBLIC_FLAG, AppConfig.get().getSystemName(), getLoginUserId());
         publicFlagEntiry.setConfigValue(publicFlag);
         UserConfigsDao.get().save(publicFlagEntiry);
         
-        UserConfigsEntity targetsEntity = new UserConfigsEntity("DEFAULT_TARGET", AppConfig.get().getSystemName(), getLoginUserId());
+        UserConfigsEntity targetsEntity = new UserConfigsEntity(UserConfig.DEFAULT_TARGET, AppConfig.get().getSystemName(), getLoginUserId());
         targetsEntity.setConfigValue(viewers);
         
         List<ValidateError> results = targetsEntity.validate();
diff --git a/src/main/java/org/support/project/knowledge/control/protect/EventControl.java b/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
index c783d28e9..97e8f2f7e 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
@@ -3,7 +3,10 @@
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.control.Control;
+import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.logic.EventsLogic;
+import org.support.project.knowledge.logic.activity.Activity;
+import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.web.bean.LabelValue;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.control.service.Delete;
@@ -29,6 +32,10 @@ public Boundary participation() throws InvalidParamException {
         } else {
             labelValue.setLabel(getResource("knowledge.view.msg.wait.cansel"));
         }
+        
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_ADD, getLoginedUser(),
+                KnowledgesDao.get().selectOnKey(knowledgeId));
+        
         return send(labelValue);
     }
     /**
@@ -40,6 +47,10 @@ public Boundary participation() throws InvalidParamException {
     public Boundary nonparticipation() throws InvalidParamException {
         Long knowledgeId = getPathLong();
         EventsLogic.get().removeParticipation(knowledgeId, getLoginUserId());
+        
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_DELETE, getLoginedUser(),
+                KnowledgesDao.get().selectOnKey(knowledgeId));
+        
         return send(getResource("knowledge.view.msg.participate.delete"));
     }
 
diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index 72dc43137..0ea46236c 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -18,6 +18,7 @@
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.UserConfig;
 import org.support.project.knowledge.control.KnowledgeControlBase;
 import org.support.project.knowledge.dao.CommentsDao;
 import org.support.project.knowledge.dao.DraftKnowledgesDao;
@@ -37,6 +38,8 @@
 import org.support.project.knowledge.logic.TargetLogic;
 import org.support.project.knowledge.logic.TemplateLogic;
 import org.support.project.knowledge.logic.UploadedFileLogic;
+import org.support.project.knowledge.logic.activity.Activity;
+import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.knowledge.vo.KnowledgeData;
 import org.support.project.knowledge.vo.Stock;
 import org.support.project.knowledge.vo.UploadFile;
@@ -100,11 +103,11 @@ public Boundary view_add() {
         
         if (getAttribute("publicFlag") == null) {
             UserConfigsEntity publicFlag = UserConfigsDao.get().physicalSelectOnKey(
-                    "DEFAULT_PUBLIC_FLAG", AppConfig.get().getSystemName(), getLoginUserId());
+                    UserConfig.DEFAULT_PUBLIC_FLAG, AppConfig.get().getSystemName(), getLoginUserId());
             if (publicFlag != null) {
                 setAttribute("publicFlag", publicFlag.getConfigValue());
                 UserConfigsEntity targets = UserConfigsDao.get().physicalSelectOnKey(
-                        "DEFAULT_TARGET", AppConfig.get().getSystemName(), getLoginUserId());
+                        UserConfig.DEFAULT_TARGET, AppConfig.get().getSystemName(), getLoginUserId());
                 if (targets != null) {
                     if (StringUtils.isNotEmpty(targets.getConfigValue())) {
                         String[] targetKeys = targets.getConfigValue().split(",");
@@ -210,7 +213,8 @@ private Boundary add(KnowledgesEntity entity) throws Exception, ParseException {
         LOG.trace("save");
 
         KnowledgesEntity insertedEntity = knowledgeLogic.insert(data, super.getLoginedUser());
-
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, getLoginedUser(), insertedEntity);
+        
         return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK,
                 String.valueOf(insertedEntity.getKnowledgeId()), "message.success.insert");
     }
@@ -484,7 +488,8 @@ public Boundary comment() throws Exception {
             return super.devolution(HttpMethod.get, "open.Knowledge/view", String.valueOf(knowledgeId));
         }
 
-        KnowledgeLogic.get().saveComment(knowledgeId, comment, fileNos, getLoginedUser());
+        CommentsEntity commentsEntity = KnowledgeLogic.get().saveComment(knowledgeId, comment, fileNos, getLoginedUser());
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_COMMENT_ADD, getLoginedUser(), commentsEntity);
 
         return super.redirect(getRequest().getContextPath() + "/open.knowledge/view/" + knowledgeId + params);
     }
@@ -667,6 +672,7 @@ public Boundary delete_comment() throws Exception {
         }
 
         KnowledgeLogic.get().deleteComment(db, getLoginedUser());
+        
         addMsgSuccess("message.success.delete.target", getResource("label.comment"));
         setAttribute("comment", null);
         return devolution(HttpMethod.get, "open.Knowledge/view", String.valueOf(db.getKnowledgeId()));
@@ -723,6 +729,9 @@ public Boundary stock() throws IOException, InvalidParamException {
                 dao.physicalDelete(entity);
             }
         }
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_STOCK, getLoginedUser(),
+                KnowledgesDao.get().selectOnKey(knowledgeId));
+        
         return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK, "saved", "message.success.save");
     };
 
diff --git a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
index afe817e91..fedbd75e6 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
@@ -12,6 +12,7 @@
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.control.admin.TemplateControl;
+import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.entity.ItemChoicesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.SurveyAnswersEntity;
@@ -23,6 +24,8 @@
 import org.support.project.knowledge.entity.TemplateMastersEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.knowledge.logic.SurveyLogic;
+import org.support.project.knowledge.logic.activity.Activity;
+import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.knowledge.vo.SurveyReport;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.common.HttpStatus;
@@ -222,6 +225,8 @@ public Boundary answer() throws InstantiationException, IllegalAccessException,
             LOG.debug(PropertyUtil.reflectionToString(answer));
         }
         SurveyLogic.get().saveAnswer(answer, getLoginUserId());
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SURVEY, getLoginedUser(),
+                KnowledgesDao.get().selectOnKey(knowledgeId));
         
         // メッセージ送信
         return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK, "saved", "message.success.save");
diff --git a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
index f0e222bbb..fd931f03e 100644
--- a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
@@ -5,6 +5,7 @@
 import org.support.project.di.Instance;
 
 import org.support.project.knowledge.dao.gen.GenActivitiesDao;
+import org.support.project.knowledge.entity.ActivitiesEntity;
 
 /**
  * アクティビティ
@@ -21,6 +22,10 @@ public class ActivitiesDao extends GenActivitiesDao {
     public static ActivitiesDao get() {
         return Container.getComp(ActivitiesDao.class);
     }
+    public ActivitiesEntity select(int userId, int type, String target) {
+        String sql = "SELECT * FROM ACTIVITIES WHERE USER_ID = ? AND KIND = ? AND TARGET = ?";
+        return executeQuerySingle(sql, ActivitiesEntity.class, userId, type, target);
+    }
 
 
 
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
index e83dc86f3..56d4fa5a9 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
@@ -315,5 +315,13 @@ public void updateViewCount(Long count, Long knowledgeId) {
         String sql = "UPDATE KNOWLEDGES SET VIEW_COUNT = ? WHERE KNOWLEDGE_ID = ?";
         executeUpdate(sql, count, knowledgeId);
     }
+    public int selectPoint(long knowledgeId) {
+        String sql = "SELECT POINT FROM KNOWLEDGES WHERE KNOWLEDGE_ID = ?";
+        return executeQuerySingle(sql, Integer.class, knowledgeId);
+    }
+    public void updatePoint(long knowledgeId, int point) {
+        String sql = "UPDATE KNOWLEDGES SET POINT = ? WHERE KNOWLEDGE_ID = ?";
+        executeUpdate(sql, point, knowledgeId);
+    }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
new file mode 100644
index 000000000..f8129e13d
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
@@ -0,0 +1,30 @@
+package org.support.project.knowledge.dao;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.gen.GenPointKnowledgeHistoriesDao;
+
+/**
+ * ナレッジのポイント獲得履歴
+ */
+@DI(instance = Instance.Singleton)
+public class PointKnowledgeHistoriesDao extends GenPointKnowledgeHistoriesDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static PointKnowledgeHistoriesDao get() {
+        return Container.getComp(PointKnowledgeHistoriesDao.class);
+    }
+    public long selectNumOnKnowledge(long knowledgeId) {
+        String sql = "SELECT MAX(HISTORY_NO) FROM POINT_KNOWLEDGE_HISTORIES WHERE KNOWLEDGE_ID = ?";
+        return executeQuerySingle(sql, Long.class, knowledgeId);
+    }
+
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
new file mode 100644
index 000000000..d5f615351
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
@@ -0,0 +1,31 @@
+package org.support.project.knowledge.dao;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.gen.GenPointUserHistoriesDao;
+
+/**
+ * ユーザのポイント獲得履歴
+ */
+@DI(instance = Instance.Singleton)
+public class PointUserHistoriesDao extends GenPointUserHistoriesDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static PointUserHistoriesDao get() {
+        return Container.getComp(PointUserHistoriesDao.class);
+    }
+    
+    public long selectNumOnUser(int user) {
+        String sql = "SELECT MAX(HISTORY_NO) FROM POINT_USER_HISTORIES WHERE USER_ID = ?";
+        return executeQuerySingle(sql, Long.class, user);
+    }
+
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java b/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
index 46102cb4c..a7f891d2c 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
@@ -20,54 +20,56 @@ public class DatabaseControlDao extends AbstractDao {
 
     /** Drop all tables */
     public void dropAllTable() {
-        String[] sqls = new String[47];
+        String[] sqls = new String[49];
         sqls[0] = "DROP TABLE IF EXISTS KNOWLEDGES CASCADE;";
-        sqls[1] = "DROP TABLE IF EXISTS SERVICE_LOCALE_CONFIGS CASCADE;";
-        sqls[2] = "DROP TABLE IF EXISTS ACCOUNT_IMAGES CASCADE;";
-        sqls[3] = "DROP TABLE IF EXISTS EVENTS CASCADE;";
-        sqls[4] = "DROP TABLE IF EXISTS MAIL_POSTS CASCADE;";
-        sqls[5] = "DROP TABLE IF EXISTS MAIL_PROPERTIES CASCADE;";
-        sqls[6] = "DROP TABLE IF EXISTS WEBHOOK_CONFIGS CASCADE;";
-        sqls[7] = "DROP TABLE IF EXISTS MAIL_LOCALE_TEMPLATES CASCADE;";
-        sqls[8] = "DROP TABLE IF EXISTS VOTES CASCADE;";
-        sqls[9] = "DROP TABLE IF EXISTS COMMENTS CASCADE;";
-        sqls[10] = "DROP TABLE IF EXISTS SURVEY_CHOICES CASCADE;";
-        sqls[11] = "DROP TABLE IF EXISTS TOKENS CASCADE;";
-        sqls[12] = "DROP TABLE IF EXISTS KNOWLEDGE_GROUPS CASCADE;";
-        sqls[13] = "DROP TABLE IF EXISTS MAIL_HOOK_CONDITIONS CASCADE;";
-        sqls[14] = "DROP TABLE IF EXISTS SURVEY_ITEM_ANSWERS CASCADE;";
-        sqls[15] = "DROP TABLE IF EXISTS LIKES CASCADE;";
-        sqls[16] = "DROP TABLE IF EXISTS DRAFT_ITEM_VALUES CASCADE;";
-        sqls[17] = "DROP TABLE IF EXISTS VIEW_HISTORIES CASCADE;";
-        sqls[18] = "DROP TABLE IF EXISTS KNOWLEDGE_EDIT_GROUPS CASCADE;";
-        sqls[19] = "DROP TABLE IF EXISTS WEBHOOKS CASCADE;";
-        sqls[20] = "DROP TABLE IF EXISTS KNOWLEDGE_FILES CASCADE;";
-        sqls[21] = "DROP TABLE IF EXISTS NOTIFY_QUEUES CASCADE;";
-        sqls[22] = "DROP TABLE IF EXISTS TEMPLATE_MASTERS CASCADE;";
-        sqls[23] = "DROP TABLE IF EXISTS SERVICE_CONFIGS CASCADE;";
-        sqls[24] = "DROP TABLE IF EXISTS ITEM_CHOICES CASCADE;";
-        sqls[25] = "DROP TABLE IF EXISTS KNOWLEDGE_EDIT_USERS CASCADE;";
-        sqls[26] = "DROP TABLE IF EXISTS PINS CASCADE;";
-        sqls[27] = "DROP TABLE IF EXISTS KNOWLEDGE_HISTORIES CASCADE;";
-        sqls[28] = "DROP TABLE IF EXISTS KNOWLEDGE_ITEM_VALUES CASCADE;";
-        sqls[29] = "DROP TABLE IF EXISTS KNOWLEDGE_TAGS CASCADE;";
-        sqls[30] = "DROP TABLE IF EXISTS LIKE_COMMENTS CASCADE;";
-        sqls[31] = "DROP TABLE IF EXISTS BADGES CASCADE;";
-        sqls[32] = "DROP TABLE IF EXISTS SURVEY_ANSWERS CASCADE;";
-        sqls[33] = "DROP TABLE IF EXISTS SURVEYS CASCADE;";
-        sqls[34] = "DROP TABLE IF EXISTS ACTIVITIES CASCADE;";
-        sqls[35] = "DROP TABLE IF EXISTS MAIL_TEMPLATES CASCADE;";
-        sqls[36] = "DROP TABLE IF EXISTS USER_BADGES CASCADE;";
-        sqls[37] = "DROP TABLE IF EXISTS NOTIFY_CONFIGS CASCADE;";
-        sqls[38] = "DROP TABLE IF EXISTS SURVEY_ITEMS CASCADE;";
-        sqls[39] = "DROP TABLE IF EXISTS MAIL_HOOKS CASCADE;";
-        sqls[40] = "DROP TABLE IF EXISTS DRAFT_KNOWLEDGES CASCADE;";
-        sqls[41] = "DROP TABLE IF EXISTS STOCKS CASCADE;";
-        sqls[42] = "DROP TABLE IF EXISTS STOCK_KNOWLEDGES CASCADE;";
-        sqls[43] = "DROP TABLE IF EXISTS KNOWLEDGE_USERS CASCADE;";
-        sqls[44] = "DROP TABLE IF EXISTS PARTICIPANTS CASCADE;";
-        sqls[45] = "DROP TABLE IF EXISTS TAGS CASCADE;";
-        sqls[46] = "DROP TABLE IF EXISTS TEMPLATE_ITEMS CASCADE;";
+        sqls[1] = "DROP TABLE IF EXISTS EVENTS CASCADE;";
+        sqls[2] = "DROP TABLE IF EXISTS MAIL_POSTS CASCADE;";
+        sqls[3] = "DROP TABLE IF EXISTS WEBHOOK_CONFIGS CASCADE;";
+        sqls[4] = "DROP TABLE IF EXISTS SURVEY_CHOICES CASCADE;";
+        sqls[5] = "DROP TABLE IF EXISTS KNOWLEDGE_GROUPS CASCADE;";
+        sqls[6] = "DROP TABLE IF EXISTS SURVEY_ITEM_ANSWERS CASCADE;";
+        sqls[7] = "DROP TABLE IF EXISTS DRAFT_ITEM_VALUES CASCADE;";
+        sqls[8] = "DROP TABLE IF EXISTS KNOWLEDGE_EDIT_GROUPS CASCADE;";
+        sqls[9] = "DROP TABLE IF EXISTS WEBHOOKS CASCADE;";
+        sqls[10] = "DROP TABLE IF EXISTS KNOWLEDGE_FILES CASCADE;";
+        sqls[11] = "DROP TABLE IF EXISTS NOTIFY_QUEUES CASCADE;";
+        sqls[12] = "DROP TABLE IF EXISTS TEMPLATE_MASTERS CASCADE;";
+        sqls[13] = "DROP TABLE IF EXISTS ITEM_CHOICES CASCADE;";
+        sqls[14] = "DROP TABLE IF EXISTS KNOWLEDGE_ITEM_VALUES CASCADE;";
+        sqls[15] = "DROP TABLE IF EXISTS KNOWLEDGE_TAGS CASCADE;";
+        sqls[16] = "DROP TABLE IF EXISTS USER_BADGES CASCADE;";
+        sqls[17] = "DROP TABLE IF EXISTS NOTIFY_CONFIGS CASCADE;";
+        sqls[18] = "DROP TABLE IF EXISTS MAIL_HOOKS CASCADE;";
+        sqls[19] = "DROP TABLE IF EXISTS DRAFT_KNOWLEDGES CASCADE;";
+        sqls[20] = "DROP TABLE IF EXISTS STOCK_KNOWLEDGES CASCADE;";
+        sqls[21] = "DROP TABLE IF EXISTS KNOWLEDGE_USERS CASCADE;";
+        sqls[22] = "DROP TABLE IF EXISTS PARTICIPANTS CASCADE;";
+        sqls[23] = "DROP TABLE IF EXISTS TAGS CASCADE;";
+        sqls[24] = "DROP TABLE IF EXISTS SERVICE_LOCALE_CONFIGS CASCADE;";
+        sqls[25] = "DROP TABLE IF EXISTS ACCOUNT_IMAGES CASCADE;";
+        sqls[26] = "DROP TABLE IF EXISTS MAIL_PROPERTIES CASCADE;";
+        sqls[27] = "DROP TABLE IF EXISTS POINT_KNOWLEDGE_HISTORIES CASCADE;";
+        sqls[28] = "DROP TABLE IF EXISTS MAIL_LOCALE_TEMPLATES CASCADE;";
+        sqls[29] = "DROP TABLE IF EXISTS VOTES CASCADE;";
+        sqls[30] = "DROP TABLE IF EXISTS COMMENTS CASCADE;";
+        sqls[31] = "DROP TABLE IF EXISTS TOKENS CASCADE;";
+        sqls[32] = "DROP TABLE IF EXISTS MAIL_HOOK_CONDITIONS CASCADE;";
+        sqls[33] = "DROP TABLE IF EXISTS LIKES CASCADE;";
+        sqls[34] = "DROP TABLE IF EXISTS VIEW_HISTORIES CASCADE;";
+        sqls[35] = "DROP TABLE IF EXISTS SERVICE_CONFIGS CASCADE;";
+        sqls[36] = "DROP TABLE IF EXISTS KNOWLEDGE_EDIT_USERS CASCADE;";
+        sqls[37] = "DROP TABLE IF EXISTS PINS CASCADE;";
+        sqls[38] = "DROP TABLE IF EXISTS KNOWLEDGE_HISTORIES CASCADE;";
+        sqls[39] = "DROP TABLE IF EXISTS LIKE_COMMENTS CASCADE;";
+        sqls[40] = "DROP TABLE IF EXISTS BADGES CASCADE;";
+        sqls[41] = "DROP TABLE IF EXISTS SURVEY_ANSWERS CASCADE;";
+        sqls[42] = "DROP TABLE IF EXISTS SURVEYS CASCADE;";
+        sqls[43] = "DROP TABLE IF EXISTS ACTIVITIES CASCADE;";
+        sqls[44] = "DROP TABLE IF EXISTS MAIL_TEMPLATES CASCADE;";
+        sqls[45] = "DROP TABLE IF EXISTS POINT_USER_HISTORIES CASCADE;";
+        sqls[46] = "DROP TABLE IF EXISTS SURVEY_ITEMS CASCADE;";
+        sqls[47] = "DROP TABLE IF EXISTS STOCKS CASCADE;";
+        sqls[48] = "DROP TABLE IF EXISTS TEMPLATE_ITEMS CASCADE;";
         for (String sql : sqls) {
             LOG.debug(sql);
             executeUpdate(sql);
@@ -75,54 +77,56 @@ public void dropAllTable() {
     }
     /** Delete all table data */
     public void dropAllData() {
-        String[] sqls = new String[47];
+        String[] sqls = new String[49];
         sqls[0] = "TRUNCATE TABLE KNOWLEDGES;";
-        sqls[1] = "TRUNCATE TABLE SERVICE_LOCALE_CONFIGS;";
-        sqls[2] = "TRUNCATE TABLE ACCOUNT_IMAGES;";
-        sqls[3] = "TRUNCATE TABLE EVENTS;";
-        sqls[4] = "TRUNCATE TABLE MAIL_POSTS;";
-        sqls[5] = "TRUNCATE TABLE MAIL_PROPERTIES;";
-        sqls[6] = "TRUNCATE TABLE WEBHOOK_CONFIGS;";
-        sqls[7] = "TRUNCATE TABLE MAIL_LOCALE_TEMPLATES;";
-        sqls[8] = "TRUNCATE TABLE VOTES;";
-        sqls[9] = "TRUNCATE TABLE COMMENTS;";
-        sqls[10] = "TRUNCATE TABLE SURVEY_CHOICES;";
-        sqls[11] = "TRUNCATE TABLE TOKENS;";
-        sqls[12] = "TRUNCATE TABLE KNOWLEDGE_GROUPS;";
-        sqls[13] = "TRUNCATE TABLE MAIL_HOOK_CONDITIONS;";
-        sqls[14] = "TRUNCATE TABLE SURVEY_ITEM_ANSWERS;";
-        sqls[15] = "TRUNCATE TABLE LIKES;";
-        sqls[16] = "TRUNCATE TABLE DRAFT_ITEM_VALUES;";
-        sqls[17] = "TRUNCATE TABLE VIEW_HISTORIES;";
-        sqls[18] = "TRUNCATE TABLE KNOWLEDGE_EDIT_GROUPS;";
-        sqls[19] = "TRUNCATE TABLE WEBHOOKS;";
-        sqls[20] = "TRUNCATE TABLE KNOWLEDGE_FILES;";
-        sqls[21] = "TRUNCATE TABLE NOTIFY_QUEUES;";
-        sqls[22] = "TRUNCATE TABLE TEMPLATE_MASTERS;";
-        sqls[23] = "TRUNCATE TABLE SERVICE_CONFIGS;";
-        sqls[24] = "TRUNCATE TABLE ITEM_CHOICES;";
-        sqls[25] = "TRUNCATE TABLE KNOWLEDGE_EDIT_USERS;";
-        sqls[26] = "TRUNCATE TABLE PINS;";
-        sqls[27] = "TRUNCATE TABLE KNOWLEDGE_HISTORIES;";
-        sqls[28] = "TRUNCATE TABLE KNOWLEDGE_ITEM_VALUES;";
-        sqls[29] = "TRUNCATE TABLE KNOWLEDGE_TAGS;";
-        sqls[30] = "TRUNCATE TABLE LIKE_COMMENTS;";
-        sqls[31] = "TRUNCATE TABLE BADGES;";
-        sqls[32] = "TRUNCATE TABLE SURVEY_ANSWERS;";
-        sqls[33] = "TRUNCATE TABLE SURVEYS;";
-        sqls[34] = "TRUNCATE TABLE ACTIVITIES;";
-        sqls[35] = "TRUNCATE TABLE MAIL_TEMPLATES;";
-        sqls[36] = "TRUNCATE TABLE USER_BADGES;";
-        sqls[37] = "TRUNCATE TABLE NOTIFY_CONFIGS;";
-        sqls[38] = "TRUNCATE TABLE SURVEY_ITEMS;";
-        sqls[39] = "TRUNCATE TABLE MAIL_HOOKS;";
-        sqls[40] = "TRUNCATE TABLE DRAFT_KNOWLEDGES;";
-        sqls[41] = "TRUNCATE TABLE STOCKS;";
-        sqls[42] = "TRUNCATE TABLE STOCK_KNOWLEDGES;";
-        sqls[43] = "TRUNCATE TABLE KNOWLEDGE_USERS;";
-        sqls[44] = "TRUNCATE TABLE PARTICIPANTS;";
-        sqls[45] = "TRUNCATE TABLE TAGS;";
-        sqls[46] = "TRUNCATE TABLE TEMPLATE_ITEMS;";
+        sqls[1] = "TRUNCATE TABLE EVENTS;";
+        sqls[2] = "TRUNCATE TABLE MAIL_POSTS;";
+        sqls[3] = "TRUNCATE TABLE WEBHOOK_CONFIGS;";
+        sqls[4] = "TRUNCATE TABLE SURVEY_CHOICES;";
+        sqls[5] = "TRUNCATE TABLE KNOWLEDGE_GROUPS;";
+        sqls[6] = "TRUNCATE TABLE SURVEY_ITEM_ANSWERS;";
+        sqls[7] = "TRUNCATE TABLE DRAFT_ITEM_VALUES;";
+        sqls[8] = "TRUNCATE TABLE KNOWLEDGE_EDIT_GROUPS;";
+        sqls[9] = "TRUNCATE TABLE WEBHOOKS;";
+        sqls[10] = "TRUNCATE TABLE KNOWLEDGE_FILES;";
+        sqls[11] = "TRUNCATE TABLE NOTIFY_QUEUES;";
+        sqls[12] = "TRUNCATE TABLE TEMPLATE_MASTERS;";
+        sqls[13] = "TRUNCATE TABLE ITEM_CHOICES;";
+        sqls[14] = "TRUNCATE TABLE KNOWLEDGE_ITEM_VALUES;";
+        sqls[15] = "TRUNCATE TABLE KNOWLEDGE_TAGS;";
+        sqls[16] = "TRUNCATE TABLE USER_BADGES;";
+        sqls[17] = "TRUNCATE TABLE NOTIFY_CONFIGS;";
+        sqls[18] = "TRUNCATE TABLE MAIL_HOOKS;";
+        sqls[19] = "TRUNCATE TABLE DRAFT_KNOWLEDGES;";
+        sqls[20] = "TRUNCATE TABLE STOCK_KNOWLEDGES;";
+        sqls[21] = "TRUNCATE TABLE KNOWLEDGE_USERS;";
+        sqls[22] = "TRUNCATE TABLE PARTICIPANTS;";
+        sqls[23] = "TRUNCATE TABLE TAGS;";
+        sqls[24] = "TRUNCATE TABLE SERVICE_LOCALE_CONFIGS;";
+        sqls[25] = "TRUNCATE TABLE ACCOUNT_IMAGES;";
+        sqls[26] = "TRUNCATE TABLE MAIL_PROPERTIES;";
+        sqls[27] = "TRUNCATE TABLE POINT_KNOWLEDGE_HISTORIES;";
+        sqls[28] = "TRUNCATE TABLE MAIL_LOCALE_TEMPLATES;";
+        sqls[29] = "TRUNCATE TABLE VOTES;";
+        sqls[30] = "TRUNCATE TABLE COMMENTS;";
+        sqls[31] = "TRUNCATE TABLE TOKENS;";
+        sqls[32] = "TRUNCATE TABLE MAIL_HOOK_CONDITIONS;";
+        sqls[33] = "TRUNCATE TABLE LIKES;";
+        sqls[34] = "TRUNCATE TABLE VIEW_HISTORIES;";
+        sqls[35] = "TRUNCATE TABLE SERVICE_CONFIGS;";
+        sqls[36] = "TRUNCATE TABLE KNOWLEDGE_EDIT_USERS;";
+        sqls[37] = "TRUNCATE TABLE PINS;";
+        sqls[38] = "TRUNCATE TABLE KNOWLEDGE_HISTORIES;";
+        sqls[39] = "TRUNCATE TABLE LIKE_COMMENTS;";
+        sqls[40] = "TRUNCATE TABLE BADGES;";
+        sqls[41] = "TRUNCATE TABLE SURVEY_ANSWERS;";
+        sqls[42] = "TRUNCATE TABLE SURVEYS;";
+        sqls[43] = "TRUNCATE TABLE ACTIVITIES;";
+        sqls[44] = "TRUNCATE TABLE MAIL_TEMPLATES;";
+        sqls[45] = "TRUNCATE TABLE POINT_USER_HISTORIES;";
+        sqls[46] = "TRUNCATE TABLE SURVEY_ITEMS;";
+        sqls[47] = "TRUNCATE TABLE STOCKS;";
+        sqls[48] = "TRUNCATE TABLE TEMPLATE_ITEMS;";
         for (String sql : sqls) {
             LOG.debug(sql);
             executeUpdate(sql);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
index 308493eae..98b7a15b1 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
@@ -59,12 +59,12 @@ public List<ActivitiesEntity> physicalSelectAllWithPager(int limit, int offset)
     }
     /**
      * Select data on key.
-     * @param  no no
+     * @param  activityNo activityNo
      * @return data
      */
-    public ActivitiesEntity physicalSelectOnKey(Long no) {
+    public ActivitiesEntity physicalSelectOnKey(Long activityNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql");
-        return executeQuerySingle(sql, ActivitiesEntity.class, no);
+        return executeQuerySingle(sql, ActivitiesEntity.class, activityNo);
     }
     /**
      * Select all data that not deleted.
@@ -94,12 +94,12 @@ public Integer selectCountAll() {
     }
     /**
      * Select data that not deleted on key.
-     * @param  no no
+     * @param  activityNo activityNo
      * @return data
      */
-    public ActivitiesEntity selectOnKey(Long no) {
+    public ActivitiesEntity selectOnKey(Long activityNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql");
-        return executeQuerySingle(sql, ActivitiesEntity.class, no);
+        return executeQuerySingle(sql, ActivitiesEntity.class, activityNo);
     }
     /**
      * Count all data
@@ -119,11 +119,10 @@ public int physicalCountAll() {
     public ActivitiesEntity rawPhysicalInsert(ActivitiesEntity entity) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_raw_insert.sql");
         executeUpdate(sql, 
-            entity.getNo(), 
+            entity.getActivityNo(), 
             entity.getUserId(), 
-            entity.getType(), 
+            entity.getKind(), 
             entity.getTarget(), 
-            entity.getPoint(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -131,7 +130,7 @@ public ActivitiesEntity rawPhysicalInsert(ActivitiesEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('ACTIVITIES_NO_seq', (select max(NO) from ACTIVITIES));";
+            String setValSql = "select setval('ACTIVITIES_ACTIVITY_NO_seq', (select max(ACTIVITY_NO) from ACTIVITIES));";
             executeQuerySingle(setValSql, Long.class);
         }
         return entity;
@@ -145,18 +144,17 @@ public ActivitiesEntity rawPhysicalInsert(ActivitiesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ActivitiesEntity physicalInsert(ActivitiesEntity entity) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_insert.sql");
-        Class<?> type = PropertyUtil.getPropertyType(entity, "no");
+        Class<?> type = PropertyUtil.getPropertyType(entity, "activityNo");
         Object key = executeInsert(sql, type, 
             entity.getUserId(), 
-            entity.getType(), 
+            entity.getKind(), 
             entity.getTarget(), 
-            entity.getPoint(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
             entity.getUpdateDatetime(), 
             entity.getDeleteFlag());
-        PropertyUtil.setPropertyValue(entity, "no", key);
+        PropertyUtil.setPropertyValue(entity, "activityNo", key);
         return entity;
     }
     /**
@@ -197,15 +195,14 @@ public ActivitiesEntity physicalUpdate(ActivitiesEntity entity) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_update.sql");
         executeUpdate(sql, 
             entity.getUserId(), 
-            entity.getType(), 
+            entity.getKind(), 
             entity.getTarget(), 
-            entity.getPoint(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
             entity.getUpdateDatetime(), 
             entity.getDeleteFlag(), 
-            entity.getNo());
+            entity.getActivityNo());
         return entity;
     }
     /**
@@ -217,7 +214,7 @@ public ActivitiesEntity physicalUpdate(ActivitiesEntity entity) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ActivitiesEntity update(Integer user, ActivitiesEntity entity) {
-        ActivitiesEntity db = selectOnKey(entity.getNo());
+        ActivitiesEntity db = selectOnKey(entity.getActivityNo());
         entity.setInsertUser(db.getInsertUser());
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
@@ -247,7 +244,7 @@ public ActivitiesEntity update(ActivitiesEntity entity) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ActivitiesEntity save(Integer user, ActivitiesEntity entity) {
-        ActivitiesEntity db = selectOnKey(entity.getNo());
+        ActivitiesEntity db = selectOnKey(entity.getActivityNo());
         if (db == null) {
             return insert(user, entity);
         } else {
@@ -262,7 +259,7 @@ public ActivitiesEntity save(Integer user, ActivitiesEntity entity) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ActivitiesEntity save(ActivitiesEntity entity) {
-        ActivitiesEntity db = selectOnKey(entity.getNo());
+        ActivitiesEntity db = selectOnKey(entity.getActivityNo());
         if (db == null) {
             return insert(entity);
         } else {
@@ -271,12 +268,12 @@ public ActivitiesEntity save(ActivitiesEntity entity) {
     }
     /**
      * Physical Delete.
-     * @param  no no
+     * @param  activityNo activityNo
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void physicalDelete(Long no) {
+    public void physicalDelete(Long activityNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_delete.sql");
-        executeUpdate(sql, no);
+        executeUpdate(sql, activityNo);
     }
     /**
      * Physical Delete.
@@ -284,7 +281,7 @@ public void physicalDelete(Long no) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void physicalDelete(ActivitiesEntity entity) {
-        physicalDelete(entity.getNo());
+        physicalDelete(entity.getActivityNo());
 
     }
     /**
@@ -292,11 +289,11 @@ public void physicalDelete(ActivitiesEntity entity) {
      * if delete flag is exists, the data is logical delete.
      * set saved user id.
      * @param user saved userid
-     * @param  no no
+     * @param  activityNo activityNo
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void delete(Integer user, Long no) {
-        ActivitiesEntity db = selectOnKey(no);
+    public void delete(Integer user, Long activityNo) {
+        ActivitiesEntity db = selectOnKey(activityNo);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
         db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
@@ -305,13 +302,13 @@ public void delete(Integer user, Long no) {
     /**
      * Delete.
      * if delete flag is exists, the data is logical delete.
-     * @param  no no
+     * @param  activityNo activityNo
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void delete(Long no) {
+    public void delete(Long activityNo) {
         DBUserPool pool = Container.getComp(DBUserPool.class);
         Integer user = (Integer) pool.getUser();
-        delete(user, no);
+        delete(user, activityNo);
     }
     /**
      * Delete.
@@ -322,7 +319,7 @@ public void delete(Long no) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void delete(Integer user, ActivitiesEntity entity) {
-        delete(user, entity.getNo());
+        delete(user, entity.getActivityNo());
 
     }
     /**
@@ -333,7 +330,7 @@ public void delete(Integer user, ActivitiesEntity entity) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void delete(ActivitiesEntity entity) {
-        delete(entity.getNo());
+        delete(entity.getActivityNo());
 
     }
     /**
@@ -341,11 +338,11 @@ public void delete(ActivitiesEntity entity) {
      * if delete flag is exists and delete flag is true, delete flug is false to activate.
      * set saved user id.
      * @param user saved userid
-     * @param  no no
+     * @param  activityNo activityNo
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void activation(Integer user, Long no) {
-        ActivitiesEntity db = physicalSelectOnKey(no);
+    public void activation(Integer user, Long activityNo) {
+        ActivitiesEntity db = physicalSelectOnKey(activityNo);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
         db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
@@ -354,13 +351,13 @@ public void activation(Integer user, Long no) {
     /**
      * Ativation.
      * if delete flag is exists and delete flag is true, delete flug is false to activate.
-     * @param  no no
+     * @param  activityNo activityNo
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void activation(Long no) {
+    public void activation(Long activityNo) {
         DBUserPool pool = Container.getComp(DBUserPool.class);
         Integer user = (Integer) pool.getUser();
-        activation(user, no);
+        activation(user, activityNo);
     }
     /**
      * Ativation.
@@ -371,7 +368,7 @@ public void activation(Long no) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void activation(Integer user, ActivitiesEntity entity) {
-        activation(user, entity.getNo());
+        activation(user, entity.getActivityNo());
 
     }
     /**
@@ -381,7 +378,7 @@ public void activation(Integer user, ActivitiesEntity entity) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void activation(ActivitiesEntity entity) {
-        activation(entity.getNo());
+        activation(entity.getActivityNo());
 
     }
 
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
index e15451c26..3c968a909 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
@@ -123,7 +123,8 @@ public BadgesEntity rawPhysicalInsert(BadgesEntity entity) {
             entity.getName(), 
             entity.getDisplayText(), 
             entity.getDescription(), 
-            entity.getImageCategory(), 
+            entity.getImage(), 
+            entity.getPoint(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -150,7 +151,8 @@ public BadgesEntity physicalInsert(BadgesEntity entity) {
             entity.getName(), 
             entity.getDisplayText(), 
             entity.getDescription(), 
-            entity.getImageCategory(), 
+            entity.getImage(), 
+            entity.getPoint(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -199,7 +201,8 @@ public BadgesEntity physicalUpdate(BadgesEntity entity) {
             entity.getName(), 
             entity.getDisplayText(), 
             entity.getDescription(), 
-            entity.getImageCategory(), 
+            entity.getImage(), 
+            entity.getPoint(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
new file mode 100644
index 000000000..aa16c0934
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
@@ -0,0 +1,425 @@
+package org.support.project.knowledge.dao.gen;
+
+import java.util.List;
+
+import java.sql.Timestamp;
+
+
+import org.support.project.knowledge.entity.PointKnowledgeHistoriesEntity;
+import org.support.project.ormapping.dao.AbstractDao;
+import org.support.project.ormapping.exception.ORMappingException;
+import org.support.project.ormapping.common.SQLManager;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.ormapping.common.IDGen;
+import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.connection.ConnectionManager;
+import org.support.project.common.util.PropertyUtil;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.aop.Aspect;
+
+/**
+ * ナレッジのポイント獲得履歴
+ * this class is auto generate and not edit.
+ * if modify dao method, you can edit PointKnowledgeHistoriesDao.
+ */
+@DI(instance = Instance.Singleton)
+public class GenPointKnowledgeHistoriesDao extends AbstractDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenPointKnowledgeHistoriesDao get() {
+        return Container.getComp(GenPointKnowledgeHistoriesDao.class);
+    }
+
+    /**
+     * Select all data.
+     * @return all data
+     */
+    public List<PointKnowledgeHistoriesEntity> physicalSelectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql");
+        return executeQueryList(sql, PointKnowledgeHistoriesEntity.class);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data on limit and offset
+     */
+    public List<PointKnowledgeHistoriesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql");
+        return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, limit, offset);
+    }
+    /**
+     * Select data on key.
+     * @param  historyNo historyNo
+     * @param  knowledgeId knowledgeId
+     * @return data
+     */
+    public PointKnowledgeHistoriesEntity physicalSelectOnKey(Long historyNo, Long knowledgeId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_key.sql");
+        return executeQuerySingle(sql, PointKnowledgeHistoriesEntity.class, historyNo, knowledgeId);
+    }
+    /**
+     * Select all data that not deleted.
+     * @return all data
+     */
+    public List<PointKnowledgeHistoriesEntity> selectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql");
+        return executeQueryList(sql, PointKnowledgeHistoriesEntity.class);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data
+     */
+    public List<PointKnowledgeHistoriesEntity> selectAllWidthPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql");
+        return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, limit, offset);
+    }
+    /**
+     * Select count that not deleted.
+     * @return count
+     */
+    public Integer selectCountAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_count_all.sql");
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Select data that not deleted on key.
+     * @param  historyNo historyNo
+     * @param  knowledgeId knowledgeId
+     * @return data
+     */
+    public PointKnowledgeHistoriesEntity selectOnKey(Long historyNo, Long knowledgeId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_key.sql");
+        return executeQuerySingle(sql, PointKnowledgeHistoriesEntity.class, historyNo, knowledgeId);
+    }
+    /**
+     * Select data that not deleted on HISTORY_NO column.
+     * @param historyNo historyNo
+     * @return list
+     */
+    public List<PointKnowledgeHistoriesEntity> selectOnHistoryNo(Long historyNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_history_no.sql");
+        return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, historyNo);
+    }
+    /**
+     * Select data that not deleted on KNOWLEDGE_ID column.
+     * @param knowledgeId knowledgeId
+     * @return list
+     */
+    public List<PointKnowledgeHistoriesEntity> selectOnKnowledgeId(Long knowledgeId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_knowledge_id.sql");
+        return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, knowledgeId);
+    }
+    /**
+     * Select data on HISTORY_NO column.
+     * @param historyNo historyNo
+     * @return list
+     */
+    public List<PointKnowledgeHistoriesEntity> physicalSelectOnHistoryNo(Long historyNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_history_no.sql");
+        return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, historyNo);
+    }
+    /**
+     * Select data on KNOWLEDGE_ID column.
+     * @param knowledgeId knowledgeId
+     * @return list
+     */
+    public List<PointKnowledgeHistoriesEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_knowledge_id.sql");
+        return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, knowledgeId);
+    }
+    /**
+     * Count all data
+     * @return count
+     */
+    public int physicalCountAll() {
+        String sql = "SELECT COUNT(*) FROM POINT_KNOWLEDGE_HISTORIES";
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Physical Insert.
+     * it is not create key on database sequence.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointKnowledgeHistoriesEntity rawPhysicalInsert(PointKnowledgeHistoriesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql");
+        executeUpdate(sql, 
+            entity.getHistoryNo(), 
+            entity.getKnowledgeId(), 
+            entity.getActivityNo(), 
+            entity.getType(), 
+            entity.getPoint(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        return entity;
+    }
+    /**
+     * Physical Insert.
+     * if key column have sequence, key value create by database.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointKnowledgeHistoriesEntity physicalInsert(PointKnowledgeHistoriesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql");
+        executeUpdate(sql, 
+            entity.getHistoryNo(), 
+            entity.getKnowledgeId(), 
+            entity.getActivityNo(), 
+            entity.getType(), 
+            entity.getPoint(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        return entity;
+    }
+    /**
+     * Insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointKnowledgeHistoriesEntity insert(Integer user, PointKnowledgeHistoriesEntity entity) {
+        entity.setInsertUser(user);
+        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setDeleteFlag(0);
+        return physicalInsert(entity);
+    }
+    /**
+     * Insert.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointKnowledgeHistoriesEntity insert(PointKnowledgeHistoriesEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return insert(userId, entity);
+    }
+    /**
+     * Physical Update.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointKnowledgeHistoriesEntity physicalUpdate(PointKnowledgeHistoriesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql");
+        executeUpdate(sql, 
+            entity.getActivityNo(), 
+            entity.getType(), 
+            entity.getPoint(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag(), 
+            entity.getHistoryNo(), 
+            entity.getKnowledgeId());
+        return entity;
+    }
+    /**
+     * Update.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointKnowledgeHistoriesEntity update(Integer user, PointKnowledgeHistoriesEntity entity) {
+        PointKnowledgeHistoriesEntity db = selectOnKey(entity.getHistoryNo(), entity.getKnowledgeId());
+        entity.setInsertUser(db.getInsertUser());
+        entity.setInsertDatetime(db.getInsertDatetime());
+        entity.setDeleteFlag(db.getDeleteFlag());
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        return physicalUpdate(entity);
+    }
+    /**
+     * Update.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointKnowledgeHistoriesEntity update(PointKnowledgeHistoriesEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return update(userId, entity);
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointKnowledgeHistoriesEntity save(Integer user, PointKnowledgeHistoriesEntity entity) {
+        PointKnowledgeHistoriesEntity db = selectOnKey(entity.getHistoryNo(), entity.getKnowledgeId());
+        if (db == null) {
+            return insert(user, entity);
+        } else {
+            return update(user, entity);
+        }
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointKnowledgeHistoriesEntity save(PointKnowledgeHistoriesEntity entity) {
+        PointKnowledgeHistoriesEntity db = selectOnKey(entity.getHistoryNo(), entity.getKnowledgeId());
+        if (db == null) {
+            return insert(entity);
+        } else {
+            return update(entity);
+        }
+    }
+    /**
+     * Physical Delete.
+     * @param  historyNo historyNo
+     * @param  knowledgeId knowledgeId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(Long historyNo, Long knowledgeId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_delete.sql");
+        executeUpdate(sql, historyNo, knowledgeId);
+    }
+    /**
+     * Physical Delete.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(PointKnowledgeHistoriesEntity entity) {
+        physicalDelete(entity.getHistoryNo(), entity.getKnowledgeId());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param  historyNo historyNo
+     * @param  knowledgeId knowledgeId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, Long historyNo, Long knowledgeId) {
+        PointKnowledgeHistoriesEntity db = selectOnKey(historyNo, knowledgeId);
+        db.setDeleteFlag(1);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * @param  historyNo historyNo
+     * @param  knowledgeId knowledgeId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Long historyNo, Long knowledgeId) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        delete(user, historyNo, knowledgeId);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, PointKnowledgeHistoriesEntity entity) {
+        delete(user, entity.getHistoryNo(), entity.getKnowledgeId());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(PointKnowledgeHistoriesEntity entity) {
+        delete(entity.getHistoryNo(), entity.getKnowledgeId());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param  historyNo historyNo
+     * @param  knowledgeId knowledgeId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, Long historyNo, Long knowledgeId) {
+        PointKnowledgeHistoriesEntity db = physicalSelectOnKey(historyNo, knowledgeId);
+        db.setDeleteFlag(0);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param  historyNo historyNo
+     * @param  knowledgeId knowledgeId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Long historyNo, Long knowledgeId) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        activation(user, historyNo, knowledgeId);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, PointKnowledgeHistoriesEntity entity) {
+        activation(user, entity.getHistoryNo(), entity.getKnowledgeId());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(PointKnowledgeHistoriesEntity entity) {
+        activation(entity.getHistoryNo(), entity.getKnowledgeId());
+
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
new file mode 100644
index 000000000..0407be1bb
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
@@ -0,0 +1,425 @@
+package org.support.project.knowledge.dao.gen;
+
+import java.util.List;
+
+import java.sql.Timestamp;
+
+
+import org.support.project.knowledge.entity.PointUserHistoriesEntity;
+import org.support.project.ormapping.dao.AbstractDao;
+import org.support.project.ormapping.exception.ORMappingException;
+import org.support.project.ormapping.common.SQLManager;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.ormapping.common.IDGen;
+import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.connection.ConnectionManager;
+import org.support.project.common.util.PropertyUtil;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.aop.Aspect;
+
+/**
+ * ユーザのポイント獲得履歴
+ * this class is auto generate and not edit.
+ * if modify dao method, you can edit PointUserHistoriesDao.
+ */
+@DI(instance = Instance.Singleton)
+public class GenPointUserHistoriesDao extends AbstractDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenPointUserHistoriesDao get() {
+        return Container.getComp(GenPointUserHistoriesDao.class);
+    }
+
+    /**
+     * Select all data.
+     * @return all data
+     */
+    public List<PointUserHistoriesEntity> physicalSelectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql");
+        return executeQueryList(sql, PointUserHistoriesEntity.class);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data on limit and offset
+     */
+    public List<PointUserHistoriesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql");
+        return executeQueryList(sql, PointUserHistoriesEntity.class, limit, offset);
+    }
+    /**
+     * Select data on key.
+     * @param  historyNo historyNo
+     * @param  userId userId
+     * @return data
+     */
+    public PointUserHistoriesEntity physicalSelectOnKey(Long historyNo, Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_key.sql");
+        return executeQuerySingle(sql, PointUserHistoriesEntity.class, historyNo, userId);
+    }
+    /**
+     * Select all data that not deleted.
+     * @return all data
+     */
+    public List<PointUserHistoriesEntity> selectAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql");
+        return executeQueryList(sql, PointUserHistoriesEntity.class);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data
+     */
+    public List<PointUserHistoriesEntity> selectAllWidthPager(int limit, int offset) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql");
+        return executeQueryList(sql, PointUserHistoriesEntity.class, limit, offset);
+    }
+    /**
+     * Select count that not deleted.
+     * @return count
+     */
+    public Integer selectCountAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_count_all.sql");
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Select data that not deleted on key.
+     * @param  historyNo historyNo
+     * @param  userId userId
+     * @return data
+     */
+    public PointUserHistoriesEntity selectOnKey(Long historyNo, Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_key.sql");
+        return executeQuerySingle(sql, PointUserHistoriesEntity.class, historyNo, userId);
+    }
+    /**
+     * Select data that not deleted on HISTORY_NO column.
+     * @param historyNo historyNo
+     * @return list
+     */
+    public List<PointUserHistoriesEntity> selectOnHistoryNo(Long historyNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_history_no.sql");
+        return executeQueryList(sql, PointUserHistoriesEntity.class, historyNo);
+    }
+    /**
+     * Select data that not deleted on USER_ID column.
+     * @param userId userId
+     * @return list
+     */
+    public List<PointUserHistoriesEntity> selectOnUserId(Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_user_id.sql");
+        return executeQueryList(sql, PointUserHistoriesEntity.class, userId);
+    }
+    /**
+     * Select data on HISTORY_NO column.
+     * @param historyNo historyNo
+     * @return list
+     */
+    public List<PointUserHistoriesEntity> physicalSelectOnHistoryNo(Long historyNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_history_no.sql");
+        return executeQueryList(sql, PointUserHistoriesEntity.class, historyNo);
+    }
+    /**
+     * Select data on USER_ID column.
+     * @param userId userId
+     * @return list
+     */
+    public List<PointUserHistoriesEntity> physicalSelectOnUserId(Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_user_id.sql");
+        return executeQueryList(sql, PointUserHistoriesEntity.class, userId);
+    }
+    /**
+     * Count all data
+     * @return count
+     */
+    public int physicalCountAll() {
+        String sql = "SELECT COUNT(*) FROM POINT_USER_HISTORIES";
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Physical Insert.
+     * it is not create key on database sequence.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointUserHistoriesEntity rawPhysicalInsert(PointUserHistoriesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql");
+        executeUpdate(sql, 
+            entity.getHistoryNo(), 
+            entity.getUserId(), 
+            entity.getActivityNo(), 
+            entity.getType(), 
+            entity.getPoint(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        return entity;
+    }
+    /**
+     * Physical Insert.
+     * if key column have sequence, key value create by database.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointUserHistoriesEntity physicalInsert(PointUserHistoriesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql");
+        executeUpdate(sql, 
+            entity.getHistoryNo(), 
+            entity.getUserId(), 
+            entity.getActivityNo(), 
+            entity.getType(), 
+            entity.getPoint(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        return entity;
+    }
+    /**
+     * Insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointUserHistoriesEntity insert(Integer user, PointUserHistoriesEntity entity) {
+        entity.setInsertUser(user);
+        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setDeleteFlag(0);
+        return physicalInsert(entity);
+    }
+    /**
+     * Insert.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointUserHistoriesEntity insert(PointUserHistoriesEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return insert(userId, entity);
+    }
+    /**
+     * Physical Update.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointUserHistoriesEntity physicalUpdate(PointUserHistoriesEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql");
+        executeUpdate(sql, 
+            entity.getActivityNo(), 
+            entity.getType(), 
+            entity.getPoint(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag(), 
+            entity.getHistoryNo(), 
+            entity.getUserId());
+        return entity;
+    }
+    /**
+     * Update.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointUserHistoriesEntity update(Integer user, PointUserHistoriesEntity entity) {
+        PointUserHistoriesEntity db = selectOnKey(entity.getHistoryNo(), entity.getUserId());
+        entity.setInsertUser(db.getInsertUser());
+        entity.setInsertDatetime(db.getInsertDatetime());
+        entity.setDeleteFlag(db.getDeleteFlag());
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        return physicalUpdate(entity);
+    }
+    /**
+     * Update.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointUserHistoriesEntity update(PointUserHistoriesEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return update(userId, entity);
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointUserHistoriesEntity save(Integer user, PointUserHistoriesEntity entity) {
+        PointUserHistoriesEntity db = selectOnKey(entity.getHistoryNo(), entity.getUserId());
+        if (db == null) {
+            return insert(user, entity);
+        } else {
+            return update(user, entity);
+        }
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public PointUserHistoriesEntity save(PointUserHistoriesEntity entity) {
+        PointUserHistoriesEntity db = selectOnKey(entity.getHistoryNo(), entity.getUserId());
+        if (db == null) {
+            return insert(entity);
+        } else {
+            return update(entity);
+        }
+    }
+    /**
+     * Physical Delete.
+     * @param  historyNo historyNo
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(Long historyNo, Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_delete.sql");
+        executeUpdate(sql, historyNo, userId);
+    }
+    /**
+     * Physical Delete.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(PointUserHistoriesEntity entity) {
+        physicalDelete(entity.getHistoryNo(), entity.getUserId());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param  historyNo historyNo
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, Long historyNo, Integer userId) {
+        PointUserHistoriesEntity db = selectOnKey(historyNo, userId);
+        db.setDeleteFlag(1);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * @param  historyNo historyNo
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Long historyNo, Integer userId) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        delete(user, historyNo, userId);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, PointUserHistoriesEntity entity) {
+        delete(user, entity.getHistoryNo(), entity.getUserId());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(PointUserHistoriesEntity entity) {
+        delete(entity.getHistoryNo(), entity.getUserId());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param  historyNo historyNo
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, Long historyNo, Integer userId) {
+        PointUserHistoriesEntity db = physicalSelectOnKey(historyNo, userId);
+        db.setDeleteFlag(0);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param  historyNo historyNo
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Long historyNo, Integer userId) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        activation(user, historyNo, userId);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, PointUserHistoriesEntity entity) {
+        activation(user, entity.getHistoryNo(), entity.getUserId());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(PointUserHistoriesEntity entity) {
+        activation(entity.getHistoryNo(), entity.getUserId());
+
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 88335c6f0..14cac53d4 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -1,9 +1,23 @@
 package org.support.project.knowledge.deploy.v1_11_0;
 
+import java.util.List;
+
+import org.support.project.aop.Aspect;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.deploy.Migrate;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.logic.activity.Activity;
+import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.ormapping.tool.dao.InitializeDao;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.UsersEntity;
 
 public class Migrate_1_11_2 implements Migrate {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(Migrate_1_11_2.class);
 
     public static Migrate_1_11_2 get() {
         return org.support.project.di.Container.getComp(Migrate_1_11_2.class);
@@ -17,10 +31,39 @@ public boolean doMigrate() throws Exception {
         };
         initializeDao.initializeDatabase(sqlpaths);
         
+        // Knowledgeを登録したイベントによりポイントを集計
+        doAddPointByKnowledge();
+        
+        
         // 参照回数を集計
         
-        // ポイント修正
         
         return true;
     }
+    
+    
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void doAddPointByKnowledge() {
+        // ポイント修正
+        LOG.info("Aggregate point by knowledge insert");
+        List<KnowledgesEntity> knowledges;
+        int offset = 0;
+        int limit = 50;
+        do {
+            knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset);
+            for (KnowledgesEntity knowledge : knowledges) {
+                LoginedUser user = new LoginedUser();
+                UsersEntity account = UsersDao.get().selectOnKey(knowledge.getInsertUser());
+                if (account == null) {
+                    LOG.info("insert user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge insert.");
+                    continue;
+                }
+                user.setLoginUser(account);
+                LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+                ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, user, knowledge);
+            }
+            offset = offset + limit;
+        } while (knowledges.size() > 0);
+    }
+    
 }
\ No newline at end of file
diff --git a/src/main/java/org/support/project/knowledge/entity/PointKnowledgeHistoriesEntity.java b/src/main/java/org/support/project/knowledge/entity/PointKnowledgeHistoriesEntity.java
new file mode 100644
index 000000000..02d9d6ed7
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/PointKnowledgeHistoriesEntity.java
@@ -0,0 +1,50 @@
+package org.support.project.knowledge.entity;
+
+import org.support.project.knowledge.entity.gen.GenPointKnowledgeHistoriesEntity;
+
+import java.util.List;
+import java.util.Map;
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import java.sql.Timestamp;
+
+
+/**
+ * ナレッジのポイント獲得履歴
+ */
+@DI(instance = Instance.Prototype)
+public class PointKnowledgeHistoriesEntity extends GenPointKnowledgeHistoriesEntity {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static PointKnowledgeHistoriesEntity get() {
+        return Container.getComp(PointKnowledgeHistoriesEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public PointKnowledgeHistoriesEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param historyNo 履歴番号
+     * @param knowledgeId ナレッジID
+     */
+
+    public PointKnowledgeHistoriesEntity(Long historyNo, Long knowledgeId) {
+        super( historyNo,  knowledgeId);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/PointUserHistoriesEntity.java b/src/main/java/org/support/project/knowledge/entity/PointUserHistoriesEntity.java
new file mode 100644
index 000000000..47459c8af
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/PointUserHistoriesEntity.java
@@ -0,0 +1,50 @@
+package org.support.project.knowledge.entity;
+
+import org.support.project.knowledge.entity.gen.GenPointUserHistoriesEntity;
+
+import java.util.List;
+import java.util.Map;
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import java.sql.Timestamp;
+
+
+/**
+ * ユーザのポイント獲得履歴
+ */
+@DI(instance = Instance.Prototype)
+public class PointUserHistoriesEntity extends GenPointUserHistoriesEntity {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static PointUserHistoriesEntity get() {
+        return Container.getComp(PointUserHistoriesEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public PointUserHistoriesEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param historyNo 履歴番号
+     * @param userId ユーザID
+     */
+
+    public PointUserHistoriesEntity(Long historyNo, Integer userId) {
+        super( historyNo,  userId);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenActivitiesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenActivitiesEntity.java
index 201cbe360..b9e5eb558 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenActivitiesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenActivitiesEntity.java
@@ -42,23 +42,21 @@ public GenActivitiesEntity() {
 
     /**
      * Constructor
-     * @param no 番号
+     * @param activityNo アクティビティ番号
      */
 
-    public GenActivitiesEntity(Long no) {
+    public GenActivitiesEntity(Long activityNo) {
         super();
-        this.no = no;
+        this.activityNo = activityNo;
     }
-    /** 番号 */
-    private Long no;
-    /** ユーザID */
+    /** アクティビティ番号 */
+    private Long activityNo;
+    /** イベントをおこしたユーザ */
     private Integer userId;
-    /** 種類 */
-    private Integer type;
+    /** アクティビティの種類 */
+    private Integer kind;
     /** ターゲットID */
-    private Long target;
-    /** 獲得ポイント */
-    private Integer point;
+    private String target;
     /** 登録ユーザ */
     private Integer insertUser;
     /** 登録日時 */
@@ -71,31 +69,31 @@ public GenActivitiesEntity(Long no) {
     private Integer deleteFlag;
 
     /**
-     * Get 番号.
-     * @return 番号
+     * Get アクティビティ番号.
+     * @return アクティビティ番号
      */
-    public Long getNo() {
-        return this.no;
+    public Long getActivityNo() {
+        return this.activityNo;
     }
     /**
-     * Set 番号.
-     * @param no 番号
+     * Set アクティビティ番号.
+     * @param activityNo アクティビティ番号
      * @return this object     */
-    public GenActivitiesEntity setNo(Long no) {
-        this.no = no;
+    public GenActivitiesEntity setActivityNo(Long activityNo) {
+        this.activityNo = activityNo;
         return this;
     }
 
     /**
-     * Get ユーザID.
-     * @return ユーザID
+     * Get イベントをおこしたユーザ.
+     * @return イベントをおこしたユーザ
      */
     public Integer getUserId() {
         return this.userId;
     }
     /**
-     * Set ユーザID.
-     * @param userId ユーザID
+     * Set イベントをおこしたユーザ.
+     * @param userId イベントをおこしたユーザ
      * @return this object     */
     public GenActivitiesEntity setUserId(Integer userId) {
         this.userId = userId;
@@ -103,18 +101,18 @@ public GenActivitiesEntity setUserId(Integer userId) {
     }
 
     /**
-     * Get 種類.
-     * @return 種類
+     * Get アクティビティの種類.
+     * @return アクティビティの種類
      */
-    public Integer getType() {
-        return this.type;
+    public Integer getKind() {
+        return this.kind;
     }
     /**
-     * Set 種類.
-     * @param type 種類
+     * Set アクティビティの種類.
+     * @param kind アクティビティの種類
      * @return this object     */
-    public GenActivitiesEntity setType(Integer type) {
-        this.type = type;
+    public GenActivitiesEntity setKind(Integer kind) {
+        this.kind = kind;
         return this;
     }
 
@@ -122,34 +120,18 @@ public GenActivitiesEntity setType(Integer type) {
      * Get ターゲットID.
      * @return ターゲットID
      */
-    public Long getTarget() {
+    public String getTarget() {
         return this.target;
     }
     /**
      * Set ターゲットID.
      * @param target ターゲットID
      * @return this object     */
-    public GenActivitiesEntity setTarget(Long target) {
+    public GenActivitiesEntity setTarget(String target) {
         this.target = target;
         return this;
     }
 
-    /**
-     * Get 獲得ポイント.
-     * @return 獲得ポイント
-     */
-    public Integer getPoint() {
-        return this.point;
-    }
-    /**
-     * Set 獲得ポイント.
-     * @param point 獲得ポイント
-     * @return this object     */
-    public GenActivitiesEntity setPoint(Integer point) {
-        this.point = point;
-        return this;
-    }
-
     /**
      * Get 登録ユーザ.
      * @return 登録ユーザ
@@ -236,15 +218,15 @@ public GenActivitiesEntity setDeleteFlag(Integer deleteFlag) {
      */
     public Object[] getKeyValues() {
         Object[] keyValues = new Object[1];
-        keyValues[0] = this.no;
+        keyValues[0] = this.activityNo;
         return keyValues;
     }
     /**
      * Set key values 
-     * @param no 番号
+     * @param activityNo アクティビティ番号
      */
-    public void setKeyValues(Long no) {
-        this.no = no;
+    public void setKeyValues(Long activityNo) {
+        this.activityNo = activityNo;
     }
     /**
      * compare on key 
@@ -278,11 +260,10 @@ public boolean equalsOnKey(GenActivitiesEntity entity) {
      */
     public String toString() {
         StringBuilder builder = new StringBuilder();
-        builder.append("no = ").append(no).append("\n");
+        builder.append("activityNo = ").append(activityNo).append("\n");
         builder.append("userId = ").append(userId).append("\n");
-        builder.append("type = ").append(type).append("\n");
+        builder.append("kind = ").append(kind).append("\n");
         builder.append("target = ").append(target).append("\n");
-        builder.append("point = ").append(point).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
         builder.append("insertDatetime = ").append(insertDatetime).append("\n");
         builder.append("updateUser = ").append(updateUser).append("\n");
@@ -317,12 +298,12 @@ public List<ValidateError> validate() {
             errors.add(error);
         }
         validator = ValidatorFactory.getInstance(Validator.REQUIRED);
-        error = validator.validate(this.type, convLabelName("Type"));
+        error = validator.validate(this.kind, convLabelName("Kind"));
         if (error != null) {
             errors.add(error);
         }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
-        error = validator.validate(this.type, convLabelName("Type"));
+        error = validator.validate(this.kind, convLabelName("Kind"));
         if (error != null) {
             errors.add(error);
         }
@@ -331,13 +312,8 @@ public List<ValidateError> validate() {
         if (error != null) {
             errors.add(error);
         }
-        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
-        error = validator.validate(this.point, convLabelName("Point"));
-        if (error != null) {
-            errors.add(error);
-        }
-        validator = ValidatorFactory.getInstance(Validator.INTEGER);
-        error = validator.validate(this.point, convLabelName("Point"));
+        validator = ValidatorFactory.getInstance(Validator.MAX_LENGTH);
+        error = validator.validate(this.target, convLabelName("Target"), 64);
         if (error != null) {
             errors.add(error);
         }
@@ -378,12 +354,12 @@ public List<ValidateError> validate(Map<String, String> values) {
             errors.add(error);
         }
         validator = ValidatorFactory.getInstance(Validator.REQUIRED);
-        error = validator.validate(values.get("type"), convLabelName("Type"));
+        error = validator.validate(values.get("kind"), convLabelName("Kind"));
         if (error != null) {
             errors.add(error);
         }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
-        error = validator.validate(values.get("type"), convLabelName("Type"));
+        error = validator.validate(values.get("kind"), convLabelName("Kind"));
         if (error != null) {
             errors.add(error);
         }
@@ -392,13 +368,8 @@ public List<ValidateError> validate(Map<String, String> values) {
         if (error != null) {
             errors.add(error);
         }
-        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
-        error = validator.validate(values.get("point"), convLabelName("Point"));
-        if (error != null) {
-            errors.add(error);
-        }
-        validator = ValidatorFactory.getInstance(Validator.INTEGER);
-        error = validator.validate(values.get("point"), convLabelName("Point"));
+        validator = ValidatorFactory.getInstance(Validator.MAX_LENGTH);
+        error = validator.validate(values.get("target"), convLabelName("Target"), 64);
         if (error != null) {
             errors.add(error);
         }
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenBadgesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenBadgesEntity.java
index d1ac98afb..8029db0ca 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenBadgesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenBadgesEntity.java
@@ -57,8 +57,10 @@ public GenBadgesEntity(Integer no) {
     private String displayText;
     /** 説明 */
     private String description;
-    /** 画像の種類 */
-    private Integer imageCategory;
+    /** 画像 */
+    private String image;
+    /** 獲得ポイント */
+    private Integer point;
     /** 登録ユーザ */
     private Integer insertUser;
     /** 登録日時 */
@@ -135,18 +137,34 @@ public GenBadgesEntity setDescription(String description) {
     }
 
     /**
-     * Get 画像の種類.
-     * @return 画像の種類
+     * Get 画像.
+     * @return 画像
      */
-    public Integer getImageCategory() {
-        return this.imageCategory;
+    public String getImage() {
+        return this.image;
     }
     /**
-     * Set 画像の種類.
-     * @param imageCategory 画像の種類
+     * Set 画像.
+     * @param image 画像
      * @return this object     */
-    public GenBadgesEntity setImageCategory(Integer imageCategory) {
-        this.imageCategory = imageCategory;
+    public GenBadgesEntity setImage(String image) {
+        this.image = image;
+        return this;
+    }
+
+    /**
+     * Get 獲得ポイント.
+     * @return 獲得ポイント
+     */
+    public Integer getPoint() {
+        return this.point;
+    }
+    /**
+     * Set 獲得ポイント.
+     * @param point 獲得ポイント
+     * @return this object     */
+    public GenBadgesEntity setPoint(Integer point) {
+        this.point = point;
         return this;
     }
 
@@ -282,7 +300,8 @@ public String toString() {
         builder.append("name = ").append(name).append("\n");
         builder.append("displayText = ").append(displayText).append("\n");
         builder.append("description = ").append(description).append("\n");
-        builder.append("imageCategory = ").append(imageCategory).append("\n");
+        builder.append("image = ").append(image).append("\n");
+        builder.append("point = ").append(point).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
         builder.append("insertDatetime = ").append(insertDatetime).append("\n");
         builder.append("updateUser = ").append(updateUser).append("\n");
@@ -331,8 +350,13 @@ public List<ValidateError> validate() {
         if (error != null) {
             errors.add(error);
         }
+        validator = ValidatorFactory.getInstance(Validator.MAX_LENGTH);
+        error = validator.validate(this.image, convLabelName("Image"), 64);
+        if (error != null) {
+            errors.add(error);
+        }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
-        error = validator.validate(this.imageCategory, convLabelName("Image Category"));
+        error = validator.validate(this.point, convLabelName("Point"));
         if (error != null) {
             errors.add(error);
         }
@@ -387,8 +411,13 @@ public List<ValidateError> validate(Map<String, String> values) {
         if (error != null) {
             errors.add(error);
         }
+        validator = ValidatorFactory.getInstance(Validator.MAX_LENGTH);
+        error = validator.validate(values.get("image"), convLabelName("Image"), 64);
+        if (error != null) {
+            errors.add(error);
+        }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
-        error = validator.validate(values.get("imageCategory"), convLabelName("Image Category"));
+        error = validator.validate(values.get("point"), convLabelName("Point"));
         if (error != null) {
             errors.add(error);
         }
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java
new file mode 100644
index 000000000..4edb02c74
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java
@@ -0,0 +1,428 @@
+package org.support.project.knowledge.entity.gen;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+import java.sql.Timestamp;
+
+
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.common.validate.Validator;
+import org.support.project.common.validate.ValidatorFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+/**
+ * ナレッジのポイント獲得履歴
+ */
+@DI(instance = Instance.Prototype)
+public class GenPointKnowledgeHistoriesEntity implements Serializable {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenPointKnowledgeHistoriesEntity get() {
+        return Container.getComp(GenPointKnowledgeHistoriesEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public GenPointKnowledgeHistoriesEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param historyNo 履歴番号
+     * @param knowledgeId ナレッジID
+     */
+
+    public GenPointKnowledgeHistoriesEntity(Long historyNo, Long knowledgeId) {
+        super();
+        this.historyNo = historyNo;
+        this.knowledgeId = knowledgeId;
+    }
+    /** ナレッジID */
+    private Long knowledgeId;
+    /** 履歴番号 */
+    private Long historyNo;
+    /** アクティビティ番号 */
+    private Long activityNo;
+    /** 獲得のタイプ */
+    private Integer type;
+    /** 獲得ポイント */
+    private Integer point;
+    /** 登録ユーザ */
+    private Integer insertUser;
+    /** 登録日時 */
+    private Timestamp insertDatetime;
+    /** 更新ユーザ */
+    private Integer updateUser;
+    /** 更新日時 */
+    private Timestamp updateDatetime;
+    /** 削除フラグ */
+    private Integer deleteFlag;
+
+    /**
+     * Get ナレッジID.
+     * @return ナレッジID
+     */
+    public Long getKnowledgeId() {
+        return this.knowledgeId;
+    }
+    /**
+     * Set ナレッジID.
+     * @param knowledgeId ナレッジID
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setKnowledgeId(Long knowledgeId) {
+        this.knowledgeId = knowledgeId;
+        return this;
+    }
+
+    /**
+     * Get 履歴番号.
+     * @return 履歴番号
+     */
+    public Long getHistoryNo() {
+        return this.historyNo;
+    }
+    /**
+     * Set 履歴番号.
+     * @param historyNo 履歴番号
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setHistoryNo(Long historyNo) {
+        this.historyNo = historyNo;
+        return this;
+    }
+
+    /**
+     * Get アクティビティ番号.
+     * @return アクティビティ番号
+     */
+    public Long getActivityNo() {
+        return this.activityNo;
+    }
+    /**
+     * Set アクティビティ番号.
+     * @param activityNo アクティビティ番号
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setActivityNo(Long activityNo) {
+        this.activityNo = activityNo;
+        return this;
+    }
+
+    /**
+     * Get 獲得のタイプ.
+     * @return 獲得のタイプ
+     */
+    public Integer getType() {
+        return this.type;
+    }
+    /**
+     * Set 獲得のタイプ.
+     * @param type 獲得のタイプ
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setType(Integer type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get 獲得ポイント.
+     * @return 獲得ポイント
+     */
+    public Integer getPoint() {
+        return this.point;
+    }
+    /**
+     * Set 獲得ポイント.
+     * @param point 獲得ポイント
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setPoint(Integer point) {
+        this.point = point;
+        return this;
+    }
+
+    /**
+     * Get 登録ユーザ.
+     * @return 登録ユーザ
+     */
+    public Integer getInsertUser() {
+        return this.insertUser;
+    }
+    /**
+     * Set 登録ユーザ.
+     * @param insertUser 登録ユーザ
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setInsertUser(Integer insertUser) {
+        this.insertUser = insertUser;
+        return this;
+    }
+
+    /**
+     * Get 登録日時.
+     * @return 登録日時
+     */
+    public Timestamp getInsertDatetime() {
+        return this.insertDatetime;
+    }
+    /**
+     * Set 登録日時.
+     * @param insertDatetime 登録日時
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setInsertDatetime(Timestamp insertDatetime) {
+        this.insertDatetime = insertDatetime;
+        return this;
+    }
+
+    /**
+     * Get 更新ユーザ.
+     * @return 更新ユーザ
+     */
+    public Integer getUpdateUser() {
+        return this.updateUser;
+    }
+    /**
+     * Set 更新ユーザ.
+     * @param updateUser 更新ユーザ
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+        return this;
+    }
+
+    /**
+     * Get 更新日時.
+     * @return 更新日時
+     */
+    public Timestamp getUpdateDatetime() {
+        return this.updateDatetime;
+    }
+    /**
+     * Set 更新日時.
+     * @param updateDatetime 更新日時
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setUpdateDatetime(Timestamp updateDatetime) {
+        this.updateDatetime = updateDatetime;
+        return this;
+    }
+
+    /**
+     * Get 削除フラグ.
+     * @return 削除フラグ
+     */
+    public Integer getDeleteFlag() {
+        return this.deleteFlag;
+    }
+    /**
+     * Set 削除フラグ.
+     * @param deleteFlag 削除フラグ
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
+    /**
+     * Get key values 
+     * @return values 
+     */
+    public Object[] getKeyValues() {
+        Object[] keyValues = new Object[2];
+        keyValues[0] = this.historyNo;
+        keyValues[1] = this.knowledgeId;
+        return keyValues;
+    }
+    /**
+     * Set key values 
+     * @param historyNo 履歴番号
+     * @param knowledgeId ナレッジID
+     */
+    public void setKeyValues(Long historyNo, Long knowledgeId) {
+        this.historyNo = historyNo;
+        this.knowledgeId = knowledgeId;
+    }
+    /**
+     * compare on key 
+     * @param entity entity 
+     * @return result 
+     */
+    public boolean equalsOnKey(GenPointKnowledgeHistoriesEntity entity) {
+        Object[] keyValues1 = getKeyValues();
+        Object[] keyValues2 = entity.getKeyValues();
+        for (int i = 0; i < keyValues1.length; i++) {
+            Object val1 = keyValues1[i];
+            Object val2 = keyValues2[i];
+            if (val1 == null && val2 != null) {
+                return false;
+            }
+            if (val1 != null && val2 == null) {
+                return false;
+            }
+            if (val1 != null && val2 != null) {
+                if (!val1.equals(val2)) {
+                    return false;
+                }
+            }
+            
+        }
+        return true;
+    }
+    /**
+     * ToString 
+     * @return string 
+     */
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("historyNo = ").append(historyNo).append("\n");
+        builder.append("knowledgeId = ").append(knowledgeId).append("\n");
+        builder.append("activityNo = ").append(activityNo).append("\n");
+        builder.append("type = ").append(type).append("\n");
+        builder.append("point = ").append(point).append("\n");
+        builder.append("insertUser = ").append(insertUser).append("\n");
+        builder.append("insertDatetime = ").append(insertDatetime).append("\n");
+        builder.append("updateUser = ").append(updateUser).append("\n");
+        builder.append("updateDatetime = ").append(updateDatetime).append("\n");
+        builder.append("deleteFlag = ").append(deleteFlag).append("\n");
+        return builder.toString();
+    }
+    /**
+     * Convert label to display 
+     * @param label label
+     * @return convert label 
+     */
+    protected String convLabelName(String label) {
+        return label;
+    }
+    /**
+     * validate 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate() {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.knowledgeId, convLabelName("Knowledge Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.historyNo, convLabelName("History No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.activityNo, convLabelName("Activity No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.type, convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.type, convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.point, convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.point, convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.insertUser, convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.updateUser, convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.deleteFlag, convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+    /**
+     * validate 
+     * @param values value map 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate(Map<String, String> values) {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("knowledgeId"), convLabelName("Knowledge Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("historyNo"), convLabelName("History No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("activityNo"), convLabelName("Activity No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("type"), convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("type"), convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("point"), convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("point"), convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("updateUser"), convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("deleteFlag"), convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java
new file mode 100644
index 000000000..66af41553
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java
@@ -0,0 +1,428 @@
+package org.support.project.knowledge.entity.gen;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+import java.sql.Timestamp;
+
+
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.common.validate.Validator;
+import org.support.project.common.validate.ValidatorFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+/**
+ * ユーザのポイント獲得履歴
+ */
+@DI(instance = Instance.Prototype)
+public class GenPointUserHistoriesEntity implements Serializable {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenPointUserHistoriesEntity get() {
+        return Container.getComp(GenPointUserHistoriesEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public GenPointUserHistoriesEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param historyNo 履歴番号
+     * @param userId ユーザID
+     */
+
+    public GenPointUserHistoriesEntity(Long historyNo, Integer userId) {
+        super();
+        this.historyNo = historyNo;
+        this.userId = userId;
+    }
+    /** ユーザID */
+    private Integer userId;
+    /** 履歴番号 */
+    private Long historyNo;
+    /** アクティビティ番号 */
+    private Long activityNo;
+    /** 獲得のタイプ */
+    private Integer type;
+    /** 獲得ポイント */
+    private Integer point;
+    /** 登録ユーザ */
+    private Integer insertUser;
+    /** 登録日時 */
+    private Timestamp insertDatetime;
+    /** 更新ユーザ */
+    private Integer updateUser;
+    /** 更新日時 */
+    private Timestamp updateDatetime;
+    /** 削除フラグ */
+    private Integer deleteFlag;
+
+    /**
+     * Get ユーザID.
+     * @return ユーザID
+     */
+    public Integer getUserId() {
+        return this.userId;
+    }
+    /**
+     * Set ユーザID.
+     * @param userId ユーザID
+     * @return this object     */
+    public GenPointUserHistoriesEntity setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    /**
+     * Get 履歴番号.
+     * @return 履歴番号
+     */
+    public Long getHistoryNo() {
+        return this.historyNo;
+    }
+    /**
+     * Set 履歴番号.
+     * @param historyNo 履歴番号
+     * @return this object     */
+    public GenPointUserHistoriesEntity setHistoryNo(Long historyNo) {
+        this.historyNo = historyNo;
+        return this;
+    }
+
+    /**
+     * Get アクティビティ番号.
+     * @return アクティビティ番号
+     */
+    public Long getActivityNo() {
+        return this.activityNo;
+    }
+    /**
+     * Set アクティビティ番号.
+     * @param activityNo アクティビティ番号
+     * @return this object     */
+    public GenPointUserHistoriesEntity setActivityNo(Long activityNo) {
+        this.activityNo = activityNo;
+        return this;
+    }
+
+    /**
+     * Get 獲得のタイプ.
+     * @return 獲得のタイプ
+     */
+    public Integer getType() {
+        return this.type;
+    }
+    /**
+     * Set 獲得のタイプ.
+     * @param type 獲得のタイプ
+     * @return this object     */
+    public GenPointUserHistoriesEntity setType(Integer type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get 獲得ポイント.
+     * @return 獲得ポイント
+     */
+    public Integer getPoint() {
+        return this.point;
+    }
+    /**
+     * Set 獲得ポイント.
+     * @param point 獲得ポイント
+     * @return this object     */
+    public GenPointUserHistoriesEntity setPoint(Integer point) {
+        this.point = point;
+        return this;
+    }
+
+    /**
+     * Get 登録ユーザ.
+     * @return 登録ユーザ
+     */
+    public Integer getInsertUser() {
+        return this.insertUser;
+    }
+    /**
+     * Set 登録ユーザ.
+     * @param insertUser 登録ユーザ
+     * @return this object     */
+    public GenPointUserHistoriesEntity setInsertUser(Integer insertUser) {
+        this.insertUser = insertUser;
+        return this;
+    }
+
+    /**
+     * Get 登録日時.
+     * @return 登録日時
+     */
+    public Timestamp getInsertDatetime() {
+        return this.insertDatetime;
+    }
+    /**
+     * Set 登録日時.
+     * @param insertDatetime 登録日時
+     * @return this object     */
+    public GenPointUserHistoriesEntity setInsertDatetime(Timestamp insertDatetime) {
+        this.insertDatetime = insertDatetime;
+        return this;
+    }
+
+    /**
+     * Get 更新ユーザ.
+     * @return 更新ユーザ
+     */
+    public Integer getUpdateUser() {
+        return this.updateUser;
+    }
+    /**
+     * Set 更新ユーザ.
+     * @param updateUser 更新ユーザ
+     * @return this object     */
+    public GenPointUserHistoriesEntity setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+        return this;
+    }
+
+    /**
+     * Get 更新日時.
+     * @return 更新日時
+     */
+    public Timestamp getUpdateDatetime() {
+        return this.updateDatetime;
+    }
+    /**
+     * Set 更新日時.
+     * @param updateDatetime 更新日時
+     * @return this object     */
+    public GenPointUserHistoriesEntity setUpdateDatetime(Timestamp updateDatetime) {
+        this.updateDatetime = updateDatetime;
+        return this;
+    }
+
+    /**
+     * Get 削除フラグ.
+     * @return 削除フラグ
+     */
+    public Integer getDeleteFlag() {
+        return this.deleteFlag;
+    }
+    /**
+     * Set 削除フラグ.
+     * @param deleteFlag 削除フラグ
+     * @return this object     */
+    public GenPointUserHistoriesEntity setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
+    /**
+     * Get key values 
+     * @return values 
+     */
+    public Object[] getKeyValues() {
+        Object[] keyValues = new Object[2];
+        keyValues[0] = this.historyNo;
+        keyValues[1] = this.userId;
+        return keyValues;
+    }
+    /**
+     * Set key values 
+     * @param historyNo 履歴番号
+     * @param userId ユーザID
+     */
+    public void setKeyValues(Long historyNo, Integer userId) {
+        this.historyNo = historyNo;
+        this.userId = userId;
+    }
+    /**
+     * compare on key 
+     * @param entity entity 
+     * @return result 
+     */
+    public boolean equalsOnKey(GenPointUserHistoriesEntity entity) {
+        Object[] keyValues1 = getKeyValues();
+        Object[] keyValues2 = entity.getKeyValues();
+        for (int i = 0; i < keyValues1.length; i++) {
+            Object val1 = keyValues1[i];
+            Object val2 = keyValues2[i];
+            if (val1 == null && val2 != null) {
+                return false;
+            }
+            if (val1 != null && val2 == null) {
+                return false;
+            }
+            if (val1 != null && val2 != null) {
+                if (!val1.equals(val2)) {
+                    return false;
+                }
+            }
+            
+        }
+        return true;
+    }
+    /**
+     * ToString 
+     * @return string 
+     */
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("historyNo = ").append(historyNo).append("\n");
+        builder.append("userId = ").append(userId).append("\n");
+        builder.append("activityNo = ").append(activityNo).append("\n");
+        builder.append("type = ").append(type).append("\n");
+        builder.append("point = ").append(point).append("\n");
+        builder.append("insertUser = ").append(insertUser).append("\n");
+        builder.append("insertDatetime = ").append(insertDatetime).append("\n");
+        builder.append("updateUser = ").append(updateUser).append("\n");
+        builder.append("updateDatetime = ").append(updateDatetime).append("\n");
+        builder.append("deleteFlag = ").append(deleteFlag).append("\n");
+        return builder.toString();
+    }
+    /**
+     * Convert label to display 
+     * @param label label
+     * @return convert label 
+     */
+    protected String convLabelName(String label) {
+        return label;
+    }
+    /**
+     * validate 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate() {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.userId, convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.userId, convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.historyNo, convLabelName("History No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.activityNo, convLabelName("Activity No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.type, convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.type, convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.point, convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.insertUser, convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.updateUser, convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.deleteFlag, convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+    /**
+     * validate 
+     * @param values value map 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate(Map<String, String> values) {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("userId"), convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("userId"), convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("historyNo"), convLabelName("History No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("activityNo"), convLabelName("Activity No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("type"), convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("type"), convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("point"), convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("updateUser"), convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("deleteFlag"), convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
new file mode 100644
index 000000000..2c98f441a
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
@@ -0,0 +1,151 @@
+package org.support.project.knowledge.logic.activity;
+
+
+import java.sql.Timestamp;
+
+import org.support.project.common.config.INT_FLAG;
+import org.support.project.common.util.StringUtils;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.UserConfig;
+import org.support.project.knowledge.dao.ActivitiesDao;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.PointKnowledgeHistoriesDao;
+import org.support.project.knowledge.dao.PointUserHistoriesDao;
+import org.support.project.knowledge.entity.ActivitiesEntity;
+import org.support.project.knowledge.entity.PointKnowledgeHistoriesEntity;
+import org.support.project.knowledge.entity.PointUserHistoriesEntity;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.UserConfigsDao;
+import org.support.project.web.entity.UserConfigsEntity;
+
+/**
+ * Activityに対応して、ポイントを付与する
+ * 
+ * @author koda
+ */
+public abstract class AbstractActivityProcessor implements ActivityProcessor {
+    private static Object lockUser = new Object();
+    private static Object lockKnowledge = new Object();
+    
+    private LoginedUser user;
+    /**
+     * @return the user
+     */
+    public LoginedUser getUser() {
+        return user;
+    }
+    /**
+     * @param user the user to set
+     */
+    public void setUser(LoginedUser user) {
+        this.user = user;
+    }
+    /**
+     * 対象のactivityが既に登録されているかチェック
+     * @param userId アクティビティを実行したユーザ
+     * @param kind アクティビティの種類
+     * @param target そのアクティビティでポイントを付与する対象
+     * @return
+     */
+    protected boolean isExistsActivity(int userId, Activity kind, String target) {
+        ActivitiesEntity entity = ActivitiesDao.get().select(userId, kind.getValue(), target);
+        if (entity == null) {
+            return false;
+        }
+        return true;
+    }
+    
+    /**
+     * activity登録
+     * @param userId アクティビティを実行したユーザ
+     * @param kind アクティビティの種類
+     * @param target そのアクティビティでポイントを付与する対象
+     * @param eventTime そのアクティビティが実行されたタイミング
+     */
+    protected ActivitiesEntity addActivity(int userId, Activity kind, String target, Timestamp eventTime) {
+        ActivitiesEntity entity = new ActivitiesEntity();
+        entity.setUserId(userId);
+        entity.setKind(kind.getValue());
+        entity.setTarget(target);
+        entity.setInsertUser(userId);
+        entity.setInsertDatetime(eventTime);
+        entity.setDeleteFlag(INT_FLAG.OFF.getValue());
+        entity = ActivitiesDao.get().physicalInsert(entity);
+        return entity;
+    }
+    
+    /**
+     * ポイントをユーザに加算
+     * @param eventUser
+     * @param eventTime
+     * @param targetUser
+     * @param activityNo
+     * @param type
+     * @param point
+     * @return
+     */
+    protected int addPointForUser(int eventUser, Timestamp eventTime, int targetUser, long activityNo, int type, int point) {
+        synchronized(lockUser) {
+            long num = PointUserHistoriesDao.get().selectNumOnUser(targetUser);
+            num++;
+            PointUserHistoriesEntity history = new PointUserHistoriesEntity();
+            history.setUserId(targetUser);
+            history.setHistoryNo(num);
+            history.setActivityNo(activityNo);
+            history.setType(type);
+            history.setPoint(point);
+            history.setInsertUser(eventUser);
+            history.setInsertDatetime(eventTime);
+            history.setDeleteFlag(INT_FLAG.OFF.getValue());
+            PointUserHistoriesDao.get().physicalInsert(history);
+            
+            UserConfigsEntity config = UserConfigsDao.get().selectOnKey(UserConfig.POINT, AppConfig.get().getSystemName(), targetUser);
+            if (config == null) {
+                config = new UserConfigsEntity(UserConfig.POINT, AppConfig.get().getSystemName(), targetUser);
+                config.setConfigValue("0");
+            }
+            if (!StringUtils.isInteger(config.getConfigValue())) {
+                config.setConfigValue("0");
+            }
+            
+            int now = Integer.parseInt(config.getConfigValue());
+            now = now + point;
+            config.setConfigValue(String.valueOf(now));
+            UserConfigsDao.get().save(config);
+            return now;
+        }
+    }
+    /**
+     * 記事にポイントを加算
+     * @param eventUser
+     * @param eventTime
+     * @param knowledgeId
+     * @param activityNo
+     * @param type
+     * @param point
+     * @return
+     */
+    protected int addPointForKnowledge(int eventUser, Timestamp eventTime, long knowledgeId, long activityNo, int type, int point) {
+        synchronized (lockKnowledge) {
+            long num = PointKnowledgeHistoriesDao.get().selectNumOnKnowledge(knowledgeId);
+            num++;
+            PointKnowledgeHistoriesEntity history = new PointKnowledgeHistoriesEntity();
+            history.setKnowledgeId(knowledgeId);
+            history.setHistoryNo(num);
+            history.setActivityNo(activityNo);
+            history.setType(type);
+            history.setPoint(point);
+            history.setInsertUser(eventUser);
+            history.setInsertDatetime(eventTime);
+            history.setDeleteFlag(INT_FLAG.OFF.getValue());
+            PointKnowledgeHistoriesDao.get().physicalInsert(history);
+            
+            // Daoのupdateメソッドなどを使うと、「更新者」が更新されるので、ポイントのみを更新するメソッドを呼ぶ
+            // なお、記事の存在チェックは行わない
+            int now = KnowledgesDao.get().selectPoint(knowledgeId);
+            now = now + point;
+            KnowledgesDao.get().updatePoint(knowledgeId, point);
+            return now;
+        }
+    }
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
new file mode 100644
index 000000000..2ecf4f345
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
@@ -0,0 +1,19 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.knowledge.entity.CommentsEntity;
+
+public abstract class AbstractAddPointForCommentProcessor extends AbstractActivityProcessor {
+    private CommentsEntity comment;
+    /**
+     * @return the comment
+     */
+    public CommentsEntity getComment() {
+        return comment;
+    }
+    /**
+     * @param comment the comment to set
+     */
+    public void setComment(CommentsEntity comment) {
+        this.comment = comment;
+    }
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
new file mode 100644
index 000000000..5992aeed6
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
@@ -0,0 +1,19 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.knowledge.entity.KnowledgesEntity;
+
+public abstract class AbstractAddPointForKnowledgeProcessor extends AbstractActivityProcessor {
+    private KnowledgesEntity knowledge;
+    /**
+     * @return the knowledge
+     */
+    public KnowledgesEntity getKnowledge() {
+        return knowledge;
+    }
+    /**
+     * @param knowledge the knowledge to set
+     */
+    public void setKnowledge(KnowledgesEntity knowledge) {
+        this.knowledge = knowledge;
+    }
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/Activity.java b/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
new file mode 100644
index 000000000..95127e871
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
@@ -0,0 +1,112 @@
+package org.support.project.knowledge.logic.activity;
+
+/**
+ * ポイントが増減するアクティビティの種類
+ * 
+ * 種類  | ターゲット文字列 | イベントの内容
+ * 1    | knowledge_id  | 記事を登録
+ * 2    | knowledge_id  | 記事参照
+ * 3    | knowledge_id  | 記事へイイネを登録
+ * 4    | knowledge_id  | 記事をストック
+ * 5    | knowledge_id  | アンケート回答
+ * 6    | knowledge_id  | イベント参加
+ * 101  | comment_no    | コメント登録
+ * 102  | comment_no    | コメントにイイネ登録
+ * -6   | knowledge_id  | イベント参加の取り消し
+ * 
+ * ---------------------------------------------------------------------------
+ * 
+ * ポイント操作
+ * 
+ * 種類  | 獲得のタイプ  | ポイント付与先 | ポイント    | 獲得タイプの意味
+ * 1    | 11          | 記事登録者    | 50       | 記事を投稿したら投稿者にポイント追加
+ * 1    | 12          | 記事         | 50       | 登録された記事のポイント初期値
+ * 2    | 21          | 参照者       | 1        | 記事を参照するアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
+ * 2    | 22          | 記事登録者    | 1        | 自分が登録された記事が参照されたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+ * 2    | 23          | 記事         | 1        | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 3    | 31          | 参照者       | 2        | 記事にイイネのアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
+ * 3    | 32          | 記事登録者    | 10       | 自分が登録された記事にイイネがついたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+ * 3    | 33          | 記事         | 10       | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 4    | 41          | 参照者       | 0        | ストックした場合、ストックした人にポイントは付与しない
+ * 4    | 42          | 記事登録者    | 2       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+ * 4    | 43          | 記事         | 2       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 5    | 51          | 参照者       | 3        | アンケート回答者にポイント付与
+ * 5    | 52          | 記事登録者    | 3       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+ * 5    | 53          | 記事         | 3       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 6    | 61          | 参照者       | 5        | イベント参加者にポイント付与
+ * 6    | 62          | 記事登録者    | 5       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+ * 6    | 63          | 記事         | 5       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 101  | 1011        | 登録者       | 20       | コメントを投稿すると、投稿者にポイント追加
+ * 101  | 1012        | 記事         | 20       | 記事にコメントが付くと、その記事に対しポイント追加
+ * 102  | 1021        | 参照者       | 2       | イイネを押すと、押した人にポイント追加
+ * 102  | 1022        | 登録者       | 10       | コメントにイイネが付くと、そのコメントを登録したユーザにポイントが付く
+ * 102  | 1023        | 記事         | 10       | コメントにイイネがつくと、そのコメントの記事に対しポイント追加
+ * -6   | -61         | 参照者       | 5        | イベント参加者にポイント付与（取り消しなのでマイナス）
+ * -6   | -62         | 記事登録者    | 5       | 記事の登録者にポイント追加（取り消しなのでマイナス）
+ * -6   | -63         | 記事         | 5       | 記事のポイントが追加（取り消しなのでマイナス）
+ * 
+ * ユーザのポイントは、USER_CONFIGSテーブルへ格納する
+ * ポイントはランダムで少し増減した方が面白い？？
+ * 
+ * @author koda
+ */
+public enum Activity {
+    NONE,
+    KNOWLEDGE_INSERT, // 記事登録
+    KNOWLEDGE_SHOW, // 記事参照
+    KNOWLEDGE_LIKE, // イイネを押した
+    KNOWLEDGE_STOCK, // ストックした
+    KNOWLEDGE_SURVEY, // アンケートに回答した
+    KNOWLEDGE_EVENT_ADD, // イベントに参加した
+    KNOWLEDGE_EVENT_DELETE, // イベント参加キャンセル
+    KNOWLEDGE_COMMENT_ADD, // コメント追加
+    KNOWLEDGE_COMMENT_LIKE; // コメントにイイネを押した
+    
+    public int getValue() {
+        if (this == KNOWLEDGE_INSERT) {
+            return 1;
+        } else if (this ==KNOWLEDGE_SHOW) {
+            return 2;
+        } else if (this ==KNOWLEDGE_LIKE) {
+            return 3;
+        } else if (this ==KNOWLEDGE_STOCK) {
+            return 4;
+        } else if (this ==KNOWLEDGE_SURVEY) {
+            return 5;
+        } else if (this ==KNOWLEDGE_EVENT_ADD) {
+            return 6;
+        } else if (this ==KNOWLEDGE_EVENT_DELETE) {
+            return -6;
+        } else if (this ==KNOWLEDGE_COMMENT_ADD) {
+            return 101;
+        } else if (this ==KNOWLEDGE_COMMENT_LIKE) {
+            return 102;
+        }
+        return Integer.MIN_VALUE;
+    }
+
+    public static Activity getType(int type) {
+        if (type == 1) {
+            return KNOWLEDGE_INSERT;
+        } else if (type == 2) {
+            return KNOWLEDGE_SHOW;
+        } else if (type == 3) {
+            return KNOWLEDGE_LIKE;
+        } else if (type == 4) {
+            return KNOWLEDGE_STOCK;
+        } else if (type == 5) {
+            return KNOWLEDGE_SURVEY;
+        } else if (type == 6) {
+            return KNOWLEDGE_EVENT_ADD;
+        } else if (type == -6) {
+            return KNOWLEDGE_EVENT_DELETE;
+        } else if (type == 101) {
+            return KNOWLEDGE_COMMENT_ADD;
+        } else if (type == 102) {
+            return KNOWLEDGE_COMMENT_LIKE;
+        }
+        return NONE;
+    }
+    
+}
+
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
new file mode 100644
index 000000000..c6f792147
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -0,0 +1,79 @@
+package org.support.project.knowledge.logic.activity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.support.project.aop.Aspect;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.entity.CommentsEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.web.bean.LoginedUser;
+
+@DI(instance = Instance.Singleton)
+public class ActivityLogic {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(ActivityLogic.class);
+
+    public static ActivityLogic get() {
+        return Container.getComp(ActivityLogic.class);
+    }
+    
+    private List<ActivityProcessor> getActivityProcessors(Activity activity) {
+        List<ActivityProcessor> array = new ArrayList<>();
+        if (activity == Activity.KNOWLEDGE_INSERT) {
+            array.add(KnowledgeInsertActivity.get());
+        }
+        
+        
+        return array;
+    }
+    private void execute(Activity activity, LoginedUser user, KnowledgesEntity knowledge, CommentsEntity comment) {
+        List<ActivityProcessor> processors = this.getActivityProcessors(activity);
+        for (ActivityProcessor activityProcessor : processors) {
+            if (activityProcessor instanceof AbstractActivityProcessor) {
+                AbstractActivityProcessor processor = (AbstractActivityProcessor) activityProcessor;
+                processor.setUser(user);
+            }
+            if (activityProcessor instanceof AbstractAddPointForKnowledgeProcessor) {
+                if (knowledge == null) {
+                    LOG.warn("bad parameter [knowledge]");
+                    continue;
+                }
+                AbstractAddPointForKnowledgeProcessor processor = (AbstractAddPointForKnowledgeProcessor) activityProcessor;
+                processor.setKnowledge(knowledge);
+            } else if (activityProcessor instanceof AbstractAddPointForCommentProcessor) {
+                if (knowledge == null) {
+                    LOG.warn("bad parameter [comment]");
+                    continue;
+                }
+                AbstractAddPointForCommentProcessor processor = (AbstractAddPointForCommentProcessor) activityProcessor;
+                processor.setComment(comment);
+            }
+            try {
+                activityProcessor.execute();
+            } catch (Exception e) {
+                // Activity処理は失敗しても、いったん無視する
+                LOG.error("error", e);
+            }
+        }
+    }
+    
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void processActivity(Activity activity, LoginedUser user) {
+        execute(activity, user, null, null);
+    }
+    
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void processActivity(Activity activity, LoginedUser user, KnowledgesEntity knowledge) {
+        execute(activity, user, knowledge, null);
+    }
+    
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void processActivity(Activity activity, LoginedUser user, CommentsEntity comment) {
+        execute(activity, user, null, comment);
+    }
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
new file mode 100644
index 000000000..8641ba757
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
@@ -0,0 +1,36 @@
+package org.support.project.knowledge.logic.activity;
+
+public interface ActivityProcessor {
+    /*
+     * 種類  | 獲得のタイプ  | ポイント付与先 | ポイント    | 獲得タイプの意味
+     * 1    | 11          | 記事登録者    | 50       | 記事を投稿したら投稿者にポイント追加
+     * 1    | 12          | 記事         | 50       | 登録された記事のポイント初期値
+     * 2    | 21          | 参照者       | 1        | 記事を参照するアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
+     * 2    | 22          | 記事登録者    | 1        | 自分が登録された記事が参照されたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+     * 2    | 23          | 記事         | 1        | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+     * 3    | 31          | 参照者       | 2        | 記事にイイネのアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
+     * 3    | 32          | 記事登録者    | 10       | 自分が登録された記事にイイネがついたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+     * 3    | 33          | 記事         | 10       | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+     * 4    | 41          | 参照者       | 0        | ストックした場合、ストックした人にポイントは付与しない
+     * 4    | 42          | 記事登録者    | 2       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+     * 4    | 43          | 記事         | 2       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+     * 5    | 51          | 参照者       | 3        | アンケート回答者にポイント付与
+     * 5    | 52          | 記事登録者    | 3       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+     * 5    | 53          | 記事         | 3       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+     * 6    | 61          | 参照者       | 5        | イベント参加者にポイント付与
+     * 6    | 62          | 記事登録者    | 5       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+     * 6    | 63          | 記事         | 5       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+     * 101  | 1011        | 登録者       | 20       | コメントを投稿すると、投稿者にポイント追加
+     * 101  | 1012        | 記事         | 20       | 記事にコメントが付くと、その記事に対しポイント追加
+     * 102  | 1021        | 参照者       | 2       | イイネを押すと、押した人にポイント追加
+     * 102  | 1022        | 登録者       | 10       | コメントにイイネが付くと、そのコメントを登録したユーザにポイントが付く
+     * 102  | 1023        | 記事         | 10       | コメントにイイネがつくと、そのコメントの記事に対しポイント追加
+     * -6   | -61         | 参照者       | 5        | イベント参加者にポイント付与（取り消しなのでマイナス）
+     * -6   | -62         | 記事登録者    | 5       | 記事の登録者にポイント追加（取り消しなのでマイナス）
+     * -6   | -63         | 記事         | 5       | 記事のポイントが追加（取り消しなのでマイナス）     * 
+     */
+    public static final int TYPE_KNOWLEDGE_DO_INSERT = 11;
+    public static final int TYPE_KNOWLEDGE_INSERTED = 12;
+    
+    void execute() throws Exception;
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
new file mode 100644
index 000000000..3afde96ab
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
@@ -0,0 +1,63 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.entity.ActivitiesEntity;
+
+/**
+ * ナレッジ登録時のポイント付与
+ * 
+ * 種類  | 獲得のタイプ  | ポイント付与先 | ポイント    | 獲得タイプの意味
+ * 1    | 11          | 記事登録者    | 50       | 記事を投稿したら投稿者にポイント追加
+ * 1    | 12          | 記事         | 50       | 登録された記事のポイント初期値
+ * @author koda
+ */
+@DI(instance = Instance.Prototype)
+public class KnowledgeInsertActivity extends AbstractAddPointForKnowledgeProcessor {
+    private static final Log LOG = LogFactory.getLog(KnowledgeInsertActivity.class);
+    public static KnowledgeInsertActivity get() {
+        return Container.getComp(KnowledgeInsertActivity.class);
+    }
+    
+    @Override
+    public void execute() throws Exception {
+        if (getKnowledge() == null || getUser() == null) {
+            // ありえないけど念のため確認
+            return;
+        }
+        if (isExistsActivity(getUser().getUserId(), Activity.KNOWLEDGE_INSERT, String.valueOf(getKnowledge().getKnowledgeId()))) {
+            // 既に指定のKnowledge登録済
+            return;
+        }
+        //int point = RandomUtil.randamNum(30, 50);
+       int point = 50;
+       
+       LOG.debug("Add point by knowledge insert:" + point);
+       
+        // ポイント発行アクティビティを生成
+       ActivitiesEntity activity = addActivity(
+               getUser().getUserId(),
+               Activity.KNOWLEDGE_INSERT,
+               String.valueOf(getKnowledge().getKnowledgeId()),
+               getKnowledge().getInsertDatetime());
+        // 登録者のポイントをアップ
+        addPointForUser(
+                getUser().getUserId(),
+                getKnowledge().getInsertDatetime(),
+                getUser().getUserId(),
+                activity.getActivityNo(),
+                TYPE_KNOWLEDGE_DO_INSERT,
+                point);
+        // 記事のポイントアップ
+        addPointForKnowledge(
+                getUser().getUserId(),
+                getKnowledge().getInsertDatetime(),
+                getKnowledge().getKnowledgeId(),
+                activity.getActivityNo(),
+                TYPE_KNOWLEDGE_INSERTED,
+                point);
+    }
+}
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_delete.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_delete.sql
index deec12bff..be3ba4fc8 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_delete.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_delete.sql
@@ -1,4 +1,4 @@
 DELETE FROM ACTIVITIES
 WHERE 
-NO = ?
+ACTIVITY_NO = ?
 ;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_insert.sql
index abd8c0132..995d8561a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_insert.sql
@@ -1,10 +1,9 @@
 INSERT INTO ACTIVITIES
 ( 
-NO
+ACTIVITY_NO
  , USER_ID
- , TYPE
+ , KIND
  , TARGET
- , POINT
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -20,5 +19,4 @@ DEFAULT
  , ?
  , ?
  , ?
- , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql
index d45f96d47..b0b963e3a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql
@@ -1,4 +1,4 @@
 SELECT * FROM ACTIVITIES
  WHERE 
-NO = ?
+ACTIVITY_NO = ?
 ;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_raw_insert.sql
index b4011813e..3169468de 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_raw_insert.sql
@@ -1,10 +1,9 @@
 INSERT INTO ACTIVITIES
 ( 
-NO
+ACTIVITY_NO
  , USER_ID
- , TYPE
+ , KIND
  , TARGET
- , POINT
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -20,5 +19,4 @@ NO
  , ?
  , ?
  , ?
- , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql
index a3507a4ca..7fd4c7d0b 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql
@@ -1,4 +1,4 @@
 SELECT * FROM ACTIVITIES
  WHERE 
-NO = ?
+ACTIVITY_NO = ?
  AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_update.sql
index 0c776a106..b490022e7 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_update.sql
@@ -1,14 +1,13 @@
 UPDATE ACTIVITIES
 SET 
    USER_ID = ?
- , TYPE = ?
+ , KIND = ?
  , TARGET = ?
- , POINT = ?
  , INSERT_USER = ?
  , INSERT_DATETIME = ?
  , UPDATE_USER = ?
  , UPDATE_DATETIME = ?
  , DELETE_FLAG = ?
 WHERE 
-NO = ?
+ACTIVITY_NO = ?
 ;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_insert.sql
index 678b16284..6e6e992e8 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_insert.sql
@@ -4,7 +4,8 @@ NO
  , NAME
  , DISPLAY_TEXT
  , DESCRIPTION
- , IMAGE_CATEGORY
+ , IMAGE
+ , POINT
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -21,4 +22,5 @@ DEFAULT
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_raw_insert.sql
index 7185b80af..6135deb4d 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_raw_insert.sql
@@ -4,7 +4,8 @@ NO
  , NAME
  , DISPLAY_TEXT
  , DESCRIPTION
- , IMAGE_CATEGORY
+ , IMAGE
+ , POINT
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -21,4 +22,5 @@ NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_update.sql
index 4a7eec486..2cbd6ba3b 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_update.sql
@@ -3,7 +3,8 @@ SET
    NAME = ?
  , DISPLAY_TEXT = ?
  , DESCRIPTION = ?
- , IMAGE_CATEGORY = ?
+ , IMAGE = ?
+ , POINT = ?
  , INSERT_USER = ?
  , INSERT_DATETIME = ?
  , UPDATE_USER = ?
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_delete.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_delete.sql
new file mode 100644
index 000000000..c5e58e3eb
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_delete.sql
@@ -0,0 +1,5 @@
+DELETE FROM POINT_KNOWLEDGE_HISTORIES
+WHERE 
+HISTORY_NO = ?
+ AND KNOWLEDGE_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql
new file mode 100644
index 000000000..4ada9a3f2
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql
@@ -0,0 +1,24 @@
+INSERT INTO POINT_KNOWLEDGE_HISTORIES
+( 
+HISTORY_NO
+ , KNOWLEDGE_ID
+ , ACTIVITY_NO
+ , TYPE
+ , POINT
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql
new file mode 100644
index 000000000..53862db97
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql
@@ -0,0 +1,2 @@
+SELECT * FROM POINT_KNOWLEDGE_HISTORIES
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql
new file mode 100644
index 000000000..b22d177d2
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql
@@ -0,0 +1,3 @@
+SELECT * FROM POINT_KNOWLEDGE_HISTORIES
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_history_no.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_history_no.sql
new file mode 100644
index 000000000..9c1667b97
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_history_no.sql
@@ -0,0 +1,4 @@
+SELECT * FROM POINT_KNOWLEDGE_HISTORIES
+ WHERE 
+HISTORY_NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_key.sql
new file mode 100644
index 000000000..c2d200af3
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_key.sql
@@ -0,0 +1,5 @@
+SELECT * FROM POINT_KNOWLEDGE_HISTORIES
+ WHERE 
+HISTORY_NO = ?
+ AND KNOWLEDGE_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_knowledge_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_knowledge_id.sql
new file mode 100644
index 000000000..5216a7c27
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_knowledge_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM POINT_KNOWLEDGE_HISTORIES
+ WHERE 
+KNOWLEDGE_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql
new file mode 100644
index 000000000..4ada9a3f2
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql
@@ -0,0 +1,24 @@
+INSERT INTO POINT_KNOWLEDGE_HISTORIES
+( 
+HISTORY_NO
+ , KNOWLEDGE_ID
+ , ACTIVITY_NO
+ , TYPE
+ , POINT
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql
new file mode 100644
index 000000000..364e92359
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql
@@ -0,0 +1,3 @@
+SELECT * FROM POINT_KNOWLEDGE_HISTORIES
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql
new file mode 100644
index 000000000..25db49873
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql
@@ -0,0 +1,4 @@
+SELECT * FROM POINT_KNOWLEDGE_HISTORIES
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_count_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_count_all.sql
new file mode 100644
index 000000000..c953d8f53
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_count_all.sql
@@ -0,0 +1,2 @@
+SELECT COUNT(*) FROM POINT_KNOWLEDGE_HISTORIES
+WHERE DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_history_no.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_history_no.sql
new file mode 100644
index 000000000..a64adb685
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_history_no.sql
@@ -0,0 +1,4 @@
+SELECT * FROM POINT_KNOWLEDGE_HISTORIES
+ WHERE 
+HISTORY_NO = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_key.sql
new file mode 100644
index 000000000..bbbf73e0d
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_key.sql
@@ -0,0 +1,5 @@
+SELECT * FROM POINT_KNOWLEDGE_HISTORIES
+ WHERE 
+HISTORY_NO = ?
+ AND KNOWLEDGE_ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_knowledge_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_knowledge_id.sql
new file mode 100644
index 000000000..91b7cd596
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_knowledge_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM POINT_KNOWLEDGE_HISTORIES
+ WHERE 
+KNOWLEDGE_ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql
new file mode 100644
index 000000000..dfe5bc637
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql
@@ -0,0 +1,14 @@
+UPDATE POINT_KNOWLEDGE_HISTORIES
+SET 
+   ACTIVITY_NO = ?
+ , TYPE = ?
+ , POINT = ?
+ , INSERT_USER = ?
+ , INSERT_DATETIME = ?
+ , UPDATE_USER = ?
+ , UPDATE_DATETIME = ?
+ , DELETE_FLAG = ?
+WHERE 
+HISTORY_NO = ?
+ AND KNOWLEDGE_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_delete.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_delete.sql
new file mode 100644
index 000000000..354e1b214
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_delete.sql
@@ -0,0 +1,5 @@
+DELETE FROM POINT_USER_HISTORIES
+WHERE 
+HISTORY_NO = ?
+ AND USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql
new file mode 100644
index 000000000..fba9e04af
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql
@@ -0,0 +1,24 @@
+INSERT INTO POINT_USER_HISTORIES
+( 
+HISTORY_NO
+ , USER_ID
+ , ACTIVITY_NO
+ , TYPE
+ , POINT
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql
new file mode 100644
index 000000000..61a114237
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql
@@ -0,0 +1,2 @@
+SELECT * FROM POINT_USER_HISTORIES
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql
new file mode 100644
index 000000000..82a1295a5
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql
@@ -0,0 +1,3 @@
+SELECT * FROM POINT_USER_HISTORIES
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_history_no.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_history_no.sql
new file mode 100644
index 000000000..8e70af128
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_history_no.sql
@@ -0,0 +1,4 @@
+SELECT * FROM POINT_USER_HISTORIES
+ WHERE 
+HISTORY_NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_key.sql
new file mode 100644
index 000000000..9431c3d68
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_key.sql
@@ -0,0 +1,5 @@
+SELECT * FROM POINT_USER_HISTORIES
+ WHERE 
+HISTORY_NO = ?
+ AND USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_user_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_user_id.sql
new file mode 100644
index 000000000..b2675a637
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_user_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM POINT_USER_HISTORIES
+ WHERE 
+USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql
new file mode 100644
index 000000000..fba9e04af
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql
@@ -0,0 +1,24 @@
+INSERT INTO POINT_USER_HISTORIES
+( 
+HISTORY_NO
+ , USER_ID
+ , ACTIVITY_NO
+ , TYPE
+ , POINT
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql
new file mode 100644
index 000000000..cd439a370
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql
@@ -0,0 +1,3 @@
+SELECT * FROM POINT_USER_HISTORIES
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql
new file mode 100644
index 000000000..b45c1578c
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql
@@ -0,0 +1,4 @@
+SELECT * FROM POINT_USER_HISTORIES
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME DESC
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_count_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_count_all.sql
new file mode 100644
index 000000000..95d55869a
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_count_all.sql
@@ -0,0 +1,2 @@
+SELECT COUNT(*) FROM POINT_USER_HISTORIES
+WHERE DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_history_no.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_history_no.sql
new file mode 100644
index 000000000..9d9590055
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_history_no.sql
@@ -0,0 +1,4 @@
+SELECT * FROM POINT_USER_HISTORIES
+ WHERE 
+HISTORY_NO = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_key.sql
new file mode 100644
index 000000000..1eb98437f
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_key.sql
@@ -0,0 +1,5 @@
+SELECT * FROM POINT_USER_HISTORIES
+ WHERE 
+HISTORY_NO = ?
+ AND USER_ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_user_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_user_id.sql
new file mode 100644
index 000000000..5f8c92072
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_user_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM POINT_USER_HISTORIES
+ WHERE 
+USER_ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql
new file mode 100644
index 000000000..e67e9d91a
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql
@@ -0,0 +1,14 @@
+UPDATE POINT_USER_HISTORIES
+SET 
+   ACTIVITY_NO = ?
+ , TYPE = ?
+ , POINT = ?
+ , INSERT_USER = ?
+ , INSERT_DATETIME = ?
+ , UPDATE_USER = ?
+ , UPDATE_DATETIME = ?
+ , DELETE_FLAG = ?
+WHERE 
+HISTORY_NO = ?
+ AND USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/database/ddl.sql b/src/main/resources/org/support/project/knowledge/database/ddl.sql
index 3c240ff4f..1fe60dc25 100644
--- a/src/main/resources/org/support/project/knowledge/database/ddl.sql
+++ b/src/main/resources/org/support/project/knowledge/database/ddl.sql
@@ -1,3 +1,37 @@
+-- ユーザのポイント獲得履歴
+drop table if exists POINT_USER_HISTORIES cascade;
+
+create table POINT_USER_HISTORIES (
+  USER_ID INTEGER not null
+  , HISTORY_NO BIGINT not null
+  , ACTIVITY_NO BIGINT not null
+  , TYPE integer not null
+  , POINT integer
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint POINT_USER_HISTORIES_PKC primary key (USER_ID,HISTORY_NO)
+) ;
+
+-- ナレッジのポイント獲得履歴
+drop table if exists POINT_KNOWLEDGE_HISTORIES cascade;
+
+create table POINT_KNOWLEDGE_HISTORIES (
+  KNOWLEDGE_ID BIGINT not null
+  , HISTORY_NO BIGINT not null
+  , ACTIVITY_NO BIGINT not null
+  , TYPE integer not null
+  , POINT integer not null
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint POINT_KNOWLEDGE_HISTORIES_PKC primary key (KNOWLEDGE_ID,HISTORY_NO)
+) ;
+
 -- ユーザの称号
 drop table if exists USER_BADGES cascade;
 
@@ -16,24 +50,23 @@ create table USER_BADGES (
 drop table if exists ACTIVITIES cascade;
 
 create table ACTIVITIES (
-  NO BIGSERIAL not null
+  ACTIVITY_NO BIGSERIAL not null
   , USER_ID INTEGER not null
-  , TYPE integer not null
-  , TARGET BIGINT not null
-  , POINT integer not null
+  , KIND integer not null
+  , TARGET character varying(64) not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
   , UPDATE_DATETIME timestamp
   , DELETE_FLAG integer
-  , constraint ACTIVITIES_PKC primary key (NO)
+  , constraint ACTIVITIES_PKC primary key (ACTIVITY_NO)
 ) ;
 
 create index IDX_ACTIVITIES_USER_ID
   on ACTIVITIES(USER_ID);
 
-create index IDX_ACTIVITIES_TYPE_TARGET
-  on ACTIVITIES(TYPE,TARGET);
+create index IDX_ACTIVITIES_KIND_TARGET
+  on ACTIVITIES(KIND,TARGET);
 
 -- 称号
 drop table if exists BADGES cascade;
@@ -43,7 +76,8 @@ create table BADGES (
   , NAME character varying(128) not null
   , DISPLAY_TEXT character varying(32) not null
   , DESCRIPTION text
-  , IMAGE_CATEGORY integer
+  , IMAGE character varying(64)
+  , POINT integer
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
@@ -814,6 +848,30 @@ create table KNOWLEDGES (
   , constraint KNOWLEDGES_PKC primary key (KNOWLEDGE_ID)
 ) ;
 
+comment on table POINT_USER_HISTORIES is 'ユーザのポイント獲得履歴';
+comment on column POINT_USER_HISTORIES.USER_ID is 'ユーザID';
+comment on column POINT_USER_HISTORIES.HISTORY_NO is '履歴番号';
+comment on column POINT_USER_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
+comment on column POINT_USER_HISTORIES.TYPE is '獲得のタイプ';
+comment on column POINT_USER_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_USER_HISTORIES.INSERT_USER is '登録ユーザ';
+comment on column POINT_USER_HISTORIES.INSERT_DATETIME is '登録日時';
+comment on column POINT_USER_HISTORIES.UPDATE_USER is '更新ユーザ';
+comment on column POINT_USER_HISTORIES.UPDATE_DATETIME is '更新日時';
+comment on column POINT_USER_HISTORIES.DELETE_FLAG is '削除フラグ';
+
+comment on table POINT_KNOWLEDGE_HISTORIES is 'ナレッジのポイント獲得履歴';
+comment on column POINT_KNOWLEDGE_HISTORIES.KNOWLEDGE_ID is 'ナレッジID';
+comment on column POINT_KNOWLEDGE_HISTORIES.HISTORY_NO is '履歴番号';
+comment on column POINT_KNOWLEDGE_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
+comment on column POINT_KNOWLEDGE_HISTORIES.TYPE is '獲得のタイプ';
+comment on column POINT_KNOWLEDGE_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_USER is '登録ユーザ';
+comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_DATETIME is '登録日時';
+comment on column POINT_KNOWLEDGE_HISTORIES.UPDATE_USER is '更新ユーザ';
+comment on column POINT_KNOWLEDGE_HISTORIES.UPDATE_DATETIME is '更新日時';
+comment on column POINT_KNOWLEDGE_HISTORIES.DELETE_FLAG is '削除フラグ';
+
 comment on table USER_BADGES is 'ユーザの称号';
 comment on column USER_BADGES.USER_ID is 'ユーザID';
 comment on column USER_BADGES.NO is '番号';
@@ -824,11 +882,10 @@ comment on column USER_BADGES.UPDATE_DATETIME is '更新日時';
 comment on column USER_BADGES.DELETE_FLAG is '削除フラグ';
 
 comment on table ACTIVITIES is 'アクティビティ';
-comment on column ACTIVITIES.NO is '番号';
-comment on column ACTIVITIES.USER_ID is 'ユーザID';
-comment on column ACTIVITIES.TYPE is '種類';
+comment on column ACTIVITIES.ACTIVITY_NO is 'アクティビティ番号';
+comment on column ACTIVITIES.USER_ID is 'イベントをおこしたユーザ';
+comment on column ACTIVITIES.KIND is 'アクティビティの種類';
 comment on column ACTIVITIES.TARGET is 'ターゲットID';
-comment on column ACTIVITIES.POINT is '獲得ポイント';
 comment on column ACTIVITIES.INSERT_USER is '登録ユーザ';
 comment on column ACTIVITIES.INSERT_DATETIME is '登録日時';
 comment on column ACTIVITIES.UPDATE_USER is '更新ユーザ';
@@ -840,7 +897,8 @@ comment on column BADGES.NO is '番号';
 comment on column BADGES.NAME is '名称';
 comment on column BADGES.DISPLAY_TEXT is '表示名';
 comment on column BADGES.DESCRIPTION is '説明';
-comment on column BADGES.IMAGE_CATEGORY is '画像の種類';
+comment on column BADGES.IMAGE is '画像';
+comment on column BADGES.POINT is '獲得ポイント';
 comment on column BADGES.INSERT_USER is '登録ユーザ';
 comment on column BADGES.INSERT_DATETIME is '登録日時';
 comment on column BADGES.UPDATE_USER is '更新ユーザ';
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
index e6ebeb79d..85d8ed223 100644
--- a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
@@ -1,3 +1,37 @@
+-- ユーザのポイント獲得履歴
+drop table if exists POINT_USER_HISTORIES cascade;
+
+create table POINT_USER_HISTORIES (
+  USER_ID INTEGER not null
+  , HISTORY_NO BIGINT not null
+  , ACTIVITY_NO BIGINT not null
+  , TYPE integer not null
+  , POINT integer
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint POINT_USER_HISTORIES_PKC primary key (USER_ID,HISTORY_NO)
+) ;
+
+-- ナレッジのポイント獲得履歴
+drop table if exists POINT_KNOWLEDGE_HISTORIES cascade;
+
+create table POINT_KNOWLEDGE_HISTORIES (
+  KNOWLEDGE_ID BIGINT not null
+  , HISTORY_NO BIGINT not null
+  , ACTIVITY_NO BIGINT not null
+  , TYPE integer not null
+  , POINT integer not null
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint POINT_KNOWLEDGE_HISTORIES_PKC primary key (KNOWLEDGE_ID,HISTORY_NO)
+) ;
+
 -- ユーザの称号
 drop table if exists USER_BADGES cascade;
 
@@ -16,24 +50,23 @@ create table USER_BADGES (
 drop table if exists ACTIVITIES cascade;
 
 create table ACTIVITIES (
-  NO BIGSERIAL not null
+  ACTIVITY_NO BIGSERIAL not null
   , USER_ID INTEGER not null
-  , TYPE integer not null
-  , TARGET BIGINT not null
-  , POINT integer not null
+  , KIND integer not null
+  , TARGET character varying(64) not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
   , UPDATE_DATETIME timestamp
   , DELETE_FLAG integer
-  , constraint ACTIVITIES_PKC primary key (NO)
+  , constraint ACTIVITIES_PKC primary key (ACTIVITY_NO)
 ) ;
 
 create index IDX_ACTIVITIES_USER_ID
   on ACTIVITIES(USER_ID);
 
-create index IDX_ACTIVITIES_TYPE_TARGET
-  on ACTIVITIES(TYPE,TARGET);
+create index IDX_ACTIVITIES_KIND_TARGET
+  on ACTIVITIES(KIND,TARGET);
 
 -- 称号
 drop table if exists BADGES cascade;
@@ -43,7 +76,8 @@ create table BADGES (
   , NAME character varying(128) not null
   , DISPLAY_TEXT character varying(32) not null
   , DESCRIPTION text
-  , IMAGE_CATEGORY integer
+  , IMAGE character varying(64)
+  , POINT integer
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
@@ -52,6 +86,31 @@ create table BADGES (
   , constraint BADGES_PKC primary key (NO)
 ) ;
 
+
+comment on table POINT_USER_HISTORIES is 'ユーザのポイント獲得履歴';
+comment on column POINT_USER_HISTORIES.USER_ID is 'ユーザID';
+comment on column POINT_USER_HISTORIES.HISTORY_NO is '履歴番号';
+comment on column POINT_USER_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
+comment on column POINT_USER_HISTORIES.TYPE is '獲得のタイプ';
+comment on column POINT_USER_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_USER_HISTORIES.INSERT_USER is '登録ユーザ';
+comment on column POINT_USER_HISTORIES.INSERT_DATETIME is '登録日時';
+comment on column POINT_USER_HISTORIES.UPDATE_USER is '更新ユーザ';
+comment on column POINT_USER_HISTORIES.UPDATE_DATETIME is '更新日時';
+comment on column POINT_USER_HISTORIES.DELETE_FLAG is '削除フラグ';
+
+comment on table POINT_KNOWLEDGE_HISTORIES is 'ナレッジのポイント獲得履歴';
+comment on column POINT_KNOWLEDGE_HISTORIES.KNOWLEDGE_ID is 'ナレッジID';
+comment on column POINT_KNOWLEDGE_HISTORIES.HISTORY_NO is '履歴番号';
+comment on column POINT_KNOWLEDGE_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
+comment on column POINT_KNOWLEDGE_HISTORIES.TYPE is '獲得のタイプ';
+comment on column POINT_KNOWLEDGE_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_USER is '登録ユーザ';
+comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_DATETIME is '登録日時';
+comment on column POINT_KNOWLEDGE_HISTORIES.UPDATE_USER is '更新ユーザ';
+comment on column POINT_KNOWLEDGE_HISTORIES.UPDATE_DATETIME is '更新日時';
+comment on column POINT_KNOWLEDGE_HISTORIES.DELETE_FLAG is '削除フラグ';
+
 comment on table USER_BADGES is 'ユーザの称号';
 comment on column USER_BADGES.USER_ID is 'ユーザID';
 comment on column USER_BADGES.NO is '番号';
@@ -62,11 +121,10 @@ comment on column USER_BADGES.UPDATE_DATETIME is '更新日時';
 comment on column USER_BADGES.DELETE_FLAG is '削除フラグ';
 
 comment on table ACTIVITIES is 'アクティビティ';
-comment on column ACTIVITIES.NO is '番号';
-comment on column ACTIVITIES.USER_ID is 'ユーザID';
-comment on column ACTIVITIES.TYPE is '種類';
+comment on column ACTIVITIES.ACTIVITY_NO is 'アクティビティ番号';
+comment on column ACTIVITIES.USER_ID is 'イベントをおこしたユーザ';
+comment on column ACTIVITIES.KIND is 'アクティビティの種類';
 comment on column ACTIVITIES.TARGET is 'ターゲットID';
-comment on column ACTIVITIES.POINT is '獲得ポイント';
 comment on column ACTIVITIES.INSERT_USER is '登録ユーザ';
 comment on column ACTIVITIES.INSERT_DATETIME is '登録日時';
 comment on column ACTIVITIES.UPDATE_USER is '更新ユーザ';
@@ -78,7 +136,8 @@ comment on column BADGES.NO is '番号';
 comment on column BADGES.NAME is '名称';
 comment on column BADGES.DISPLAY_TEXT is '表示名';
 comment on column BADGES.DESCRIPTION is '説明';
-comment on column BADGES.IMAGE_CATEGORY is '画像の種類';
+comment on column BADGES.IMAGE is '画像';
+comment on column BADGES.POINT is '獲得ポイント';
 comment on column BADGES.INSERT_USER is '登録ユーザ';
 comment on column BADGES.INSERT_DATETIME is '登録日時';
 comment on column BADGES.UPDATE_USER is '更新ユーザ';

From a54e58656eed9e0bd6cc26f6ecf83b2d13c56a5e Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 1 Sep 2017 06:45:58 +0900
Subject: [PATCH 040/138] #840 Add add point process at knowledge show

---
 .../knowledge/dao/ViewHistoriesDao.java       |   5 +
 .../deploy/v1_11_0/Migrate_1_11_2.java        | 107 +++++++++++++++---
 .../activity/AbstractActivityProcessor.java   |  14 +++
 ...AbstractAddPointForKnowledgeProcessor.java |  62 ++++++++++
 .../logic/activity/ActivityProcessor.java     |   3 +
 .../activity/KnowledgeInsertActivity.java     |  53 +++------
 .../logic/activity/KnowledgeShowActivity.java |  43 +++++++
 7 files changed, 233 insertions(+), 54 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java

diff --git a/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
index bd8144f58..6cf0c3258 100644
--- a/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
@@ -54,4 +54,9 @@ public List<Long> selectViewdKnowledgeIds(List<StockKnowledge> stocks, Integer u
         return executeQueryList(sql.toString(), Long.class, params.toArray(new Object[0]));
     }
 
+    public long selectCountOnKnowledgeId(Long knowledgeId) {
+        String sql = "SELECT COUNT(*) FROM VIEW_HISTORIES WHERE KNOWLEDGE_ID = ?";
+        return executeQuerySingle(sql, Long.class, knowledgeId);
+    }
+
 }
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 14cac53d4..6568485df 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -6,8 +6,10 @@
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.ViewHistoriesDao;
 import org.support.project.knowledge.deploy.Migrate;
 import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.ViewHistoriesEntity;
 import org.support.project.knowledge.logic.activity.Activity;
 import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.ormapping.tool.dao.InitializeDao;
@@ -31,39 +33,112 @@ public boolean doMigrate() throws Exception {
         };
         initializeDao.initializeDatabase(sqlpaths);
         
+        // 参照回数を集計
+        doSetViewCountToKnowledge();
+        
         // Knowledgeを登録したイベントによりポイントを集計
         doAddPointByKnowledge();
         
+        // Knowledgeを参照したイベントによりポイントを集計
+        doAddPointByKnowledgeShow();
         
-        // 参照回数を集計
         
         
         return true;
     }
     
     
+
+    private void doAddPointByKnowledgeShow() throws InterruptedException {
+        List<ViewHistoriesEntity> list;
+        int offset = 0;
+        int limit = 50;
+        do {
+            list = doAddPointByKnowledgeShow(offset, limit);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(200);
+            }
+        } while (list.size() > 0);
+    }
+
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void doAddPointByKnowledge() {
-        // ポイント修正
-        LOG.info("Aggregate point by knowledge insert");
+    private List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset, int limit) {
+        LOG.info("Aggregate point by knowledge show");
+        List<ViewHistoriesEntity> list;
+        list = ViewHistoriesDao.get().selectAllWidthPager(limit, offset);
+        for (ViewHistoriesEntity viewHistoriesEntity : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(viewHistoriesEntity.getKnowledgeId());
+            if (knowledge == null) {
+                LOG.info("    knowledge [" + viewHistoriesEntity.getKnowledgeId() + "] is not found. so skip add point by knowledge show.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(viewHistoriesEntity.getInsertUser());
+            if (account == null) {
+                LOG.info("    event user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge show.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, user, knowledge);
+        }
+        return list;
+    }
+
+    public void doAddPointByKnowledge() throws InterruptedException {
         List<KnowledgesEntity> knowledges;
         int offset = 0;
         int limit = 50;
         do {
-            knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset);
-            for (KnowledgesEntity knowledge : knowledges) {
-                LoginedUser user = new LoginedUser();
-                UsersEntity account = UsersDao.get().selectOnKey(knowledge.getInsertUser());
-                if (account == null) {
-                    LOG.info("insert user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge insert.");
-                    continue;
-                }
-                user.setLoginUser(account);
-                LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-                ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, user, knowledge);
-            }
+            knowledges = doAddPointByKnowledge(offset, limit);
             offset = offset + limit;
+            synchronized (this) {
+                wait(200);
+            }
         } while (knowledges.size() > 0);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private List<KnowledgesEntity> doAddPointByKnowledge(int offset, int limit) {
+        LOG.info("Aggregate point by knowledge insert");
+        List<KnowledgesEntity> knowledges;
+        knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset);
+        for (KnowledgesEntity knowledge : knowledges) {
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(knowledge.getInsertUser());
+            if (account == null) {
+                LOG.info("    insert user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge insert.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, user, knowledge);
+        }
+        return knowledges;
+    }
     
+    private void doSetViewCountToKnowledge() throws InterruptedException {
+        List<KnowledgesEntity> knowledges;
+        int offset = 0;
+        int limit = 50;
+        do {
+            knowledges = doSetViewCountToKnowledge(offset, limit);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(200);
+            }
+        } while (knowledges.size() > 0);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private List<KnowledgesEntity> doSetViewCountToKnowledge(int offset, int limit) {
+        LOG.info("Set view count to Knowledge");
+        List<KnowledgesEntity> knowledges;
+        knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset);
+        for (KnowledgesEntity knowledge : knowledges) {
+            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            long count = ViewHistoriesDao.get().selectCountOnKnowledgeId(knowledge.getKnowledgeId());
+            KnowledgesDao.get().updateViewCount(count, knowledge.getKnowledgeId());
+        }
+        return knowledges;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
index 2c98f441a..d457965b4 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
@@ -40,6 +40,20 @@ public LoginedUser getUser() {
     public void setUser(LoginedUser user) {
         this.user = user;
     }
+    
+    /**
+     * ポイントと種類を保持する内部クラス
+     * @author koda
+     */
+    protected class TypeAndPoint {
+        int type;
+        int point;
+        TypeAndPoint(int type, int point) {
+            this.type = type;
+            this.point = point;
+        }
+    }
+    
     /**
      * 対象のactivityが既に登録されているかチェック
      * @param userId アクティビティを実行したユーザ
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
index 5992aeed6..d65bd2c87 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.logic.activity;
 
+import org.support.project.knowledge.entity.ActivitiesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 
 public abstract class AbstractAddPointForKnowledgeProcessor extends AbstractActivityProcessor {
@@ -16,4 +17,65 @@ public KnowledgesEntity getKnowledge() {
     public void setKnowledge(KnowledgesEntity knowledge) {
         this.knowledge = knowledge;
     }
+    
+    protected abstract Activity getActivity();
+    protected abstract TypeAndPoint getTypeAndPointForActivityExecuter();
+    protected abstract TypeAndPoint getTypeAndPointForKnowledgeOwner();
+    protected abstract TypeAndPoint getTypeAndPointForKnowledge();
+    
+    @Override
+    public void execute() throws Exception {
+        if (getKnowledge() == null || getUser() == null) {
+            // ありえないけど念のため確認
+            return;
+        }
+        if (isExistsActivity(getUser().getUserId(), getActivity(), String.valueOf(getKnowledge().getKnowledgeId()))) {
+            // 既に指定のKnowledge登録済
+            return;
+        }
+         // ポイント発行アクティビティを生成
+        ActivitiesEntity activity = addActivity(
+                getUser().getUserId(),
+                getActivity(),
+                String.valueOf(getKnowledge().getKnowledgeId()),
+                getKnowledge().getInsertDatetime());
+        
+        
+        
+        // 実行したユーザのポイントアップ
+        TypeAndPoint exec = getTypeAndPointForActivityExecuter();
+        if (exec != null) {
+            addPointForUser(
+                    getUser().getUserId(),
+                    getKnowledge().getInsertDatetime(),
+                    getUser().getUserId(), // ターゲットは、実行したユーザ
+                    activity.getActivityNo(),
+                    exec.type,
+                    exec.point);
+        }
+         // 記事の登録者のポイントをアップ
+        TypeAndPoint owner = getTypeAndPointForKnowledgeOwner();
+        if (owner != null) {
+            addPointForUser(
+                    getUser().getUserId(),
+                    getKnowledge().getInsertDatetime(),
+                    getKnowledge().getInsertUser(), // ターゲットは登録者
+                    activity.getActivityNo(),
+                    exec.type,
+                    exec.point);
+        }
+         // 記事のポイントアップ
+        TypeAndPoint knowledge = getTypeAndPointForKnowledge();
+        if (knowledge != null) {
+            addPointForKnowledge(
+                    getUser().getUserId(),
+                    getKnowledge().getInsertDatetime(),
+                    getKnowledge().getKnowledgeId(),
+                    activity.getActivityNo(),
+                    exec.type,
+                    exec.point);
+        }
+    }
+
+
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
index 8641ba757..486d782ae 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
@@ -31,6 +31,9 @@ public interface ActivityProcessor {
      */
     public static final int TYPE_KNOWLEDGE_DO_INSERT = 11;
     public static final int TYPE_KNOWLEDGE_INSERTED = 12;
+    public static final int TYPE_KNOWLEDGE_DO_SHOW = 21;
+    public static final int TYPE_KNOWLEDGE_SHOWN_BY_OHER = 22;
+    public static final int TYPE_KNOWLEDGE_SHOWN = 23;
     
     void execute() throws Exception;
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
index 3afde96ab..fd43d6fe2 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
@@ -5,7 +5,6 @@
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-import org.support.project.knowledge.entity.ActivitiesEntity;
 
 /**
  * ナレッジ登録時のポイント付与
@@ -21,43 +20,21 @@ public class KnowledgeInsertActivity extends AbstractAddPointForKnowledgeProcess
     public static KnowledgeInsertActivity get() {
         return Container.getComp(KnowledgeInsertActivity.class);
     }
-    
     @Override
-    public void execute() throws Exception {
-        if (getKnowledge() == null || getUser() == null) {
-            // ありえないけど念のため確認
-            return;
-        }
-        if (isExistsActivity(getUser().getUserId(), Activity.KNOWLEDGE_INSERT, String.valueOf(getKnowledge().getKnowledgeId()))) {
-            // 既に指定のKnowledge登録済
-            return;
-        }
-        //int point = RandomUtil.randamNum(30, 50);
-       int point = 50;
-       
-       LOG.debug("Add point by knowledge insert:" + point);
-       
-        // ポイント発行アクティビティを生成
-       ActivitiesEntity activity = addActivity(
-               getUser().getUserId(),
-               Activity.KNOWLEDGE_INSERT,
-               String.valueOf(getKnowledge().getKnowledgeId()),
-               getKnowledge().getInsertDatetime());
-        // 登録者のポイントをアップ
-        addPointForUser(
-                getUser().getUserId(),
-                getKnowledge().getInsertDatetime(),
-                getUser().getUserId(),
-                activity.getActivityNo(),
-                TYPE_KNOWLEDGE_DO_INSERT,
-                point);
-        // 記事のポイントアップ
-        addPointForKnowledge(
-                getUser().getUserId(),
-                getKnowledge().getInsertDatetime(),
-                getKnowledge().getKnowledgeId(),
-                activity.getActivityNo(),
-                TYPE_KNOWLEDGE_INSERTED,
-                point);
+    protected Activity getActivity() {
+        LOG.info("Start add point process on insert knowledge.");
+        return Activity.KNOWLEDGE_INSERT;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_INSERT, 50);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        return null;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledge() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_INSERTED, 50);
     }
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
new file mode 100644
index 000000000..5e6f28328
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
@@ -0,0 +1,43 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+/**
+ * 
+ * 種類  | 獲得のタイプ  | ポイント付与先 | ポイント    | 獲得タイプの意味
+ * 2    | 21          | 参照者       | 1        | 記事を参照するアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
+ * 2    | 22          | 記事登録者    | 1        | 自分が登録された記事が参照されたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+ * 2    | 23          | 記事         | 1        | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 
+ * @author koda
+ */
+@DI(instance = Instance.Prototype)
+public class KnowledgeShowActivity extends AbstractAddPointForKnowledgeProcessor {
+    private static final Log LOG = LogFactory.getLog(KnowledgeShowActivity.class);
+    public static KnowledgeShowActivity get() {
+        return Container.getComp(KnowledgeShowActivity.class);
+    }
+    
+    @Override
+    protected Activity getActivity() {
+        LOG.info("Start add point process on show knowledge.");
+        return Activity.KNOWLEDGE_SHOW;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_SHOW, 1);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_SHOWN_BY_OHER, 1);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledge() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_SHOWN, 1);
+    }
+
+}

From a4523032f65fc982e6958d54136889617b299c84 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 1 Sep 2017 22:14:11 +0900
Subject: [PATCH 041/138] #840 Add add point process at knowledge like and
 stock

---
 .../control/open/KnowledgeControl.java        |  6 +-
 .../control/protect/EventControl.java         |  6 +-
 .../control/protect/KnowledgeControl.java     |  7 +-
 .../control/protect/SurveyControl.java        |  3 +-
 .../deploy/v1_11_0/Migrate_1_11_2.java        | 91 ++++++++++++++++++-
 .../activity/AbstractActivityProcessor.java   | 39 ++++----
 ...AbstractAddPointForKnowledgeProcessor.java | 18 +---
 .../logic/activity/ActivityLogic.java         | 24 +++--
 .../logic/activity/ActivityProcessor.java     |  6 ++
 .../activity/KnowledgeInsertActivity.java     |  2 +-
 .../logic/activity/KnowledgeLikeActivity.java | 39 ++++++++
 .../logic/activity/KnowledgeShowActivity.java |  2 +-
 .../activity/KnowledgeStockActivity.java      | 39 ++++++++
 13 files changed, 225 insertions(+), 57 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java

diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 2d34a4140..7d3da5b87 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -217,7 +217,7 @@ public Boundary view() throws InvalidParamException, ParseException {
         List<StocksEntity> stocks = StocksDao.get().selectStockOnKnowledge(entity, loginedUser);
         setAttribute("stocks", stocks);
         
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, getLoginedUser(), entity);
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, getLoginedUser(), new Date(), entity);
         
         return forward("view.jsp");
     }
@@ -663,7 +663,7 @@ public Boundary like() throws InvalidParamException {
         likeCount.setKnowledgeId(knowledgeId);
         likeCount.setCount(count);
         
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, getLoginedUser(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, getLoginedUser(), new Date(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         return send(likeCount);
     }
@@ -680,7 +680,7 @@ public Boundary likecomment() throws InvalidParamException {
         LikeCount likeCount = new LikeCount();
         likeCount.setCount(count);
         
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_COMMENT_LIKE, getLoginedUser(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_COMMENT_LIKE, getLoginedUser(), new Date(),
                 CommentsDao.get().selectOnKey(commentNo));
         return send(likeCount);
     }
diff --git a/src/main/java/org/support/project/knowledge/control/protect/EventControl.java b/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
index 97e8f2f7e..69206b8ec 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
@@ -1,5 +1,7 @@
 package org.support.project.knowledge.control.protect;
 
+import java.util.Date;
+
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.control.Control;
@@ -33,7 +35,7 @@ public Boundary participation() throws InvalidParamException {
             labelValue.setLabel(getResource("knowledge.view.msg.wait.cansel"));
         }
         
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_ADD, getLoginedUser(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_ADD, getLoginedUser(), new Date(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         
         return send(labelValue);
@@ -48,7 +50,7 @@ public Boundary nonparticipation() throws InvalidParamException {
         Long knowledgeId = getPathLong();
         EventsLogic.get().removeParticipation(knowledgeId, getLoginUserId());
         
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_DELETE, getLoginedUser(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_DELETE, getLoginedUser(), new Date(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         
         return send(getResource("knowledge.view.msg.participate.delete"));
diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index 0ea46236c..638ec6a9c 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -3,6 +3,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -213,7 +214,7 @@ private Boundary add(KnowledgesEntity entity) throws Exception, ParseException {
         LOG.trace("save");
 
         KnowledgesEntity insertedEntity = knowledgeLogic.insert(data, super.getLoginedUser());
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, getLoginedUser(), insertedEntity);
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, getLoginedUser(), new Date(), insertedEntity);
         
         return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK,
                 String.valueOf(insertedEntity.getKnowledgeId()), "message.success.insert");
@@ -489,7 +490,7 @@ public Boundary comment() throws Exception {
         }
 
         CommentsEntity commentsEntity = KnowledgeLogic.get().saveComment(knowledgeId, comment, fileNos, getLoginedUser());
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_COMMENT_ADD, getLoginedUser(), commentsEntity);
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_COMMENT_ADD, getLoginedUser(), new Date(), commentsEntity);
 
         return super.redirect(getRequest().getContextPath() + "/open.knowledge/view/" + knowledgeId + params);
     }
@@ -729,7 +730,7 @@ public Boundary stock() throws IOException, InvalidParamException {
                 dao.physicalDelete(entity);
             }
         }
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_STOCK, getLoginedUser(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_STOCK, getLoginedUser(), new Date(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         
         return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK, "saved", "message.success.save");
diff --git a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
index fedbd75e6..a1cea44fc 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.support.project.common.bean.ValidateError;
@@ -225,7 +226,7 @@ public Boundary answer() throws InstantiationException, IllegalAccessException,
             LOG.debug(PropertyUtil.reflectionToString(answer));
         }
         SurveyLogic.get().saveAnswer(answer, getLoginUserId());
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SURVEY, getLoginedUser(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SURVEY, getLoginedUser(), new Date(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         
         // メッセージ送信
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 6568485df..a777d6514 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -6,9 +6,13 @@
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.LikesDao;
+import org.support.project.knowledge.dao.StockKnowledgesDao;
 import org.support.project.knowledge.dao.ViewHistoriesDao;
 import org.support.project.knowledge.deploy.Migrate;
 import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikesEntity;
+import org.support.project.knowledge.entity.StockKnowledgesEntity;
 import org.support.project.knowledge.entity.ViewHistoriesEntity;
 import org.support.project.knowledge.logic.activity.Activity;
 import org.support.project.knowledge.logic.activity.ActivityLogic;
@@ -38,10 +42,14 @@ public boolean doMigrate() throws Exception {
         
         // Knowledgeを登録したイベントによりポイントを集計
         doAddPointByKnowledge();
-        
         // Knowledgeを参照したイベントによりポイントを集計
         doAddPointByKnowledgeShow();
-        
+        // Knowledgeにイイネを押したイベントによりポイント集計
+        doAddPointByKnowledgeShow();
+        // Knowledgeにイイネを押したイベントによりポイント集計
+        doAddPointByKnowledgeLike();
+        // Knowledgeをストックイベントによりポイント集計
+        doAddPointByKnowledgeStock();
         
         
         return true;
@@ -49,6 +57,80 @@ public boolean doMigrate() throws Exception {
     
     
 
+    private void doAddPointByKnowledgeStock() throws InterruptedException {
+        List<StockKnowledgesEntity> list;
+        int offset = 0;
+        int limit = 50;
+        do {
+            list = doAddPointByKnowledgeStock(offset, limit);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(200);
+            }
+        } while (list.size() > 0);
+    }
+
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset, int limit) {
+        LOG.info("Aggregate point by knowledge stock");
+        List<StockKnowledgesEntity> list;
+        list = StockKnowledgesDao.get().selectAllWidthPager(limit, offset);
+        for (StockKnowledgesEntity stock : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(stock.getKnowledgeId());
+            if (knowledge == null) {
+                LOG.info("    knowledge [" + stock.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(stock.getInsertUser());
+            if (account == null) {
+                LOG.info("    event user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, user, stock.getInsertDatetime(), knowledge);
+        }
+        return list;
+    }
+
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private void doAddPointByKnowledgeLike() throws InterruptedException {
+        List<LikesEntity> list;
+        int offset = 0;
+        int limit = 50;
+        do {
+            list = doAddPointByKnowledgeLike(offset, limit);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(200);
+            }
+        } while (list.size() > 0);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private List<LikesEntity> doAddPointByKnowledgeLike(int offset, int limit) {
+        LOG.info("Aggregate point by knowledge like");
+        List<LikesEntity> list;
+        list = LikesDao.get().selectAllWidthPager(limit, offset);
+        for (LikesEntity like : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(like.getKnowledgeId());
+            if (knowledge == null) {
+                LOG.info("    knowledge [" + like.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(like.getInsertUser());
+            if (account == null) {
+                LOG.info("    event user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, user, like.getInsertDatetime(), knowledge);
+        }
+        return list;
+    }
+    
     private void doAddPointByKnowledgeShow() throws InterruptedException {
         List<ViewHistoriesEntity> list;
         int offset = 0;
@@ -61,7 +143,6 @@ private void doAddPointByKnowledgeShow() throws InterruptedException {
             }
         } while (list.size() > 0);
     }
-
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     private List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset, int limit) {
         LOG.info("Aggregate point by knowledge show");
@@ -81,7 +162,7 @@ private List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset, int limi
             }
             user.setLoginUser(account);
             LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, user, knowledge);
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, user, viewHistoriesEntity.getInsertDatetime(), knowledge);
         }
         return list;
     }
@@ -112,7 +193,7 @@ private List<KnowledgesEntity> doAddPointByKnowledge(int offset, int limit) {
             }
             user.setLoginUser(account);
             LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, user, knowledge);
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, user, knowledge.getInsertDatetime(), knowledge);
         }
         return knowledges;
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
index d457965b4..4cc5bf77a 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
@@ -2,6 +2,7 @@
 
 
 import java.sql.Timestamp;
+import java.util.Date;
 
 import org.support.project.common.config.INT_FLAG;
 import org.support.project.common.util.StringUtils;
@@ -27,18 +28,19 @@ public abstract class AbstractActivityProcessor implements ActivityProcessor {
     private static Object lockUser = new Object();
     private static Object lockKnowledge = new Object();
     
-    private LoginedUser user;
+    protected LoginedUser eventUser;
+    protected Date eventDateTime;
     /**
-     * @return the user
+     * @param eventUser the eventUser to set
      */
-    public LoginedUser getUser() {
-        return user;
+    public void setEventUser(LoginedUser eventUser) {
+        this.eventUser = eventUser;
     }
     /**
-     * @param user the user to set
+     * @param eventDateTime the eventDateTime to set
      */
-    public void setUser(LoginedUser user) {
-        this.user = user;
+    public void setEventDateTime(Date eventDateTime) {
+        this.eventDateTime = eventDateTime;
     }
     
     /**
@@ -71,18 +73,16 @@ protected boolean isExistsActivity(int userId, Activity kind, String target) {
     
     /**
      * activity登録
-     * @param userId アクティビティを実行したユーザ
      * @param kind アクティビティの種類
      * @param target そのアクティビティでポイントを付与する対象
-     * @param eventTime そのアクティビティが実行されたタイミング
      */
-    protected ActivitiesEntity addActivity(int userId, Activity kind, String target, Timestamp eventTime) {
+    protected ActivitiesEntity addActivity(Activity kind, String target) {
         ActivitiesEntity entity = new ActivitiesEntity();
-        entity.setUserId(userId);
+        entity.setUserId(eventUser.getUserId());
         entity.setKind(kind.getValue());
         entity.setTarget(target);
-        entity.setInsertUser(userId);
-        entity.setInsertDatetime(eventTime);
+        entity.setInsertUser(eventUser.getUserId());
+        entity.setInsertDatetime(new Timestamp(eventDateTime.getTime()));
         entity.setDeleteFlag(INT_FLAG.OFF.getValue());
         entity = ActivitiesDao.get().physicalInsert(entity);
         return entity;
@@ -98,7 +98,7 @@ protected ActivitiesEntity addActivity(int userId, Activity kind, String target,
      * @param point
      * @return
      */
-    protected int addPointForUser(int eventUser, Timestamp eventTime, int targetUser, long activityNo, int type, int point) {
+    protected int addPointForUser(int targetUser, long activityNo, int type, int point) {
         synchronized(lockUser) {
             long num = PointUserHistoriesDao.get().selectNumOnUser(targetUser);
             num++;
@@ -108,8 +108,8 @@ protected int addPointForUser(int eventUser, Timestamp eventTime, int targetUser
             history.setActivityNo(activityNo);
             history.setType(type);
             history.setPoint(point);
-            history.setInsertUser(eventUser);
-            history.setInsertDatetime(eventTime);
+            history.setInsertUser(eventUser.getUserId());
+            history.setInsertDatetime(new Timestamp(eventDateTime.getTime()));
             history.setDeleteFlag(INT_FLAG.OFF.getValue());
             PointUserHistoriesDao.get().physicalInsert(history);
             
@@ -139,7 +139,7 @@ protected int addPointForUser(int eventUser, Timestamp eventTime, int targetUser
      * @param point
      * @return
      */
-    protected int addPointForKnowledge(int eventUser, Timestamp eventTime, long knowledgeId, long activityNo, int type, int point) {
+    protected int addPointForKnowledge(long knowledgeId, long activityNo, int type, int point) {
         synchronized (lockKnowledge) {
             long num = PointKnowledgeHistoriesDao.get().selectNumOnKnowledge(knowledgeId);
             num++;
@@ -149,8 +149,8 @@ protected int addPointForKnowledge(int eventUser, Timestamp eventTime, long know
             history.setActivityNo(activityNo);
             history.setType(type);
             history.setPoint(point);
-            history.setInsertUser(eventUser);
-            history.setInsertDatetime(eventTime);
+            history.setInsertUser(eventUser.getUserId());
+            history.setInsertDatetime(new Timestamp(eventDateTime.getTime()));
             history.setDeleteFlag(INT_FLAG.OFF.getValue());
             PointKnowledgeHistoriesDao.get().physicalInsert(history);
             
@@ -162,4 +162,5 @@ protected int addPointForKnowledge(int eventUser, Timestamp eventTime, long know
             return now;
         }
     }
+
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
index d65bd2c87..f9653ab02 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
@@ -25,30 +25,24 @@ public void setKnowledge(KnowledgesEntity knowledge) {
     
     @Override
     public void execute() throws Exception {
-        if (getKnowledge() == null || getUser() == null) {
+        if (getKnowledge() == null || eventUser == null) {
             // ありえないけど念のため確認
             return;
         }
-        if (isExistsActivity(getUser().getUserId(), getActivity(), String.valueOf(getKnowledge().getKnowledgeId()))) {
+        if (isExistsActivity(eventUser.getUserId(), getActivity(), String.valueOf(getKnowledge().getKnowledgeId()))) {
             // 既に指定のKnowledge登録済
             return;
         }
          // ポイント発行アクティビティを生成
         ActivitiesEntity activity = addActivity(
-                getUser().getUserId(),
                 getActivity(),
-                String.valueOf(getKnowledge().getKnowledgeId()),
-                getKnowledge().getInsertDatetime());
-        
-        
+                String.valueOf(getKnowledge().getKnowledgeId()));
         
         // 実行したユーザのポイントアップ
         TypeAndPoint exec = getTypeAndPointForActivityExecuter();
         if (exec != null) {
             addPointForUser(
-                    getUser().getUserId(),
-                    getKnowledge().getInsertDatetime(),
-                    getUser().getUserId(), // ターゲットは、実行したユーザ
+                    eventUser.getUserId(), // ターゲットは、実行したユーザ
                     activity.getActivityNo(),
                     exec.type,
                     exec.point);
@@ -57,8 +51,6 @@ public void execute() throws Exception {
         TypeAndPoint owner = getTypeAndPointForKnowledgeOwner();
         if (owner != null) {
             addPointForUser(
-                    getUser().getUserId(),
-                    getKnowledge().getInsertDatetime(),
                     getKnowledge().getInsertUser(), // ターゲットは登録者
                     activity.getActivityNo(),
                     exec.type,
@@ -68,8 +60,6 @@ public void execute() throws Exception {
         TypeAndPoint knowledge = getTypeAndPointForKnowledge();
         if (knowledge != null) {
             addPointForKnowledge(
-                    getUser().getUserId(),
-                    getKnowledge().getInsertDatetime(),
                     getKnowledge().getKnowledgeId(),
                     activity.getActivityNo(),
                     exec.type,
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index c6f792147..ed109694b 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -1,6 +1,7 @@
 package org.support.project.knowledge.logic.activity;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.support.project.aop.Aspect;
@@ -26,17 +27,24 @@ private List<ActivityProcessor> getActivityProcessors(Activity activity) {
         List<ActivityProcessor> array = new ArrayList<>();
         if (activity == Activity.KNOWLEDGE_INSERT) {
             array.add(KnowledgeInsertActivity.get());
+        } else if (activity == Activity.KNOWLEDGE_SHOW) {
+            array.add(KnowledgeShowActivity.get());
+        } else if (activity == Activity.KNOWLEDGE_LIKE) {
+            array.add(KnowledgeLikeActivity.get());
+        } else if (activity == Activity.KNOWLEDGE_STOCK) {
+            array.add(KnowledgeStockActivity.get());
         }
         
         
         return array;
     }
-    private void execute(Activity activity, LoginedUser user, KnowledgesEntity knowledge, CommentsEntity comment) {
+    private void execute(Activity activity, LoginedUser eventUser, Date eventDateTime, KnowledgesEntity knowledge, CommentsEntity comment) {
         List<ActivityProcessor> processors = this.getActivityProcessors(activity);
         for (ActivityProcessor activityProcessor : processors) {
             if (activityProcessor instanceof AbstractActivityProcessor) {
                 AbstractActivityProcessor processor = (AbstractActivityProcessor) activityProcessor;
-                processor.setUser(user);
+                processor.setEventUser(eventUser);
+                processor.setEventDateTime(eventDateTime);
             }
             if (activityProcessor instanceof AbstractAddPointForKnowledgeProcessor) {
                 if (knowledge == null) {
@@ -63,17 +71,17 @@ private void execute(Activity activity, LoginedUser user, KnowledgesEntity knowl
     }
     
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void processActivity(Activity activity, LoginedUser user) {
-        execute(activity, user, null, null);
+    public void processActivity(Activity activity, LoginedUser eventUser, Date eventDateTime) {
+        execute(activity, eventUser, eventDateTime, null, null);
     }
     
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void processActivity(Activity activity, LoginedUser user, KnowledgesEntity knowledge) {
-        execute(activity, user, knowledge, null);
+    public void processActivity(Activity activity, LoginedUser eventUser, Date eventDateTime, KnowledgesEntity knowledge) {
+        execute(activity, eventUser, eventDateTime, knowledge, null);
     }
     
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void processActivity(Activity activity, LoginedUser user, CommentsEntity comment) {
-        execute(activity, user, null, comment);
+    public void processActivity(Activity activity, LoginedUser eventUser, Date eventDateTime, CommentsEntity comment) {
+        execute(activity, eventUser, eventDateTime, null, comment);
     }
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
index 486d782ae..d2ef7b8f9 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
@@ -34,6 +34,12 @@ public interface ActivityProcessor {
     public static final int TYPE_KNOWLEDGE_DO_SHOW = 21;
     public static final int TYPE_KNOWLEDGE_SHOWN_BY_OHER = 22;
     public static final int TYPE_KNOWLEDGE_SHOWN = 23;
+    public static final int TYPE_KNOWLEDGE_DO_LIKE = 31;
+    public static final int TYPE_KNOWLEDGE_LIKED_BY_OHER = 32;
+    public static final int TYPE_KNOWLEDGE_LIKED = 33;
+    public static final int TYPE_KNOWLEDGE_DO_STOCK = 41;
+    public static final int TYPE_KNOWLEDGE_STOCKED_BY_OHER = 42;
+    public static final int TYPE_KNOWLEDGE_STOCKED = 43;
     
     void execute() throws Exception;
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
index fd43d6fe2..75a36ded1 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
@@ -22,7 +22,7 @@ public static KnowledgeInsertActivity get() {
     }
     @Override
     protected Activity getActivity() {
-        LOG.info("Start add point process on insert knowledge.");
+        LOG.debug("Start add point process on insert knowledge.");
         return Activity.KNOWLEDGE_INSERT;
     }
     @Override
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
new file mode 100644
index 000000000..c74b9000f
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
@@ -0,0 +1,39 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+
+/**
+ * 
+ * 3    | 31          | 参照者       | 2        | 記事にイイネのアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
+ * 3    | 32          | 記事登録者    | 10       | 自分が登録された記事にイイネがついたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+ * 3    | 33          | 記事         | 10       | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 
+ * @author koda
+ */
+public class KnowledgeLikeActivity extends AbstractAddPointForKnowledgeProcessor {
+    private static final Log LOG = LogFactory.getLog(KnowledgeLikeActivity.class);
+    public static KnowledgeLikeActivity get() {
+        return Container.getComp(KnowledgeLikeActivity.class);
+    }
+    
+    @Override
+    protected Activity getActivity() {
+        LOG.debug("Start add point process on like knowledge.");
+        return Activity.KNOWLEDGE_LIKE;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_LIKE, 2);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_LIKED_BY_OHER, 10);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledge() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_LIKED, 10);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
index 5e6f28328..559d89218 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
@@ -24,7 +24,7 @@ public static KnowledgeShowActivity get() {
     
     @Override
     protected Activity getActivity() {
-        LOG.info("Start add point process on show knowledge.");
+        LOG.debug("Start add point process on show knowledge.");
         return Activity.KNOWLEDGE_SHOW;
     }
     @Override
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
new file mode 100644
index 000000000..338e92b3e
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
@@ -0,0 +1,39 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+
+/**
+ * 
+ * 4    | 41          | 参照者       | 0        | ストックした場合、ストックした人にポイントは付与しない
+ * 4    | 42          | 記事登録者    | 2       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+ * 4    | 43          | 記事         | 2       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 
+ * @author koda
+ */
+public class KnowledgeStockActivity extends AbstractAddPointForKnowledgeProcessor {
+    private static final Log LOG = LogFactory.getLog(KnowledgeStockActivity.class);
+    public static KnowledgeStockActivity get() {
+        return Container.getComp(KnowledgeStockActivity.class);
+    }
+    
+    @Override
+    protected Activity getActivity() {
+        LOG.debug("Start add point process on stock knowledge.");
+        return Activity.KNOWLEDGE_STOCK;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        return null;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_STOCKED_BY_OHER, 2);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledge() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_STOCKED, 2);
+    }
+
+}

From 8de0c2034e114bba8803e20b97939e5b8ffc52e1 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 3 Sep 2017 12:50:45 +0900
Subject: [PATCH 042/138] #840 Add add point process at knowledge answer

---
 .../control/protect/KnowledgeControl.java     |  3 +
 .../control/protect/SurveyControl.java        |  2 +-
 .../project/knowledge/deploy/InitDB.java      |  3 +
 .../deploy/v1_11_0/Migrate_1_11_2.java        | 55 ++++++++++++++++++-
 ...AbstractAddPointForKnowledgeProcessor.java |  8 +--
 .../knowledge/logic/activity/Activity.java    |  7 ++-
 .../logic/activity/ActivityLogic.java         |  3 +
 .../logic/activity/ActivityProcessor.java     |  3 +
 .../activity/KnowledgeAnswerActivity.java     | 39 +++++++++++++
 .../logic/hook/BeforeSavePointHook.java       | 21 +++++++
 .../knowledge/logic/hook/HookFactory.java     |  1 +
 11 files changed, 136 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/hook/BeforeSavePointHook.java

diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index 638ec6a9c..1f345d056 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -329,6 +329,9 @@ private Boundary update(KnowledgesEntity entity) throws Exception {
     @Post(subscribeToken = "knowledge", checkReqToken = true)
     public Boundary save(KnowledgesEntity entity) throws Exception {
         try {
+            if (entity.getPoint() == null) {
+                entity.setPoint(0); // 初期値
+            }
             if (entity.getKnowledgeId() != null && entity.getKnowledgeId() >= 1) {
                 return update(entity);
             } else {
diff --git a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
index a1cea44fc..ad433e846 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
@@ -226,7 +226,7 @@ public Boundary answer() throws InstantiationException, IllegalAccessException,
             LOG.debug(PropertyUtil.reflectionToString(answer));
         }
         SurveyLogic.get().saveAnswer(answer, getLoginUserId());
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SURVEY, getLoginedUser(), new Date(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_ANSWER, getLoginedUser(), new Date(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         
         // メッセージ送信
diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
index 72b8c1df8..e222e874b 100644
--- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java
+++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
@@ -126,6 +126,8 @@ public String init() throws Exception {
     }
 
     public void start() throws Exception {
+        LOG.info("Lastest database version is " + CURRENT + " now");
+
         String version = "";
 
         Migrate migrate;
@@ -151,6 +153,7 @@ public void start() throws Exception {
                 doMigrate(migrate, version);
                 return;
             }
+            LOG.info("Current database version is " + version + " now");
 
             // バージョンアップ
             Iterator<String> versions = MAP.keySet().iterator();
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index a777d6514..66ad2ac4a 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -5,19 +5,24 @@
 import org.support.project.aop.Aspect;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.UserConfig;
 import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.dao.LikesDao;
 import org.support.project.knowledge.dao.StockKnowledgesDao;
+import org.support.project.knowledge.dao.SurveyAnswersDao;
 import org.support.project.knowledge.dao.ViewHistoriesDao;
 import org.support.project.knowledge.deploy.Migrate;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.StockKnowledgesEntity;
+import org.support.project.knowledge.entity.SurveyAnswersEntity;
 import org.support.project.knowledge.entity.ViewHistoriesEntity;
 import org.support.project.knowledge.logic.activity.Activity;
 import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.ormapping.tool.dao.InitializeDao;
 import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.UserConfigsDao;
 import org.support.project.web.dao.UsersDao;
 import org.support.project.web.entity.UsersEntity;
 
@@ -39,6 +44,8 @@ public boolean doMigrate() throws Exception {
         
         // 参照回数を集計
         doSetViewCountToKnowledge();
+        // ユーザについているポイントをクリア
+        clearUserPoint();
         
         // Knowledgeを登録したイベントによりポイントを集計
         doAddPointByKnowledge();
@@ -50,6 +57,8 @@ public boolean doMigrate() throws Exception {
         doAddPointByKnowledgeLike();
         // Knowledgeをストックイベントによりポイント集計
         doAddPointByKnowledgeStock();
+        // Knowledgeのアンケートを回答したイベントによりポイント集計
+        doAddPointByKnowledgeAnswer();
         
         
         return true;
@@ -57,6 +66,43 @@ public boolean doMigrate() throws Exception {
     
     
 
+    private void doAddPointByKnowledgeAnswer() throws InterruptedException {
+        List<SurveyAnswersEntity> list;
+        int offset = 0;
+        int limit = 50;
+        do {
+            list = doAddPointByKnowledgeAnswer(offset, limit);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(200);
+            }
+        } while (list.size() > 0);
+    }
+
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private List<SurveyAnswersEntity> doAddPointByKnowledgeAnswer(int offset, int limit) {
+        LOG.info("Aggregate point by knowledge answer");
+        List<SurveyAnswersEntity> list;
+        list = SurveyAnswersDao.get().selectAllWidthPager(limit, offset);
+        for (SurveyAnswersEntity answer : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(answer.getKnowledgeId());
+            if (knowledge == null) {
+                LOG.info("    knowledge [" + answer.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(answer.getInsertUser());
+            if (account == null) {
+                LOG.info("    event user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_ANSWER, user, answer.getInsertDatetime(), knowledge);
+        }
+        return list;
+    }
+
     private void doAddPointByKnowledgeStock() throws InterruptedException {
         List<StockKnowledgesEntity> list;
         int offset = 0;
@@ -89,7 +135,7 @@ private List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset, int l
             }
             user.setLoginUser(account);
             LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, user, stock.getInsertDatetime(), knowledge);
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_STOCK, user, stock.getInsertDatetime(), knowledge);
         }
         return list;
     }
@@ -219,7 +265,14 @@ private List<KnowledgesEntity> doSetViewCountToKnowledge(int offset, int limit)
             LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
             long count = ViewHistoriesDao.get().selectCountOnKnowledgeId(knowledge.getKnowledgeId());
             KnowledgesDao.get().updateViewCount(count, knowledge.getKnowledgeId());
+            
+            //ついでにポイントも初期化
+            KnowledgesDao.get().updatePoint(knowledge.getKnowledgeId(), 0);
         }
         return knowledges;
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private void clearUserPoint() {
+        UserConfigsDao.get().removeAllUserConfig(AppConfig.get().getSystemName(), UserConfig.POINT);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
index f9653ab02..1d3c70e9f 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
@@ -53,8 +53,8 @@ public void execute() throws Exception {
             addPointForUser(
                     getKnowledge().getInsertUser(), // ターゲットは登録者
                     activity.getActivityNo(),
-                    exec.type,
-                    exec.point);
+                    owner.type,
+                    owner.point);
         }
          // 記事のポイントアップ
         TypeAndPoint knowledge = getTypeAndPointForKnowledge();
@@ -62,8 +62,8 @@ public void execute() throws Exception {
             addPointForKnowledge(
                     getKnowledge().getKnowledgeId(),
                     activity.getActivityNo(),
-                    exec.type,
-                    exec.point);
+                    knowledge.type,
+                    knowledge.point);
         }
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/Activity.java b/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
index 95127e871..4bcd0c21c 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
@@ -47,6 +47,7 @@
  * 
  * ユーザのポイントは、USER_CONFIGSテーブルへ格納する
  * ポイントはランダムで少し増減した方が面白い？？
+ * ポイントは、だいたいの定義で、各実装の処理内で拡張する（例えば、イイネは、件数が増える毎に、ナレッジに付くポイントは増加するとか）
  * 
  * @author koda
  */
@@ -56,7 +57,7 @@ public enum Activity {
     KNOWLEDGE_SHOW, // 記事参照
     KNOWLEDGE_LIKE, // イイネを押した
     KNOWLEDGE_STOCK, // ストックした
-    KNOWLEDGE_SURVEY, // アンケートに回答した
+    KNOWLEDGE_ANSWER, // アンケートに回答した
     KNOWLEDGE_EVENT_ADD, // イベントに参加した
     KNOWLEDGE_EVENT_DELETE, // イベント参加キャンセル
     KNOWLEDGE_COMMENT_ADD, // コメント追加
@@ -71,7 +72,7 @@ public int getValue() {
             return 3;
         } else if (this ==KNOWLEDGE_STOCK) {
             return 4;
-        } else if (this ==KNOWLEDGE_SURVEY) {
+        } else if (this ==KNOWLEDGE_ANSWER) {
             return 5;
         } else if (this ==KNOWLEDGE_EVENT_ADD) {
             return 6;
@@ -95,7 +96,7 @@ public static Activity getType(int type) {
         } else if (type == 4) {
             return KNOWLEDGE_STOCK;
         } else if (type == 5) {
-            return KNOWLEDGE_SURVEY;
+            return KNOWLEDGE_ANSWER;
         } else if (type == 6) {
             return KNOWLEDGE_EVENT_ADD;
         } else if (type == -6) {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index ed109694b..931af3460 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -33,9 +33,12 @@ private List<ActivityProcessor> getActivityProcessors(Activity activity) {
             array.add(KnowledgeLikeActivity.get());
         } else if (activity == Activity.KNOWLEDGE_STOCK) {
             array.add(KnowledgeStockActivity.get());
+        } else if (activity == Activity.KNOWLEDGE_ANSWER) {
+            array.add(KnowledgeAnswerActivity.get());
         }
         
         
+        
         return array;
     }
     private void execute(Activity activity, LoginedUser eventUser, Date eventDateTime, KnowledgesEntity knowledge, CommentsEntity comment) {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
index d2ef7b8f9..26b791ddb 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
@@ -40,6 +40,9 @@ public interface ActivityProcessor {
     public static final int TYPE_KNOWLEDGE_DO_STOCK = 41;
     public static final int TYPE_KNOWLEDGE_STOCKED_BY_OHER = 42;
     public static final int TYPE_KNOWLEDGE_STOCKED = 43;
+    public static final int TYPE_KNOWLEDGE_DO_ANSWER = 51;
+    public static final int TYPE_KNOWLEDGE_ANSWERD_BY_OHER = 52;
+    public static final int TYPE_KNOWLEDGE_ANSWERD = 53;
     
     void execute() throws Exception;
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
new file mode 100644
index 000000000..cce7d92f7
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
@@ -0,0 +1,39 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+
+/**
+ * 
+ * 5    | 51          | 参照者       | 3        | アンケート回答者にポイント付与
+ * 5    | 52          | 記事登録者    | 3       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+ * 5    | 53          | 記事         | 3       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 
+ * @author koda
+ */
+public class KnowledgeAnswerActivity extends AbstractAddPointForKnowledgeProcessor {
+    private static final Log LOG = LogFactory.getLog(KnowledgeAnswerActivity.class);
+    public static KnowledgeAnswerActivity get() {
+        return Container.getComp(KnowledgeAnswerActivity.class);
+    }
+    
+    @Override
+    protected Activity getActivity() {
+        LOG.debug("Start add point process on answer knowledge.");
+        return Activity.KNOWLEDGE_ANSWER;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_ANSWER, 3);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_ANSWERD_BY_OHER, 3);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledge() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_ANSWERD, 3);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/hook/BeforeSavePointHook.java b/src/main/java/org/support/project/knowledge/logic/hook/BeforeSavePointHook.java
new file mode 100644
index 000000000..00e40c088
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/hook/BeforeSavePointHook.java
@@ -0,0 +1,21 @@
+package org.support.project.knowledge.logic.hook;
+
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.vo.KnowledgeData;
+import org.support.project.web.bean.LoginedUser;
+
+@DI(instance = Instance.Singleton)
+public class BeforeSavePointHook implements BeforeSaveHook {
+
+    @Override
+    public void beforeSave(KnowledgeData data, KnowledgesEntity db, LoginedUser loginedUser) throws Exception {
+        if (data.getKnowledge().getKnowledgeId() == null) {
+            // 新規登録
+            data.getKnowledge().setPoint(0);
+        } else {
+            data.getKnowledge().setPoint(db.getPoint()); // ポイントは、現在のDBの値をコピー
+        }
+    }
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/hook/HookFactory.java b/src/main/java/org/support/project/knowledge/logic/hook/HookFactory.java
index 5b6e827ac..cdd4f0298 100644
--- a/src/main/java/org/support/project/knowledge/logic/hook/HookFactory.java
+++ b/src/main/java/org/support/project/knowledge/logic/hook/HookFactory.java
@@ -22,6 +22,7 @@ public static List<BeforeSaveHook> getBeforeSaveHookInstance(KnowledgeData knowl
                 hooks.add(Container.getComp(BeforeSaveOldEventRemoveHook.class));
             }
         }
+        hooks.add(Container.getComp(BeforeSavePointHook.class));
         return hooks;
     }
     

From cf5b3f26fe2d81d7c723b924df70b8da242133df Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 3 Sep 2017 18:19:55 +0900
Subject: [PATCH 043/138] #840 Add add point process at knowledge join event

---
 .../deploy/v1_11_0/Migrate_1_11_2.java        | 39 +++++++++++++++++++
 .../logic/activity/ActivityLogic.java         |  2 +
 .../logic/activity/ActivityProcessor.java     |  3 ++
 .../activity/KnowledgeEventActivity.java      | 39 +++++++++++++++++++
 4 files changed, 83 insertions(+)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java

diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 66ad2ac4a..9d51a8289 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -9,12 +9,14 @@
 import org.support.project.knowledge.config.UserConfig;
 import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.dao.LikesDao;
+import org.support.project.knowledge.dao.ParticipantsDao;
 import org.support.project.knowledge.dao.StockKnowledgesDao;
 import org.support.project.knowledge.dao.SurveyAnswersDao;
 import org.support.project.knowledge.dao.ViewHistoriesDao;
 import org.support.project.knowledge.deploy.Migrate;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.LikesEntity;
+import org.support.project.knowledge.entity.ParticipantsEntity;
 import org.support.project.knowledge.entity.StockKnowledgesEntity;
 import org.support.project.knowledge.entity.SurveyAnswersEntity;
 import org.support.project.knowledge.entity.ViewHistoriesEntity;
@@ -59,12 +61,49 @@ public boolean doMigrate() throws Exception {
         doAddPointByKnowledgeStock();
         // Knowledgeのアンケートを回答したイベントによりポイント集計
         doAddPointByKnowledgeAnswer();
+        // Knowledgeイベント参加したイベントによりポイント集計
+        doAddPointByKnowledgeJoinEvent();
         
         
         return true;
     }
     
     
+    private void doAddPointByKnowledgeJoinEvent() throws InterruptedException {
+        List<ParticipantsEntity> list;
+        int offset = 0;
+        int limit = 50;
+        do {
+            list = doAddPointByKnowledgeJoinEvent(offset, limit);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(200);
+            }
+        } while (list.size() > 0);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private List<ParticipantsEntity> doAddPointByKnowledgeJoinEvent(int offset, int limit) {
+        LOG.info("Aggregate point by knowledge join event");
+        List<ParticipantsEntity> list;
+        list = ParticipantsDao.get().selectAllWidthPager(limit, offset);
+        for (ParticipantsEntity item : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
+            if (knowledge == null) {
+                LOG.info("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.info("    event user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_ADD, user, item.getInsertDatetime(), knowledge);
+        }
+        return list;
+    }
 
     private void doAddPointByKnowledgeAnswer() throws InterruptedException {
         List<SurveyAnswersEntity> list;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index 931af3460..b2e7c1e16 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -35,6 +35,8 @@ private List<ActivityProcessor> getActivityProcessors(Activity activity) {
             array.add(KnowledgeStockActivity.get());
         } else if (activity == Activity.KNOWLEDGE_ANSWER) {
             array.add(KnowledgeAnswerActivity.get());
+        } else if (activity == Activity.KNOWLEDGE_EVENT_ADD) {
+            array.add(KnowledgeEventActivity.get());
         }
         
         
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
index 26b791ddb..8cd8ac780 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
@@ -43,6 +43,9 @@ public interface ActivityProcessor {
     public static final int TYPE_KNOWLEDGE_DO_ANSWER = 51;
     public static final int TYPE_KNOWLEDGE_ANSWERD_BY_OHER = 52;
     public static final int TYPE_KNOWLEDGE_ANSWERD = 53;
+    public static final int TYPE_KNOWLEDGE_DO_JOIN_EVENT = 61;
+    public static final int TYPE_KNOWLEDGE_JOINED_BY_OHER = 62;
+    public static final int TYPE_KNOWLEDGE_JOINED = 63;
     
     void execute() throws Exception;
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
new file mode 100644
index 000000000..b75a76fe5
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
@@ -0,0 +1,39 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+
+/**
+ * 
+ * 6    | 61          | 参照者       | 5        | イベント参加者にポイント付与
+ * 6    | 62          | 記事登録者    | 5       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
+ * 6    | 63          | 記事         | 5       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 
+ * @author koda
+ */
+public class KnowledgeEventActivity extends AbstractAddPointForKnowledgeProcessor {
+    private static final Log LOG = LogFactory.getLog(KnowledgeEventActivity.class);
+    public static KnowledgeEventActivity get() {
+        return Container.getComp(KnowledgeEventActivity.class);
+    }
+    
+    @Override
+    protected Activity getActivity() {
+        LOG.debug("Start add point process on answer knowledge.");
+        return Activity.KNOWLEDGE_ANSWER;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_JOIN_EVENT, 5);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_JOINED_BY_OHER, 5);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledge() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_JOINED, 5);
+    }
+
+}

From 9f8d10493b98f482b7efa729cb8439dc65186874 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 4 Sep 2017 22:24:18 +0900
Subject: [PATCH 044/138] #840 Add aspect of start transaction for select
 method

---
 .../project/knowledge/dao/AccountImagesDao.java  |  2 ++
 .../project/knowledge/dao/ActivitiesDao.java     |  2 ++
 .../support/project/knowledge/dao/BadgesDao.java |  2 ++
 .../project/knowledge/dao/CommentsDao.java       |  3 +++
 .../knowledge/dao/DraftItemValuesDao.java        |  2 ++
 .../knowledge/dao/DraftKnowledgesDao.java        |  4 +++-
 .../support/project/knowledge/dao/EventsDao.java |  4 ++++
 .../project/knowledge/dao/ExGroupsDao.java       |  7 +++++++
 .../project/knowledge/dao/ExUsersDao.java        |  4 ++++
 .../project/knowledge/dao/ItemChoicesDao.java    |  2 ++
 .../knowledge/dao/KnowledgeEditGroupsDao.java    |  2 ++
 .../knowledge/dao/KnowledgeEditUsersDao.java     |  2 ++
 .../project/knowledge/dao/KnowledgeFilesDao.java |  6 ++++++
 .../knowledge/dao/KnowledgeHistoriesDao.java     |  4 ++++
 .../knowledge/dao/KnowledgeItemValuesDao.java    |  2 ++
 .../project/knowledge/dao/KnowledgeTagsDao.java  |  2 ++
 .../project/knowledge/dao/KnowledgeUsersDao.java |  2 ++
 .../project/knowledge/dao/KnowledgesDao.java     | 16 ++++++++++++++++
 .../project/knowledge/dao/LikeCommentsDao.java   |  4 ++++
 .../support/project/knowledge/dao/LikesDao.java  |  4 ++++
 .../knowledge/dao/MailHookConditionsDao.java     |  2 ++
 .../project/knowledge/dao/MailHooksDao.java      |  3 +++
 .../project/knowledge/dao/NotifyConfigsDao.java  |  4 ++++
 .../project/knowledge/dao/NotifyQueuesDao.java   |  3 +++
 .../project/knowledge/dao/ParticipantsDao.java   |  2 ++
 .../support/project/knowledge/dao/PinsDao.java   |  2 ++
 .../dao/PointKnowledgeHistoriesDao.java          |  2 ++
 .../knowledge/dao/PointUserHistoriesDao.java     |  2 ++
 .../knowledge/dao/StockKnowledgesDao.java        |  4 ++++
 .../support/project/knowledge/dao/StocksDao.java |  5 +++++
 .../project/knowledge/dao/SurveyAnswersDao.java  |  3 +++
 .../project/knowledge/dao/SurveyChoicesDao.java  |  2 ++
 .../knowledge/dao/SurveyItemAnswersDao.java      |  3 +++
 .../project/knowledge/dao/SurveyItemsDao.java    |  2 ++
 .../project/knowledge/dao/SurveysDao.java        |  3 +++
 .../support/project/knowledge/dao/TagsDao.java   |  9 +++++++++
 .../project/knowledge/dao/TargetsDao.java        |  8 ++++++++
 .../knowledge/dao/TemplateMastersDao.java        |  3 +++
 .../support/project/knowledge/dao/TokensDao.java |  2 ++
 .../project/knowledge/dao/ViewHistoriesDao.java  |  3 +++
 .../project/knowledge/dao/WebhookConfigsDao.java |  3 +++
 .../project/knowledge/dao/WebhooksDao.java       |  2 ++
 .../knowledge/dao/gen/GenAccountImagesDao.java   |  8 ++++++++
 .../knowledge/dao/gen/GenActivitiesDao.java      |  8 ++++++++
 .../project/knowledge/dao/gen/GenBadgesDao.java  |  8 ++++++++
 .../knowledge/dao/gen/GenCommentsDao.java        |  8 ++++++++
 .../knowledge/dao/gen/GenDraftItemValuesDao.java | 14 ++++++++++++++
 .../knowledge/dao/gen/GenDraftKnowledgesDao.java |  8 ++++++++
 .../project/knowledge/dao/gen/GenEventsDao.java  |  8 ++++++++
 .../knowledge/dao/gen/GenItemChoicesDao.java     | 14 ++++++++++++++
 .../dao/gen/GenKnowledgeEditGroupsDao.java       | 12 ++++++++++++
 .../dao/gen/GenKnowledgeEditUsersDao.java        | 12 ++++++++++++
 .../knowledge/dao/gen/GenKnowledgeFilesDao.java  |  8 ++++++++
 .../knowledge/dao/gen/GenKnowledgeGroupsDao.java | 12 ++++++++++++
 .../dao/gen/GenKnowledgeHistoriesDao.java        | 12 ++++++++++++
 .../dao/gen/GenKnowledgeItemValuesDao.java       | 14 ++++++++++++++
 .../knowledge/dao/gen/GenKnowledgeTagsDao.java   | 12 ++++++++++++
 .../knowledge/dao/gen/GenKnowledgeUsersDao.java  | 12 ++++++++++++
 .../knowledge/dao/gen/GenKnowledgesDao.java      |  8 ++++++++
 .../knowledge/dao/gen/GenLikeCommentsDao.java    |  8 ++++++++
 .../project/knowledge/dao/gen/GenLikesDao.java   |  8 ++++++++
 .../dao/gen/GenMailHookConditionsDao.java        | 12 ++++++++++++
 .../knowledge/dao/gen/GenMailHooksDao.java       |  8 ++++++++
 .../dao/gen/GenMailLocaleTemplatesDao.java       | 12 ++++++++++++
 .../knowledge/dao/gen/GenMailPostsDao.java       |  8 ++++++++
 .../knowledge/dao/gen/GenMailPropertiesDao.java  | 12 ++++++++++++
 .../knowledge/dao/gen/GenMailTemplatesDao.java   |  8 ++++++++
 .../knowledge/dao/gen/GenNotifyConfigsDao.java   |  8 ++++++++
 .../knowledge/dao/gen/GenNotifyQueuesDao.java    |  8 ++++++++
 .../knowledge/dao/gen/GenParticipantsDao.java    | 12 ++++++++++++
 .../project/knowledge/dao/gen/GenPinsDao.java    |  8 ++++++++
 .../dao/gen/GenPointKnowledgeHistoriesDao.java   | 12 ++++++++++++
 .../dao/gen/GenPointUserHistoriesDao.java        | 12 ++++++++++++
 .../knowledge/dao/gen/GenServiceConfigsDao.java  |  8 ++++++++
 .../dao/gen/GenServiceLocaleConfigsDao.java      | 12 ++++++++++++
 .../knowledge/dao/gen/GenStockKnowledgesDao.java | 12 ++++++++++++
 .../project/knowledge/dao/gen/GenStocksDao.java  |  8 ++++++++
 .../knowledge/dao/gen/GenSurveyAnswersDao.java   | 12 ++++++++++++
 .../knowledge/dao/gen/GenSurveyChoicesDao.java   | 14 ++++++++++++++
 .../dao/gen/GenSurveyItemAnswersDao.java         | 14 ++++++++++++++
 .../knowledge/dao/gen/GenSurveyItemsDao.java     | 12 ++++++++++++
 .../project/knowledge/dao/gen/GenSurveysDao.java |  8 ++++++++
 .../project/knowledge/dao/gen/GenTagsDao.java    |  8 ++++++++
 .../knowledge/dao/gen/GenTemplateItemsDao.java   | 12 ++++++++++++
 .../knowledge/dao/gen/GenTemplateMastersDao.java |  8 ++++++++
 .../project/knowledge/dao/gen/GenTokensDao.java  |  8 ++++++++
 .../knowledge/dao/gen/GenUserBadgesDao.java      | 12 ++++++++++++
 .../knowledge/dao/gen/GenViewHistoriesDao.java   |  8 ++++++++
 .../project/knowledge/dao/gen/GenVotesDao.java   |  8 ++++++++
 .../knowledge/dao/gen/GenWebhookConfigsDao.java  |  8 ++++++++
 .../knowledge/dao/gen/GenWebhooksDao.java        |  8 ++++++++
 91 files changed, 641 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/support/project/knowledge/dao/AccountImagesDao.java b/src/main/java/org/support/project/knowledge/dao/AccountImagesDao.java
index 8a7111e71..6f24511f7 100644
--- a/src/main/java/org/support/project/knowledge/dao/AccountImagesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/AccountImagesDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -24,6 +25,7 @@ public static AccountImagesDao get() {
         return Container.getComp(AccountImagesDao.class);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public AccountImagesEntity selectOnUserId(Integer userId) {
         String sql = "SELECT * FROM ACCOUNT_IMAGES WHERE USER_ID = ?";
         return executeQuerySingle(sql, AccountImagesEntity.class, userId);
diff --git a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
index fd931f03e..887366adc 100644
--- a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -22,6 +23,7 @@ public class ActivitiesDao extends GenActivitiesDao {
     public static ActivitiesDao get() {
         return Container.getComp(ActivitiesDao.class);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ActivitiesEntity select(int userId, int type, String target) {
         String sql = "SELECT * FROM ACTIVITIES WHERE USER_ID = ? AND KIND = ? AND TARGET = ?";
         return executeQuerySingle(sql, ActivitiesEntity.class, userId, type, target);
diff --git a/src/main/java/org/support/project/knowledge/dao/BadgesDao.java b/src/main/java/org/support/project/knowledge/dao/BadgesDao.java
index d9947622b..1bd55820f 100644
--- a/src/main/java/org/support/project/knowledge/dao/BadgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/BadgesDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -32,6 +33,7 @@ public static BadgesDao get() {
      * Get Next id
      * @return next id
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer getNextId() {
         String sql = "SELECT MAX(NO) FROM BADGES;";
         Integer integer = executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/CommentsDao.java b/src/main/java/org/support/project/knowledge/dao/CommentsDao.java
index 548eb64c0..9dc93b6f6 100644
--- a/src/main/java/org/support/project/knowledge/dao/CommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/CommentsDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -26,6 +27,7 @@ public static CommentsDao get() {
         return Container.getComp(CommentsDao.class);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<CommentsEntity> selectOnKnowledgeId(Long knowledgeId) {
         StringBuilder builder = new StringBuilder();
         builder.append("SELECT COMMENTS.*, UPDATE_USER.USER_NAME AS UPDATE_USER_NAME, INSERT_USER.USER_NAME AS INSERT_USER_NAME FROM COMMENTS ");
@@ -42,6 +44,7 @@ public List<CommentsEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param knowledgeId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer countOnKnowledgeId(Long knowledgeId) {
         String sql = "SELECT COUNT(*) FROM COMMENTS WHERE KNOWLEDGE_ID = ?  AND DELETE_FLAG = 0 ";
         return super.executeQuerySingle(sql, Integer.class, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/DraftItemValuesDao.java b/src/main/java/org/support/project/knowledge/dao/DraftItemValuesDao.java
index 4e16779fa..24e5dcd72 100644
--- a/src/main/java/org/support/project/knowledge/dao/DraftItemValuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/DraftItemValuesDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -27,6 +28,7 @@ public static DraftItemValuesDao get() {
      * @param draftId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int deleteOnDraftId(Long draftId) {
         String sql = "DELETE FROM DRAFT_ITEM_VALUES WHERE DRAFT_ID = ?";
         return super.executeUpdate(sql, draftId);
diff --git a/src/main/java/org/support/project/knowledge/dao/DraftKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/DraftKnowledgesDao.java
index b8a38325f..2045e765c 100644
--- a/src/main/java/org/support/project/knowledge/dao/DraftKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/DraftKnowledgesDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -25,12 +26,13 @@ public static DraftKnowledgesDao get() {
         return Container.getComp(DraftKnowledgesDao.class);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftKnowledgesEntity> selectOnUser(Integer loginUserId, int limit, int offset) {
         String sql = "SELECT * FROM DRAFT_KNOWLEDGES WHERE INSERT_USER = ? limit ? offset ?";
         return super.executeQueryList(sql, DraftKnowledgesEntity.class, loginUserId, limit, offset);
     }
 
-    
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public DraftKnowledgesEntity selectOnKnowledgeAndUser(Long knowledgeId, Integer loginUserId) {
         String sql = "SELECT * FROM DRAFT_KNOWLEDGES WHERE INSERT_USER = ? AND KNOWLEDGE_ID = ?";
         return super.executeQuerySingle(sql, DraftKnowledgesEntity.class, loginUserId, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/EventsDao.java b/src/main/java/org/support/project/knowledge/dao/EventsDao.java
index 33edbfc6a..3ed0ec4a7 100644
--- a/src/main/java/org/support/project/knowledge/dao/EventsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/EventsDao.java
@@ -5,6 +5,7 @@
 import java.util.Calendar;
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -31,6 +32,7 @@ public static EventsDao get() {
         return Container.getComp(EventsDao.class);
     }
     
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<EventsEntity> selectAccessAbleEvents(Calendar start, Calendar end, LoginedUser loginedUser) {
         String sql;
         if (loginedUser != null && loginedUser.isAdmin()) {
@@ -49,6 +51,7 @@ public List<EventsEntity> selectAccessAbleEvents(Calendar start, Calendar end, L
         return executeQueryList(sql, EventsEntity.class, params.toArray(new Object[0]));
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     private String addAccessCondition(LoginedUser loginedUser, String sql, List<Object> params) {
         Integer loginuserId = Integer.MIN_VALUE;
         if (loginedUser != null) {
@@ -79,6 +82,7 @@ private String addAccessCondition(LoginedUser loginedUser, String sql, List<Obje
         return sql;
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectAccessAbleEvents(Calendar start, LoginedUser loginedUser, int limit, int offset) {
         String sql;
         if (loginedUser != null && loginedUser.isAdmin()) {
diff --git a/src/main/java/org/support/project/knowledge/dao/ExGroupsDao.java b/src/main/java/org/support/project/knowledge/dao/ExGroupsDao.java
index d8b8236cb..439ee8a1c 100644
--- a/src/main/java/org/support/project/knowledge/dao/ExGroupsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ExGroupsDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -41,6 +42,7 @@ public static ExGroupsDao get() {
      * @return
      */
     @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<GroupsEntity> selectMyGroup(LoginedUser loginedUser, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ExGroupsDao/ExGroupsDao_selectMyGroup.sql");
         return executeQueryList(sql, GroupsEntity.class, loginedUser.getUserId(), limit, offset);
@@ -56,6 +58,7 @@ public List<GroupsEntity> selectMyGroup(LoginedUser loginedUser, int offset, int
      * @return
      */
     @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<GroupsEntity> selectAccessAbleGroups(LoginedUser loginedUser, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ExGroupsDao/ExGroupsDao_selectAccessAbleGroups.sql");
         return executeQueryList(sql, GroupsEntity.class, loginedUser.getUserId(), limit, offset);
@@ -71,6 +74,7 @@ public List<GroupsEntity> selectAccessAbleGroups(LoginedUser loginedUser, int of
      * @return
      */
     @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<GroupsEntity> selectOnKeyword(String keyword, LoginedUser loginedUser, int offset, int limit) {
         if (loginedUser != null && loginedUser.isAdmin()) {
             String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ExGroupsDao/ExGroupsDao_selectAdminOnKeyword.sql");
@@ -92,6 +96,7 @@ public List<GroupsEntity> selectOnKeyword(String keyword, LoginedUser loginedUse
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<GroupsEntity> selectGroupsWithCount(int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ExGroupsDao/ExGroupsDao_selectGroupsWithCount.sql");
         return executeQueryList(sql, GroupsEntity.class, limit, offset);
@@ -102,6 +107,7 @@ public List<GroupsEntity> selectGroupsWithCount(int offset, int limit) {
      * @param groupId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectGroupKnowledgeCount(int groupId) {
         String sql = "SELECT COUNT(*) FROM KNOWLEDGE_GROUPS WHERE GROUP_ID = ?";
         return executeQuerySingle(sql, Integer.class, groupId);
@@ -111,6 +117,7 @@ public Integer selectGroupKnowledgeCount(int groupId) {
      * @param groupId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectGroupUserCount(int groupId) {
         String sql = "SELECT COUNT(*) FROM USER_GROUPS WHERE GROUP_ID = ?";
         return executeQuerySingle(sql, Integer.class, groupId);
diff --git a/src/main/java/org/support/project/knowledge/dao/ExUsersDao.java b/src/main/java/org/support/project/knowledge/dao/ExUsersDao.java
index 1c7476e76..82f4d1dac 100644
--- a/src/main/java/org/support/project/knowledge/dao/ExUsersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ExUsersDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.knowledge.vo.AccountInfo;
 import org.support.project.knowledge.vo.GroupUser;
@@ -35,6 +36,7 @@ public static ExUsersDao get() {
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<GroupUser> selectGroupUser(Integer groupId, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ExUsersDao/selectGroupUser.sql");
         return executeQueryList(sql, GroupUser.class, groupId, limit, offset);
@@ -45,6 +47,7 @@ public List<GroupUser> selectGroupUser(Integer groupId, int offset, int limit) {
      * 
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UsersEntity> selectNotifyPublicUsers() {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ExUsersDao/selectNotifyPublicUsers.sql");
         return executeQueryList(sql, UsersEntity.class);
@@ -58,6 +61,7 @@ public List<UsersEntity> selectNotifyPublicUsers() {
      * @param userId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public AccountInfo selectAccountInfoOnKey(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ExUsersDao/selectAccountInfoOnKey.sql");
         AccountInfo info = executeQuerySingle(sql, AccountInfo.class, userId);
diff --git a/src/main/java/org/support/project/knowledge/dao/ItemChoicesDao.java b/src/main/java/org/support/project/knowledge/dao/ItemChoicesDao.java
index f22a32bc8..044bd0b00 100644
--- a/src/main/java/org/support/project/knowledge/dao/ItemChoicesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ItemChoicesDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -33,6 +34,7 @@ public static ItemChoicesDao get() {
      * @param itemNo
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> selectOnItem(Integer typeId, Integer itemNo) {
         String sql = "SELECT * FROM ITEM_CHOICES WHERE TYPE_ID = ? AND ITEM_NO = ? AND DELETE_FLAG = 0";
         return super.executeQueryList(sql, ItemChoicesEntity.class, typeId, itemNo);
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgeEditGroupsDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgeEditGroupsDao.java
index 7c803b2f5..5b7436d83 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgeEditGroupsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgeEditGroupsDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -23,6 +24,7 @@ public static KnowledgeEditGroupsDao get() {
         return Container.getComp(KnowledgeEditGroupsDao.class);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnKnowledgeId(Long knowledgeId) {
         String sql = "DELETE FROM KNOWLEDGE_EDIT_GROUPS WHERE KNOWLEDGE_ID = ?";
         super.executeUpdate(sql, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgeEditUsersDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgeEditUsersDao.java
index 017206923..b89d67846 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgeEditUsersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgeEditUsersDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -23,6 +24,7 @@ public static KnowledgeEditUsersDao get() {
         return Container.getComp(KnowledgeEditUsersDao.class);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnKnowledgeId(Long knowledgeId) {
         String sql = "DELETE FROM KNOWLEDGE_EDIT_USERS WHERE KNOWLEDGE_ID = ?";
         super.executeUpdate(sql, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgeFilesDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgeFilesDao.java
index b1c40149e..655db7219 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgeFilesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgeFilesDao.java
@@ -37,6 +37,7 @@ public static KnowledgeFilesDao get() {
      * @param knowledgeId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> selectOnKnowledgeId(Long knowledgeId) {
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT FILE_NO, KNOWLEDGE_ID, COMMENT_NO, DRAFT_ID, FILE_NAME, FILE_SIZE, PARSE_STATUS, ");
@@ -50,6 +51,7 @@ public List<KnowledgeFilesEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param draftId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> selectOnDraftId(Long draftId) {
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT FILE_NO, KNOWLEDGE_ID, COMMENT_NO, DRAFT_ID, FILE_NAME, FILE_SIZE, PARSE_STATUS, ");
@@ -63,6 +65,7 @@ public List<KnowledgeFilesEntity> selectOnDraftId(Long draftId) {
     /**
      * キーで1件取得 （ファイルのバイナリは取得しない）
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeFilesEntity selectOnKeyWithoutBinary(Long fileNo) {
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT FILE_NO, KNOWLEDGE_ID, COMMENT_NO, DRAFT_ID, FILE_NAME, FILE_SIZE, PARSE_STATUS, ");
@@ -79,6 +82,7 @@ public KnowledgeFilesEntity selectOnKeyWithoutBinary(Long fileNo) {
      * @param commentNo Nullがありえる
      * @param loginedUser
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void connectKnowledge(Long fileNo, Long knowledgeId, Long commentNo, LoginedUser loginedUser) {
         StringBuilder sql = new StringBuilder();
         sql.append("UPDATE KNOWLEDGE_FILES ");
@@ -104,6 +108,7 @@ public List<KnowledgeFilesEntity> deleteNotConnectFiles() {
      * 
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> selectWaitStateFiles() {
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT FILE_NO, KNOWLEDGE_ID, COMMENT_NO, FILE_NAME, DRAFT_ID, FILE_SIZE, INSERT_USER, ");
@@ -133,6 +138,7 @@ public void changeStatus(Long fileNo, int parseStatus, Integer updateUserId) {
      * @param entity ファイルEntity
      * @param updateUserId 更新者
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void updateDraftId(KnowledgeFilesEntity entity, Integer updateUserId) {
         StringBuilder sql = new StringBuilder();
         sql.append("UPDATE KNOWLEDGE_FILES ");
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgeHistoriesDao.java
index 55baba386..29175aee5 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgeHistoriesDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -33,17 +34,20 @@ public static KnowledgeHistoriesDao get() {
      * @param knowledgeId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int selectMaxHistoryNo(Long knowledgeId) {
         String sql = "SELECT MAX(HISTORY_NO) FROM KNOWLEDGE_HISTORIES WHERE KNOWLEDGE_ID = ? ";
         return executeQuerySingle(sql, Integer.class, knowledgeId);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> selectOnKnowledge(Long knowledgeId, int offset, int limit) {
         String sql = SQLManager.getInstance()
                 .getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_selectOnKnowledge.sql");
         return executeQueryList(sql, KnowledgeHistoriesEntity.class, knowledgeId, limit, offset);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeHistoriesEntity selectOnKeyWithName(Integer historyNo, Long knowledgeId) {
         String sql = SQLManager.getInstance()
                 .getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_selectOnKeyWithName.sql");
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgeItemValuesDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgeItemValuesDao.java
index f5be69599..06c05fb3c 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgeItemValuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgeItemValuesDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -26,6 +27,7 @@ public static KnowledgeItemValuesDao get() {
         return Container.getComp(KnowledgeItemValuesDao.class);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> selectOnTypeIdAndItemNoAndStatus(int typeId, int itemNo, int status) {
         String sql = "SELECT * FROM KNOWLEDGE_ITEM_VALUES WHERE TYPE_ID = ? AND ITEM_NO = ? AND ITEM_STATUS = ? AND DELETE_FLAG = 0";
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, typeId, itemNo, status);
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgeTagsDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgeTagsDao.java
index 5d64baf8b..0cecb934b 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgeTagsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgeTagsDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -28,6 +29,7 @@ public static KnowledgeTagsDao get() {
      * 
      * @param knowledgeId
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnKnowledgeId(Long knowledgeId) {
         String sql = "DELETE FROM KNOWLEDGE_TAGS WHERE KNOWLEDGE_ID = ?";
         super.executeUpdate(sql, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgeUsersDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgeUsersDao.java
index 8ae763951..8aaf89d3a 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgeUsersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgeUsersDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -28,6 +29,7 @@ public static KnowledgeUsersDao get() {
      * 
      * @param knowledgeId
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnKnowledgeId(Long knowledgeId) {
         String sql = "DELETE FROM KNOWLEDGE_USERS WHERE KNOWLEDGE_ID = ?";
         super.executeUpdate(sql, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
index 56d4fa5a9..5f016fade 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
@@ -5,6 +5,7 @@
 import java.util.Date;
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -40,6 +41,7 @@ public static KnowledgesDao get() {
     /**
      * IDを採番 ※コミットしなくても次のIDを採番する為、保存しなければ欠番になる
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer getNextId() {
         String sql = "SELECT MAX(KNOWLEDGE_ID) FROM KNOWLEDGES;";
         Integer integer = executeQuerySingle(sql, Integer.class);
@@ -50,6 +52,7 @@ public Integer getNextId() {
         return currentId;
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectKnowledge(int offset, int limit, Integer userId) {
         // String sql = "SELECT * FROM KNOWLEDGES WHERE DELETE_FLAG = 0 ORDER BY UPDATE_DATETIME DESC Limit ? offset ?;";
         String sql = SQLManager.getInstance()
@@ -63,6 +66,7 @@ public List<KnowledgesEntity> selectKnowledge(int offset, int limit, Integer use
      * @param knowledgeIds
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectKnowledges(List<Long> knowledgeIds) {
         if (knowledgeIds == null || knowledgeIds.isEmpty()) {
             return new ArrayList<KnowledgesEntity>();
@@ -97,6 +101,7 @@ public List<KnowledgesEntity> selectKnowledges(List<Long> knowledgeIds) {
      * @param knowledgeId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgesEntity selectOnKeyWithUserName(Long knowledgeId) {
         String sql = SQLManager.getInstance()
                 .getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectOnKeyWithUserName.sql");
@@ -109,6 +114,7 @@ public KnowledgesEntity selectOnKeyWithUserName(Long knowledgeId) {
      * @param userId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<Long> selectOnUser(Integer userId) {
         String sql = "SELECT KNOWLEDGE_ID FROM KNOWLEDGES WHERE INSERT_USER = ? ORDER BY KNOWLEDGE_ID DESC";
         return executeQueryList(sql, Long.class, userId);
@@ -119,6 +125,7 @@ public List<Long> selectOnUser(Integer userId) {
      * 
      * @param loginUserId
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnUser(Integer loginUserId) {
         String sql = "UPDATE KNOWLEDGES SET DELETE_FLAG = 1 , UPDATE_USER = ? , UPDATE_DATETIME = ? WHERE INSERT_USER = ?";
         super.executeUpdate(sql, loginUserId, new Timestamp(new Date().getTime()), loginUserId);
@@ -131,6 +138,7 @@ public void deleteOnUser(Integer loginUserId) {
      * @param end
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectBetween(Long start, Long end) {
         String sql = "SELECT * FROM knowledges WHERE knowledge_id BETWEEN ? AND ? AND DELETE_FLAG = 0 ORDER BY knowledge_id";
         return executeQueryList(sql, KnowledgesEntity.class, start, end);
@@ -145,6 +153,7 @@ public List<KnowledgesEntity> selectBetween(Long start, Long end) {
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectPopularity(Timestamp start, Timestamp end, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectPopularity.sql");
         return executeQueryList(sql, KnowledgesEntity.class, start, end, limit, offset);
@@ -160,6 +169,7 @@ public List<KnowledgesEntity> selectPopularity(Timestamp start, Timestamp end, i
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectPopularityWithAccessControl(LoginedUser loginedUser, Timestamp start, Timestamp end, int offset, int limit) {
         String sql = SQLManager.getInstance()
                 .getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectPopularityWithAccessControl.sql");
@@ -198,6 +208,7 @@ public List<KnowledgesEntity> selectPopularityWithAccessControl(LoginedUser logi
         return executeQueryList(sql, KnowledgesEntity.class, params.toArray(new Object[0]));
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectStocks(LoginedUser loginedUser, int offset, int limit, Long stockid) {
         if (loginedUser == null) {
             // ログインしていないのであれば、ストックは無し
@@ -263,6 +274,7 @@ public List<KnowledgesEntity> selectStocks(LoginedUser loginedUser, int offset,
      * @param q
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectKnowledgeOnIdPrefix(String q, int limit, int offset) {
         String sql = "SELECT KNOWLEDGE_ID, TITLE FROM KNOWLEDGES "
                 + "WHERE CAST(KNOWLEDGE_ID AS VARCHAR(20)) LIKE ? || '%' ORDER BY KNOWLEDGES.KNOWLEDGE_ID DESC LIMIT ? OFFSET ?;";
@@ -274,6 +286,7 @@ public List<KnowledgesEntity> selectKnowledgeOnIdPrefix(String q, int limit, int
      * @param q
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectAccessAbleKnowledgeOnIdPrefix(String q, LoginedUser loginedUser, int limit, int offset) {
         String sql = SQLManager.getInstance()
                 .getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectAccessAbleKnowledgeOnIdPrefix.sql");
@@ -311,14 +324,17 @@ public List<KnowledgesEntity> selectAccessAbleKnowledgeOnIdPrefix(String q, Logi
         return executeQueryList(sql, KnowledgesEntity.class, params.toArray(new Object[0]));
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void updateViewCount(Long count, Long knowledgeId) {
         String sql = "UPDATE KNOWLEDGES SET VIEW_COUNT = ? WHERE KNOWLEDGE_ID = ?";
         executeUpdate(sql, count, knowledgeId);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int selectPoint(long knowledgeId) {
         String sql = "SELECT POINT FROM KNOWLEDGES WHERE KNOWLEDGE_ID = ?";
         return executeQuerySingle(sql, Integer.class, knowledgeId);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void updatePoint(long knowledgeId, int point) {
         String sql = "UPDATE KNOWLEDGES SET POINT = ? WHERE KNOWLEDGE_ID = ?";
         executeUpdate(sql, point, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
index 3893b0861..f5da3524a 100644
--- a/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -25,16 +26,19 @@ public static LikeCommentsDao get() {
         return Container.getComp(LikeCommentsDao.class);
     }
     
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Long selectOnCommentNo(Long commentNo) {
         String sql = "SELECT COUNT(*) FROM LIKE_COMMENTS WHERE COMMENT_NO = ?";
         return super.executeQuerySingle(sql, Long.class, commentNo);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikeCommentsEntity> selectOnCommentNo(Long commentNo, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_selectOnCommentNo.sql");
         return executeQueryList(sql, LikeCommentsEntity.class, commentNo, limit, offset);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public LikeCommentsEntity selectExistsOnUser(Long commentNo, Integer userId) {
         String sql = "SELECT * FROM LIKE_COMMENTS WHERE COMMENT_NO = ? AND INSERT_USER = ? LIMIT 1 OFFSET 0";
         return super.executeQuerySingle(sql, LikeCommentsEntity.class, commentNo, userId);
diff --git a/src/main/java/org/support/project/knowledge/dao/LikesDao.java b/src/main/java/org/support/project/knowledge/dao/LikesDao.java
index 48e432335..758299ace 100644
--- a/src/main/java/org/support/project/knowledge/dao/LikesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/LikesDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -27,16 +28,19 @@ public static LikesDao get() {
         return Container.getComp(LikesDao.class);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Long countOnKnowledgeId(Long knowledgeId) {
         String sql = "SELECT COUNT(*) FROM LIKES WHERE KNOWLEDGE_ID = ?";
         return super.executeQuerySingle(sql, Long.class, knowledgeId);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> selectOnKnowledge(Long knowledgeId, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_selectOnKnowledge.sql");
         return executeQueryList(sql, LikesEntity.class, knowledgeId, limit, offset);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public LikesEntity selectExistsOnUser(Long knowledgeId, Integer userId) {
         String sql = "SELECT * FROM LIKES WHERE KNOWLEDGE_ID = ? AND INSERT_USER = ? LIMIT 1 OFFSET 0";
         return super.executeQuerySingle(sql, LikesEntity.class, knowledgeId, userId);
diff --git a/src/main/java/org/support/project/knowledge/dao/MailHookConditionsDao.java b/src/main/java/org/support/project/knowledge/dao/MailHookConditionsDao.java
index 426bc5147..6d3068de2 100644
--- a/src/main/java/org/support/project/knowledge/dao/MailHookConditionsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/MailHookConditionsDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -29,6 +30,7 @@ public static MailHookConditionsDao get() {
      * @param hookId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int nextConditionNo(Integer hookId) {
         String sql = "SELECT COUNT(*) FROM MAIL_HOOK_CONDITIONS WHERE HOOK_ID = ?";
         int num = super.executeQuerySingle(sql, Integer.class, hookId);
diff --git a/src/main/java/org/support/project/knowledge/dao/MailHooksDao.java b/src/main/java/org/support/project/knowledge/dao/MailHooksDao.java
index 017a14a03..195b108e5 100644
--- a/src/main/java/org/support/project/knowledge/dao/MailHooksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/MailHooksDao.java
@@ -2,6 +2,7 @@
 
 import java.sql.Timestamp;
 
+import org.support.project.aop.Aspect;
 import org.support.project.common.config.INT_FLAG;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -36,6 +37,7 @@ public static MailHooksDao get() {
      * Get Next id
      * @return next id
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer getNextId() {
         String sql = "SELECT MAX(HOOK_ID) FROM MAIL_HOOKS;";
         Integer integer = executeQuerySingle(sql, Integer.class);
@@ -52,6 +54,7 @@ public Integer getNextId() {
      * @see org.support.project.knowledge.dao.gen.GenMailHooksDao#save(org.support.project.knowledge.entity.MailHooksEntity)
      */
     @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailHooksEntity save(MailHooksEntity entity) {
         if (entity.getHookId() != null) {
             MailHooksEntity db = physicalSelectOnKey(entity.getHookId());
diff --git a/src/main/java/org/support/project/knowledge/dao/NotifyConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/NotifyConfigsDao.java
index dbb24cc5b..acf515f1b 100644
--- a/src/main/java/org/support/project/knowledge/dao/NotifyConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/NotifyConfigsDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -35,6 +36,7 @@ public static NotifyConfigsDao get() {
     /**
      * IDを採番 ※コミットしなくても次のIDを採番する為、保存しなければ欠番になる
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer getNextId() {
         String sql = "SELECT MAX(USER_ID) FROM NOTIFY_CONFIGS;";
         Integer integer = executeQuerySingle(sql, Integer.class);
@@ -52,6 +54,7 @@ public Integer getNextId() {
      * @param offset
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UsersEntity> getNotifyDesktopUsersOnPublicComment(int limit, int offset) {
         String sql = SQLManager.getInstance()
                 .getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/GetNotifyDesktopUsersOnPublicComment.sql");
@@ -65,6 +68,7 @@ public List<UsersEntity> getNotifyDesktopUsersOnPublicComment(int limit, int off
      * @param offset
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UsersEntity> getNotifyMailUsersOnPublicComment(int limit, int offset) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/GetNotifyMailUsersOnPublicComment.sql");
         return executeQueryList(sql, UsersEntity.class, limit, offset);
diff --git a/src/main/java/org/support/project/knowledge/dao/NotifyQueuesDao.java b/src/main/java/org/support/project/knowledge/dao/NotifyQueuesDao.java
index 3e3b31037..a358c9e4a 100644
--- a/src/main/java/org/support/project/knowledge/dao/NotifyQueuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/NotifyQueuesDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -31,6 +32,7 @@ public static NotifyQueuesDao get() {
      * @return all data
      */
     @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyQueuesEntity> selectAll() { 
         String sql = "SELECT * FROM NOTIFY_QUEUES WHERE DELETE_FLAG = 0 ORDER BY INSERT_DATETIME ASC;";
         return executeQueryList(sql, NotifyQueuesEntity.class);
@@ -43,6 +45,7 @@ public List<NotifyQueuesEntity> selectAll() {
      * @param id
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public NotifyQueuesEntity selectOnTypeAndId(Integer type, Long id) {
         String sql = "SELECT * FROM NOTIFY_QUEUES WHERE TYPE = ? AND ID = ? AND DELETE_FLAG = 0";
         return super.executeQuerySingle(sql, NotifyQueuesEntity.class, type, id);
diff --git a/src/main/java/org/support/project/knowledge/dao/ParticipantsDao.java b/src/main/java/org/support/project/knowledge/dao/ParticipantsDao.java
index 46fd820a2..6c7b70fff 100644
--- a/src/main/java/org/support/project/knowledge/dao/ParticipantsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ParticipantsDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -32,6 +33,7 @@ public static ParticipantsDao get() {
      * @param knowledgeId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<Participation> selectParticipations(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_selectParticipations.sql");
         return executeQueryList(sql, Participation.class, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/PinsDao.java b/src/main/java/org/support/project/knowledge/dao/PinsDao.java
index 9dc1eeeb4..07ef71e8d 100644
--- a/src/main/java/org/support/project/knowledge/dao/PinsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/PinsDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -31,6 +32,7 @@ public static PinsDao get() {
      * IDを採番 
      * ※コミットしなくても次のIDを採番する為、保存しなければ欠番になる 
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer getNextId() {
         String sql = "SELECT MAX(no) FROM pins;";
         Integer integer = executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
index f8129e13d..49e460488 100644
--- a/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -20,6 +21,7 @@ public class PointKnowledgeHistoriesDao extends GenPointKnowledgeHistoriesDao {
     public static PointKnowledgeHistoriesDao get() {
         return Container.getComp(PointKnowledgeHistoriesDao.class);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public long selectNumOnKnowledge(long knowledgeId) {
         String sql = "SELECT MAX(HISTORY_NO) FROM POINT_KNOWLEDGE_HISTORIES WHERE KNOWLEDGE_ID = ?";
         return executeQuerySingle(sql, Long.class, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
index d5f615351..fc74bc844 100644
--- a/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -21,6 +22,7 @@ public static PointUserHistoriesDao get() {
         return Container.getComp(PointUserHistoriesDao.class);
     }
     
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public long selectNumOnUser(int user) {
         String sql = "SELECT MAX(HISTORY_NO) FROM POINT_USER_HISTORIES WHERE USER_ID = ?";
         return executeQuerySingle(sql, Long.class, user);
diff --git a/src/main/java/org/support/project/knowledge/dao/StockKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/StockKnowledgesDao.java
index 186d668e1..64426a1d8 100644
--- a/src/main/java/org/support/project/knowledge/dao/StockKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/StockKnowledgesDao.java
@@ -3,6 +3,7 @@
 import java.util.Date;
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -37,6 +38,7 @@ public static StockKnowledgesDao get() {
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> selectOnStockIdWithKnowledgeInfo(Long stockId, int offset, int limit) {
         String sql = SQLManager.getInstance()
                 .getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_selectOnStockIdWithKnowledgeInfo.sql");
@@ -47,6 +49,7 @@ public List<StockKnowledgesEntity> selectOnStockIdWithKnowledgeInfo(Long stockId
      * @param stockId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> selectActiveOnStockId(Long stockId) {
         String sql = SQLManager.getInstance()
                 .getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_active_on_stock_id.sql");
@@ -57,6 +60,7 @@ public List<StockKnowledgesEntity> selectActiveOnStockId(Long stockId) {
      * 指定のナレッジが削除されたときに、ストックからも消す
      * @param knowledgeId
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnKnowledgeId(Long knowledgeId) {
         DBUserPool pool = Container.getComp(DBUserPool.class);
         Integer user = (Integer) pool.getUser();
diff --git a/src/main/java/org/support/project/knowledge/dao/StocksDao.java b/src/main/java/org/support/project/knowledge/dao/StocksDao.java
index ef78e67ef..950214495 100644
--- a/src/main/java/org/support/project/knowledge/dao/StocksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/StocksDao.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -39,6 +40,7 @@ public static StocksDao get() {
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> selectMyStocksWithKnowledgeCount(LoginedUser loginedUser, int offset, int limit) {
         String sql = SQLManager.getInstance()
                 .getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_selectMyStocksWithKnowledgeCount.sql");
@@ -54,6 +56,7 @@ public List<StocksEntity> selectMyStocksWithKnowledgeCount(LoginedUser loginedUs
      * @param listLimit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<Stock> selectMyStocksWithStocked(LoginedUser loginedUser, Long knowledgeId, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_selectMyStocksWithStocked.sql");
         return executeQueryList(sql, Stock.class, knowledgeId, loginedUser.getUserId(), limit, offset);
@@ -65,6 +68,7 @@ public List<Stock> selectMyStocksWithStocked(LoginedUser loginedUser, Long knowl
      * @param loginedUser
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> selectStockOnKnowledge(KnowledgesEntity knowledgesEntity, LoginedUser loginedUser) {
         if (knowledgesEntity == null || loginedUser == null) {
             return new ArrayList<>();
@@ -80,6 +84,7 @@ public List<StocksEntity> selectStockOnKnowledge(KnowledgesEntity knowledgesEnti
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> selectMyStocks(LoginedUser loginedUser, int offset, int limit) {
         String sql = "SELECT * FROM STOCKS WHERE STOCKS.INSERT_USER = ? AND STOCKS.DELETE_FLAG = 0 ORDER BY STOCKS.INSERT_DATETIME LIMIT ? OFFSET ?";
         return executeQueryList(sql, StocksEntity.class, loginedUser.getUserId(), limit, offset);
diff --git a/src/main/java/org/support/project/knowledge/dao/SurveyAnswersDao.java b/src/main/java/org/support/project/knowledge/dao/SurveyAnswersDao.java
index 3cb0d0fc2..4f516c61b 100644
--- a/src/main/java/org/support/project/knowledge/dao/SurveyAnswersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/SurveyAnswersDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -21,10 +22,12 @@ public class SurveyAnswersDao extends GenSurveyAnswersDao {
     public static SurveyAnswersDao get() {
         return Container.getComp(SurveyAnswersDao.class);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnKnowledgeId(Long knowledgeId) {
         String sql = "DELETE FROM SURVEY_ANSWERS WHERE KNOWLEDGE_ID = ?";
         executeUpdate(sql, knowledgeId);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int selectCountOnKnowledgeId(Long knowledgeId) {
         String sql = "SELECT COUNT(*) FROM SURVEY_ANSWERS WHERE KNOWLEDGE_ID = ?";
         return executeQuerySingle(sql, Integer.class, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/SurveyChoicesDao.java b/src/main/java/org/support/project/knowledge/dao/SurveyChoicesDao.java
index 3d9351875..64518df12 100644
--- a/src/main/java/org/support/project/knowledge/dao/SurveyChoicesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/SurveyChoicesDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -22,6 +23,7 @@ public static SurveyChoicesDao get() {
         return Container.getComp(SurveyChoicesDao.class);
     }
     
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnKnowledgeId(Long knowledgeId) {
         String sql = "DELETE FROM SURVEY_CHOICES WHERE KNOWLEDGE_ID = ?";
         executeUpdate(sql, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/SurveyItemAnswersDao.java b/src/main/java/org/support/project/knowledge/dao/SurveyItemAnswersDao.java
index ebb910684..a8f60761f 100644
--- a/src/main/java/org/support/project/knowledge/dao/SurveyItemAnswersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/SurveyItemAnswersDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -24,10 +25,12 @@ public class SurveyItemAnswersDao extends GenSurveyItemAnswersDao {
     public static SurveyItemAnswersDao get() {
         return Container.getComp(SurveyItemAnswersDao.class);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnKnowledgeId(Long knowledgeId) {
         String sql = "DELETE FROM SURVEY_ITEM_ANSWERS WHERE KNOWLEDGE_ID = ?";
         executeUpdate(sql, knowledgeId);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> selectOnKnowledgeIdAndAnswerId(Long knowledgeId, Integer userId) {
         String sql = "SELECT * FROM SURVEY_ITEM_ANSWERS WHERE KNOWLEDGE_ID = ? AND ANSWER_ID = ?";
         return executeQueryList(sql, SurveyItemAnswersEntity.class, knowledgeId, userId);
diff --git a/src/main/java/org/support/project/knowledge/dao/SurveyItemsDao.java b/src/main/java/org/support/project/knowledge/dao/SurveyItemsDao.java
index cda8433c6..8d28c54d9 100644
--- a/src/main/java/org/support/project/knowledge/dao/SurveyItemsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/SurveyItemsDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -21,6 +22,7 @@ public static SurveyItemsDao get() {
         return Container.getComp(SurveyItemsDao.class);
     }
     
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnKnowledgeId(Long knowledgeId) {
         String sql = "DELETE FROM SURVEY_ITEMS WHERE KNOWLEDGE_ID = ?";
         executeUpdate(sql, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/SurveysDao.java b/src/main/java/org/support/project/knowledge/dao/SurveysDao.java
index bc3aa36de..e0b369421 100644
--- a/src/main/java/org/support/project/knowledge/dao/SurveysDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/SurveysDao.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -35,6 +36,7 @@ public static SurveysDao get() {
      * @param offset
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveysEntity> selectWithKnowledgeTitle(String idPrefix, int limit, int offset) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_with_knowledge_title.sql");
         return executeQueryList(sql, SurveysEntity.class, idPrefix, limit, offset);
@@ -49,6 +51,7 @@ public List<SurveysEntity> selectWithKnowledgeTitle(String idPrefix, int limit,
      * @param offset
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveysEntity> selectWithKnowledgeTitleOnlyAccessAble(LoginedUser loginedUser, String idPrefix, int limit, int offset) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_on_accessable.sql");
         List<Object> params = new ArrayList<>();
diff --git a/src/main/java/org/support/project/knowledge/dao/TagsDao.java b/src/main/java/org/support/project/knowledge/dao/TagsDao.java
index 03a42ee5a..706f03a5d 100644
--- a/src/main/java/org/support/project/knowledge/dao/TagsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/TagsDao.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.common.util.StringJoinBuilder;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -38,6 +39,7 @@ public static TagsDao get() {
     /**
      * IDを採番 ※コミットしなくても次のIDを採番する為、保存しなければ欠番になる
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer getNextId() {
         String sql = "SELECT MAX(TAG_ID) FROM TAGS;";
         Integer integer = executeQuerySingle(sql, Integer.class);
@@ -54,6 +56,7 @@ public Integer getNextId() {
      * @param tag
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TagsEntity selectOnTagName(String tag) {
         String sql = "SELECT * FROM TAGS WHERE TAG_NAME = ?";
         return executeQuerySingle(sql, TagsEntity.class, tag);
@@ -65,6 +68,7 @@ public TagsEntity selectOnTagName(String tag) {
      * @param knowledgeId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_selectOnKnowledgeId.sql");
         return executeQueryList(sql, TagsEntity.class, knowledgeId);
@@ -77,6 +81,7 @@ public List<TagsEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> selectTagsWithCount(int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_selectTagsWithCount.sql");
         return executeQueryList(sql, TagsEntity.class, limit, offset);
@@ -91,6 +96,7 @@ public List<TagsEntity> selectTagsWithCount(int offset, int limit) {
      * @return
      * @deprecated
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> selectTagsWithCountOnUser(int userid, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_selectTagsWithCountOnUser.sql");
         return executeQueryList(sql, TagsEntity.class, userid, limit, offset);
@@ -104,6 +110,7 @@ public List<TagsEntity> selectTagsWithCountOnUser(int userid, int offset, int li
      * @param loginedUser
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> selectWithKnowledgeCount(int userId, List<GroupsEntity> groups, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_selectWithKnowledgeCount.sql");
         StringJoinBuilder builder = new StringJoinBuilder();
@@ -130,6 +137,7 @@ public List<TagsEntity> selectWithKnowledgeCount(int userId, List<GroupsEntity>
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> selectWithKnowledgeCountAdmin(int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_selectWithKnowledgeCountAdmin.sql");
         return executeQueryList(sql, TagsEntity.class, limit, offset);
@@ -142,6 +150,7 @@ public List<TagsEntity> selectWithKnowledgeCountAdmin(int offset, int limit) {
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> selectWithKnowledgeCountOnTagName(String keyword, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_selectWithKnowledgeCountOnTagName.sql");
         StringBuilder builder = new StringBuilder();
diff --git a/src/main/java/org/support/project/knowledge/dao/TargetsDao.java b/src/main/java/org/support/project/knowledge/dao/TargetsDao.java
index e10230fdc..e80be9665 100644
--- a/src/main/java/org/support/project/knowledge/dao/TargetsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/TargetsDao.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.common.util.StringJoinBuilder;
 import org.support.project.di.Container;
 import org.support.project.ormapping.common.SQLManager;
@@ -32,6 +33,7 @@ public static TargetsDao get() {
      * @param limit
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LabelValue> selectOnKeyword(String keyword, int offset, int limit) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TargetsDao/selectOnKeyword.sql");
         return executeQueryList(sql, LabelValue.class, keyword, keyword, limit, offset);
@@ -43,6 +45,7 @@ public List<LabelValue> selectOnKeyword(String keyword, int offset, int limit) {
      * @param knowledgeId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<GroupsEntity> selectGroupsOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TargetsDao/selectGroupsOnKnowledgeId.sql");
         return executeQueryList(sql, GroupsEntity.class, knowledgeId);
@@ -54,6 +57,7 @@ public List<GroupsEntity> selectGroupsOnKnowledgeId(Long knowledgeId) {
      * @param knowledgeIds
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<GroupsEntity> selectGroupsOnKnowledgeIds(List<Long> knowledgeIds) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TargetsDao/selectGroupsOnKnowledgeIds.sql");
 
@@ -75,6 +79,7 @@ public List<GroupsEntity> selectGroupsOnKnowledgeIds(List<Long> knowledgeIds) {
      * @param knowledgeId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UsersEntity> selectUsersOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TargetsDao/selectUsersOnKnowledgeId.sql");
         return executeQueryList(sql, UsersEntity.class, knowledgeId);
@@ -86,6 +91,7 @@ public List<UsersEntity> selectUsersOnKnowledgeId(Long knowledgeId) {
      * @param knowledgeIds
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UsersEntity> selectUsersOnKnowledgeIds(List<Long> knowledgeIds) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TargetsDao/selectUsersOnKnowledgeIds.sql");
 
@@ -101,11 +107,13 @@ public List<UsersEntity> selectUsersOnKnowledgeIds(List<Long> knowledgeIds) {
         return executeQueryList(sql, UsersEntity.class, params.toArray(new Long[0]));
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<GroupsEntity> selectEditorGroupsOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TargetsDao/selectEditorGroupsOnKnowledgeId.sql");
         return executeQueryList(sql, GroupsEntity.class, knowledgeId);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UsersEntity> selectEditorUsersOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TargetsDao/selectEditorUsersOnKnowledgeId.sql");
         return executeQueryList(sql, UsersEntity.class, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/TemplateMastersDao.java b/src/main/java/org/support/project/knowledge/dao/TemplateMastersDao.java
index b417e7822..bc86dfd32 100644
--- a/src/main/java/org/support/project/knowledge/dao/TemplateMastersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/TemplateMastersDao.java
@@ -37,6 +37,7 @@ public static TemplateMastersDao get() {
     /**
      * IDを採番 ※コミットしなくても次のIDを採番する為、保存しなければ欠番になる
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer getNextId() {
         String sql = "SELECT MAX(TYPE_ID) FROM TEMPLATE_MASTERS;";
         Integer integer = executeQuerySingle(sql, Integer.class);
@@ -52,6 +53,7 @@ public Integer getNextId() {
      * 
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TemplateMastersEntity selectWithItems(Integer typeId) {
         TemplateMastersEntity template = selectOnKey(typeId);
         List<TemplateItemsEntity> items = TemplateItemsDao.get().selectOnTypeId(typeId);
@@ -93,6 +95,7 @@ public void resetSequence() {
      * @param template
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TemplateMastersEntity selectOnName(String template) {
         String sql = "SELECT * FROM TEMPLATE_MASTERS WHERE TYPE_NAME = ? AND DELETE_FLAG = 0";
         return executeQuerySingle(sql, TemplateMastersEntity.class, template);
diff --git a/src/main/java/org/support/project/knowledge/dao/TokensDao.java b/src/main/java/org/support/project/knowledge/dao/TokensDao.java
index 02fed72dc..a1e7b781c 100644
--- a/src/main/java/org/support/project/knowledge/dao/TokensDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/TokensDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -28,6 +29,7 @@ public static TokensDao get() {
      * @param userId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TokensEntity selectOnUserId(Integer userId) {
         String sql = "SELECT * FROM TOKENS WHERE USER_ID = ? AND DELETE_FLAG = 0";
         return executeQuerySingle(sql, TokensEntity.class, userId);
diff --git a/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
index 6cf0c3258..5e72ee923 100644
--- a/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -33,6 +34,7 @@ public static ViewHistoriesDao get() {
      * @param userId
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<Long> selectViewdKnowledgeIds(List<StockKnowledge> stocks, Integer userId) {
         if (stocks == null || stocks.isEmpty()) {
             return new ArrayList<>();
@@ -54,6 +56,7 @@ public List<Long> selectViewdKnowledgeIds(List<StockKnowledge> stocks, Integer u
         return executeQueryList(sql.toString(), Long.class, params.toArray(new Object[0]));
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public long selectCountOnKnowledgeId(Long knowledgeId) {
         String sql = "SELECT COUNT(*) FROM VIEW_HISTORIES WHERE KNOWLEDGE_ID = ?";
         return executeQuerySingle(sql, Long.class, knowledgeId);
diff --git a/src/main/java/org/support/project/knowledge/dao/WebhookConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/WebhookConfigsDao.java
index 5821fde95..40508082c 100644
--- a/src/main/java/org/support/project/knowledge/dao/WebhookConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/WebhookConfigsDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -34,6 +35,7 @@ public static WebhookConfigsDao get() {
     /**
      * IDを採番 ※コミットしなくても次のIDを採番する為、保存しなければ欠番になる
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer getNextId() {
         String sql = "SELECT MAX(HOOK_ID) FROM WEBHOOK_CONFIGS;";
         Integer integer = executeQuerySingle(sql, Integer.class);
@@ -50,6 +52,7 @@ public Integer getNextId() {
      * @param hook
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhookConfigsEntity> selectOnHook(String hook) {
         String sql = "SELECT * FROM WEBHOOK_CONFIGS WHERE HOOK = ? AND DELETE_FLAG = 0";
         return executeQueryList(sql, WebhookConfigsEntity.class, hook);
diff --git a/src/main/java/org/support/project/knowledge/dao/WebhooksDao.java b/src/main/java/org/support/project/knowledge/dao/WebhooksDao.java
index 1676196fb..2780c729a 100644
--- a/src/main/java/org/support/project/knowledge/dao/WebhooksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/WebhooksDao.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -32,6 +33,7 @@ public static WebhooksDao get() {
      * @param status
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhooksEntity> selectOnStatus(int status) {
         String sql = "SELECT * FROM WEBHOOKS WHERE STATUS = ? AND DELETE_FLAG = 0";
         return executeQueryList(sql, WebhooksEntity.class, status);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
index ca9d49904..48f17cdc7 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
@@ -44,6 +44,7 @@ public static GenAccountImagesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<AccountImagesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all.sql");
         return executeQueryList(sql, AccountImagesEntity.class);
@@ -54,6 +55,7 @@ public List<AccountImagesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<AccountImagesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, AccountImagesEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<AccountImagesEntity> physicalSelectAllWithPager(int limit, int offse
      * @param  imageId imageId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public AccountImagesEntity physicalSelectOnKey(Long imageId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, AccountImagesEntity.class, imageId);
@@ -71,6 +74,7 @@ public AccountImagesEntity physicalSelectOnKey(Long imageId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<AccountImagesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all.sql");
         return executeQueryList(sql, AccountImagesEntity.class);
@@ -81,6 +85,7 @@ public List<AccountImagesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<AccountImagesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all_with_pager.sql");
         return executeQueryList(sql, AccountImagesEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<AccountImagesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -98,6 +104,7 @@ public Integer selectCountAll() {
      * @param  imageId imageId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public AccountImagesEntity selectOnKey(Long imageId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_on_key.sql");
         return executeQuerySingle(sql, AccountImagesEntity.class, imageId);
@@ -106,6 +113,7 @@ public AccountImagesEntity selectOnKey(Long imageId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM ACCOUNT_IMAGES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
index 98b7a15b1..84312aa0b 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
@@ -43,6 +43,7 @@ public static GenActivitiesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ActivitiesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql");
         return executeQueryList(sql, ActivitiesEntity.class);
@@ -53,6 +54,7 @@ public List<ActivitiesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ActivitiesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, ActivitiesEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<ActivitiesEntity> physicalSelectAllWithPager(int limit, int offset)
      * @param  activityNo activityNo
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ActivitiesEntity physicalSelectOnKey(Long activityNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, ActivitiesEntity.class, activityNo);
@@ -70,6 +73,7 @@ public ActivitiesEntity physicalSelectOnKey(Long activityNo) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ActivitiesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql");
         return executeQueryList(sql, ActivitiesEntity.class);
@@ -80,6 +84,7 @@ public List<ActivitiesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ActivitiesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql");
         return executeQueryList(sql, ActivitiesEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<ActivitiesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  activityNo activityNo
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ActivitiesEntity selectOnKey(Long activityNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_on_key.sql");
         return executeQuerySingle(sql, ActivitiesEntity.class, activityNo);
@@ -105,6 +112,7 @@ public ActivitiesEntity selectOnKey(Long activityNo) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM ACTIVITIES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
index 3c968a909..ec4abda90 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
@@ -43,6 +43,7 @@ public static GenBadgesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<BadgesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql");
         return executeQueryList(sql, BadgesEntity.class);
@@ -53,6 +54,7 @@ public List<BadgesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<BadgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, BadgesEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<BadgesEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  no no
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public BadgesEntity physicalSelectOnKey(Integer no) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, BadgesEntity.class, no);
@@ -70,6 +73,7 @@ public BadgesEntity physicalSelectOnKey(Integer no) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<BadgesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql");
         return executeQueryList(sql, BadgesEntity.class);
@@ -80,6 +84,7 @@ public List<BadgesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<BadgesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql");
         return executeQueryList(sql, BadgesEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<BadgesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  no no
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public BadgesEntity selectOnKey(Integer no) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_on_key.sql");
         return executeQuerySingle(sql, BadgesEntity.class, no);
@@ -105,6 +112,7 @@ public BadgesEntity selectOnKey(Integer no) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM BADGES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
index 58fe6004a..ee8ea80fe 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
@@ -43,6 +43,7 @@ public static GenCommentsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<CommentsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all.sql");
         return executeQueryList(sql, CommentsEntity.class);
@@ -53,6 +54,7 @@ public List<CommentsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<CommentsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, CommentsEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<CommentsEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  commentNo commentNo
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public CommentsEntity physicalSelectOnKey(Long commentNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, CommentsEntity.class, commentNo);
@@ -70,6 +73,7 @@ public CommentsEntity physicalSelectOnKey(Long commentNo) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<CommentsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all.sql");
         return executeQueryList(sql, CommentsEntity.class);
@@ -80,6 +84,7 @@ public List<CommentsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<CommentsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all_with_pager.sql");
         return executeQueryList(sql, CommentsEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<CommentsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  commentNo commentNo
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public CommentsEntity selectOnKey(Long commentNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_on_key.sql");
         return executeQuerySingle(sql, CommentsEntity.class, commentNo);
@@ -105,6 +112,7 @@ public CommentsEntity selectOnKey(Long commentNo) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM COMMENTS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java
index 9ae137501..292ea2e95 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java
@@ -43,6 +43,7 @@ public static GenDraftItemValuesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all.sql");
         return executeQueryList(sql, DraftItemValuesEntity.class);
@@ -53,6 +54,7 @@ public List<DraftItemValuesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, DraftItemValuesEntity.class, limit, offset);
@@ -64,6 +66,7 @@ public List<DraftItemValuesEntity> physicalSelectAllWithPager(int limit, int off
      * @param  typeId typeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public DraftItemValuesEntity physicalSelectOnKey(Long draftId, Integer itemNo, Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, DraftItemValuesEntity.class, draftId, itemNo, typeId);
@@ -72,6 +75,7 @@ public DraftItemValuesEntity physicalSelectOnKey(Long draftId, Integer itemNo, I
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all.sql");
         return executeQueryList(sql, DraftItemValuesEntity.class);
@@ -82,6 +86,7 @@ public List<DraftItemValuesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all_with_pager.sql");
         return executeQueryList(sql, DraftItemValuesEntity.class, limit, offset);
@@ -90,6 +95,7 @@ public List<DraftItemValuesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -101,6 +107,7 @@ public Integer selectCountAll() {
      * @param  typeId typeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public DraftItemValuesEntity selectOnKey(Long draftId, Integer itemNo, Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_on_key.sql");
         return executeQuerySingle(sql, DraftItemValuesEntity.class, draftId, itemNo, typeId);
@@ -110,6 +117,7 @@ public DraftItemValuesEntity selectOnKey(Long draftId, Integer itemNo, Integer t
      * @param draftId draftId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> selectOnDraftId(Long draftId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_on_draft_id.sql");
         return executeQueryList(sql, DraftItemValuesEntity.class, draftId);
@@ -119,6 +127,7 @@ public List<DraftItemValuesEntity> selectOnDraftId(Long draftId) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> selectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_on_item_no.sql");
         return executeQueryList(sql, DraftItemValuesEntity.class, itemNo);
@@ -128,6 +137,7 @@ public List<DraftItemValuesEntity> selectOnItemNo(Integer itemNo) {
      * @param typeId typeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> selectOnTypeId(Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_on_type_id.sql");
         return executeQueryList(sql, DraftItemValuesEntity.class, typeId);
@@ -137,6 +147,7 @@ public List<DraftItemValuesEntity> selectOnTypeId(Integer typeId) {
      * @param draftId draftId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> physicalSelectOnDraftId(Long draftId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_on_draft_id.sql");
         return executeQueryList(sql, DraftItemValuesEntity.class, draftId);
@@ -146,6 +157,7 @@ public List<DraftItemValuesEntity> physicalSelectOnDraftId(Long draftId) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> physicalSelectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_on_item_no.sql");
         return executeQueryList(sql, DraftItemValuesEntity.class, itemNo);
@@ -155,6 +167,7 @@ public List<DraftItemValuesEntity> physicalSelectOnItemNo(Integer itemNo) {
      * @param typeId typeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> physicalSelectOnTypeId(Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_on_type_id.sql");
         return executeQueryList(sql, DraftItemValuesEntity.class, typeId);
@@ -163,6 +176,7 @@ public List<DraftItemValuesEntity> physicalSelectOnTypeId(Integer typeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM DRAFT_ITEM_VALUES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
index 32e39228b..5a5a22fd7 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
@@ -43,6 +43,7 @@ public static GenDraftKnowledgesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftKnowledgesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all.sql");
         return executeQueryList(sql, DraftKnowledgesEntity.class);
@@ -53,6 +54,7 @@ public List<DraftKnowledgesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftKnowledgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, DraftKnowledgesEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<DraftKnowledgesEntity> physicalSelectAllWithPager(int limit, int off
      * @param  draftId draftId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public DraftKnowledgesEntity physicalSelectOnKey(Long draftId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, DraftKnowledgesEntity.class, draftId);
@@ -70,6 +73,7 @@ public DraftKnowledgesEntity physicalSelectOnKey(Long draftId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftKnowledgesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all.sql");
         return executeQueryList(sql, DraftKnowledgesEntity.class);
@@ -80,6 +84,7 @@ public List<DraftKnowledgesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftKnowledgesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all_with_pager.sql");
         return executeQueryList(sql, DraftKnowledgesEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<DraftKnowledgesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  draftId draftId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public DraftKnowledgesEntity selectOnKey(Long draftId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_on_key.sql");
         return executeQuerySingle(sql, DraftKnowledgesEntity.class, draftId);
@@ -105,6 +112,7 @@ public DraftKnowledgesEntity selectOnKey(Long draftId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM DRAFT_KNOWLEDGES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java
index a67a057e1..9364fcd38 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java
@@ -43,6 +43,7 @@ public static GenEventsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<EventsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all.sql");
         return executeQueryList(sql, EventsEntity.class);
@@ -53,6 +54,7 @@ public List<EventsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<EventsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, EventsEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<EventsEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public EventsEntity physicalSelectOnKey(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, EventsEntity.class, knowledgeId);
@@ -70,6 +73,7 @@ public EventsEntity physicalSelectOnKey(Long knowledgeId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<EventsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all.sql");
         return executeQueryList(sql, EventsEntity.class);
@@ -80,6 +84,7 @@ public List<EventsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<EventsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all_with_pager.sql");
         return executeQueryList(sql, EventsEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<EventsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public EventsEntity selectOnKey(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_on_key.sql");
         return executeQuerySingle(sql, EventsEntity.class, knowledgeId);
@@ -105,6 +112,7 @@ public EventsEntity selectOnKey(Long knowledgeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM EVENTS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java
index 3d45fed52..0160a8b26 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java
@@ -43,6 +43,7 @@ public static GenItemChoicesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all.sql");
         return executeQueryList(sql, ItemChoicesEntity.class);
@@ -53,6 +54,7 @@ public List<ItemChoicesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, ItemChoicesEntity.class, limit, offset);
@@ -64,6 +66,7 @@ public List<ItemChoicesEntity> physicalSelectAllWithPager(int limit, int offset)
      * @param  typeId typeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ItemChoicesEntity physicalSelectOnKey(Integer choiceNo, Integer itemNo, Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, ItemChoicesEntity.class, choiceNo, itemNo, typeId);
@@ -72,6 +75,7 @@ public ItemChoicesEntity physicalSelectOnKey(Integer choiceNo, Integer itemNo, I
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all.sql");
         return executeQueryList(sql, ItemChoicesEntity.class);
@@ -82,6 +86,7 @@ public List<ItemChoicesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all_with_pager.sql");
         return executeQueryList(sql, ItemChoicesEntity.class, limit, offset);
@@ -90,6 +95,7 @@ public List<ItemChoicesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -101,6 +107,7 @@ public Integer selectCountAll() {
      * @param  typeId typeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ItemChoicesEntity selectOnKey(Integer choiceNo, Integer itemNo, Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_on_key.sql");
         return executeQuerySingle(sql, ItemChoicesEntity.class, choiceNo, itemNo, typeId);
@@ -110,6 +117,7 @@ public ItemChoicesEntity selectOnKey(Integer choiceNo, Integer itemNo, Integer t
      * @param choiceNo choiceNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> selectOnChoiceNo(Integer choiceNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_on_choice_no.sql");
         return executeQueryList(sql, ItemChoicesEntity.class, choiceNo);
@@ -119,6 +127,7 @@ public List<ItemChoicesEntity> selectOnChoiceNo(Integer choiceNo) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> selectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_on_item_no.sql");
         return executeQueryList(sql, ItemChoicesEntity.class, itemNo);
@@ -128,6 +137,7 @@ public List<ItemChoicesEntity> selectOnItemNo(Integer itemNo) {
      * @param typeId typeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> selectOnTypeId(Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_on_type_id.sql");
         return executeQueryList(sql, ItemChoicesEntity.class, typeId);
@@ -137,6 +147,7 @@ public List<ItemChoicesEntity> selectOnTypeId(Integer typeId) {
      * @param choiceNo choiceNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> physicalSelectOnChoiceNo(Integer choiceNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_on_choice_no.sql");
         return executeQueryList(sql, ItemChoicesEntity.class, choiceNo);
@@ -146,6 +157,7 @@ public List<ItemChoicesEntity> physicalSelectOnChoiceNo(Integer choiceNo) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> physicalSelectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_on_item_no.sql");
         return executeQueryList(sql, ItemChoicesEntity.class, itemNo);
@@ -155,6 +167,7 @@ public List<ItemChoicesEntity> physicalSelectOnItemNo(Integer itemNo) {
      * @param typeId typeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> physicalSelectOnTypeId(Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_on_type_id.sql");
         return executeQueryList(sql, ItemChoicesEntity.class, typeId);
@@ -163,6 +176,7 @@ public List<ItemChoicesEntity> physicalSelectOnTypeId(Integer typeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM ITEM_CHOICES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java
index 10293959e..da6171a3f 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java
@@ -43,6 +43,7 @@ public static GenKnowledgeEditGroupsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all.sql");
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class);
@@ -53,6 +54,7 @@ public List<KnowledgeEditGroupsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<KnowledgeEditGroupsEntity> physicalSelectAllWithPager(int limit, int
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeEditGroupsEntity physicalSelectOnKey(Integer groupId, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeEditGroupsEntity.class, groupId, knowledgeId);
@@ -71,6 +74,7 @@ public KnowledgeEditGroupsEntity physicalSelectOnKey(Integer groupId, Long knowl
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all.sql");
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class);
@@ -81,6 +85,7 @@ public List<KnowledgeEditGroupsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<KnowledgeEditGroupsEntity> selectAllWidthPager(int limit, int offset
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeEditGroupsEntity selectOnKey(Integer groupId, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeEditGroupsEntity.class, groupId, knowledgeId);
@@ -108,6 +115,7 @@ public KnowledgeEditGroupsEntity selectOnKey(Integer groupId, Long knowledgeId)
      * @param groupId groupId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> selectOnGroupId(Integer groupId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_on_group_id.sql");
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class, groupId);
@@ -117,6 +125,7 @@ public List<KnowledgeEditGroupsEntity> selectOnGroupId(Integer groupId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class, knowledgeId);
@@ -126,6 +135,7 @@ public List<KnowledgeEditGroupsEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param groupId groupId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> physicalSelectOnGroupId(Integer groupId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_on_group_id.sql");
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class, groupId);
@@ -135,6 +145,7 @@ public List<KnowledgeEditGroupsEntity> physicalSelectOnGroupId(Integer groupId)
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class, knowledgeId);
@@ -143,6 +154,7 @@ public List<KnowledgeEditGroupsEntity> physicalSelectOnKnowledgeId(Long knowledg
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM KNOWLEDGE_EDIT_GROUPS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java
index f57274531..2f1718f82 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java
@@ -43,6 +43,7 @@ public static GenKnowledgeEditUsersDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all.sql");
         return executeQueryList(sql, KnowledgeEditUsersEntity.class);
@@ -53,6 +54,7 @@ public List<KnowledgeEditUsersEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeEditUsersEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<KnowledgeEditUsersEntity> physicalSelectAllWithPager(int limit, int
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeEditUsersEntity physicalSelectOnKey(Long knowledgeId, Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeEditUsersEntity.class, knowledgeId, userId);
@@ -71,6 +74,7 @@ public KnowledgeEditUsersEntity physicalSelectOnKey(Long knowledgeId, Integer us
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all.sql");
         return executeQueryList(sql, KnowledgeEditUsersEntity.class);
@@ -81,6 +85,7 @@ public List<KnowledgeEditUsersEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeEditUsersEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<KnowledgeEditUsersEntity> selectAllWidthPager(int limit, int offset)
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeEditUsersEntity selectOnKey(Long knowledgeId, Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeEditUsersEntity.class, knowledgeId, userId);
@@ -108,6 +115,7 @@ public KnowledgeEditUsersEntity selectOnKey(Long knowledgeId, Integer userId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeEditUsersEntity.class, knowledgeId);
@@ -117,6 +125,7 @@ public List<KnowledgeEditUsersEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param userId userId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> selectOnUserId(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_on_user_id.sql");
         return executeQueryList(sql, KnowledgeEditUsersEntity.class, userId);
@@ -126,6 +135,7 @@ public List<KnowledgeEditUsersEntity> selectOnUserId(Integer userId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeEditUsersEntity.class, knowledgeId);
@@ -135,6 +145,7 @@ public List<KnowledgeEditUsersEntity> physicalSelectOnKnowledgeId(Long knowledge
      * @param userId userId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> physicalSelectOnUserId(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_on_user_id.sql");
         return executeQueryList(sql, KnowledgeEditUsersEntity.class, userId);
@@ -143,6 +154,7 @@ public List<KnowledgeEditUsersEntity> physicalSelectOnUserId(Integer userId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM KNOWLEDGE_EDIT_USERS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
index dd5f775b0..f2194f67f 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
@@ -44,6 +44,7 @@ public static GenKnowledgeFilesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all.sql");
         return executeQueryList(sql, KnowledgeFilesEntity.class);
@@ -54,6 +55,7 @@ public List<KnowledgeFilesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeFilesEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<KnowledgeFilesEntity> physicalSelectAllWithPager(int limit, int offs
      * @param  fileNo fileNo
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeFilesEntity physicalSelectOnKey(Long fileNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeFilesEntity.class, fileNo);
@@ -71,6 +74,7 @@ public KnowledgeFilesEntity physicalSelectOnKey(Long fileNo) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all.sql");
         return executeQueryList(sql, KnowledgeFilesEntity.class);
@@ -81,6 +85,7 @@ public List<KnowledgeFilesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeFilesEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<KnowledgeFilesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -98,6 +104,7 @@ public Integer selectCountAll() {
      * @param  fileNo fileNo
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeFilesEntity selectOnKey(Long fileNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeFilesEntity.class, fileNo);
@@ -106,6 +113,7 @@ public KnowledgeFilesEntity selectOnKey(Long fileNo) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM KNOWLEDGE_FILES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java
index a2192177a..6fd2d3d8f 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java
@@ -43,6 +43,7 @@ public static GenKnowledgeGroupsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all.sql");
         return executeQueryList(sql, KnowledgeGroupsEntity.class);
@@ -53,6 +54,7 @@ public List<KnowledgeGroupsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeGroupsEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<KnowledgeGroupsEntity> physicalSelectAllWithPager(int limit, int off
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeGroupsEntity physicalSelectOnKey(Integer groupId, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeGroupsEntity.class, groupId, knowledgeId);
@@ -71,6 +74,7 @@ public KnowledgeGroupsEntity physicalSelectOnKey(Integer groupId, Long knowledge
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all.sql");
         return executeQueryList(sql, KnowledgeGroupsEntity.class);
@@ -81,6 +85,7 @@ public List<KnowledgeGroupsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeGroupsEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<KnowledgeGroupsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeGroupsEntity selectOnKey(Integer groupId, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeGroupsEntity.class, groupId, knowledgeId);
@@ -108,6 +115,7 @@ public KnowledgeGroupsEntity selectOnKey(Integer groupId, Long knowledgeId) {
      * @param groupId groupId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> selectOnGroupId(Integer groupId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_on_group_id.sql");
         return executeQueryList(sql, KnowledgeGroupsEntity.class, groupId);
@@ -117,6 +125,7 @@ public List<KnowledgeGroupsEntity> selectOnGroupId(Integer groupId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeGroupsEntity.class, knowledgeId);
@@ -126,6 +135,7 @@ public List<KnowledgeGroupsEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param groupId groupId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> physicalSelectOnGroupId(Integer groupId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_on_group_id.sql");
         return executeQueryList(sql, KnowledgeGroupsEntity.class, groupId);
@@ -135,6 +145,7 @@ public List<KnowledgeGroupsEntity> physicalSelectOnGroupId(Integer groupId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeGroupsEntity.class, knowledgeId);
@@ -143,6 +154,7 @@ public List<KnowledgeGroupsEntity> physicalSelectOnKnowledgeId(Long knowledgeId)
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM KNOWLEDGE_GROUPS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java
index 46ad29627..4031d8d38 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java
@@ -43,6 +43,7 @@ public static GenKnowledgeHistoriesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all.sql");
         return executeQueryList(sql, KnowledgeHistoriesEntity.class);
@@ -53,6 +54,7 @@ public List<KnowledgeHistoriesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeHistoriesEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<KnowledgeHistoriesEntity> physicalSelectAllWithPager(int limit, int
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeHistoriesEntity physicalSelectOnKey(Integer historyNo, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeHistoriesEntity.class, historyNo, knowledgeId);
@@ -71,6 +74,7 @@ public KnowledgeHistoriesEntity physicalSelectOnKey(Integer historyNo, Long know
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all.sql");
         return executeQueryList(sql, KnowledgeHistoriesEntity.class);
@@ -81,6 +85,7 @@ public List<KnowledgeHistoriesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeHistoriesEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<KnowledgeHistoriesEntity> selectAllWidthPager(int limit, int offset)
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeHistoriesEntity selectOnKey(Integer historyNo, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeHistoriesEntity.class, historyNo, knowledgeId);
@@ -108,6 +115,7 @@ public KnowledgeHistoriesEntity selectOnKey(Integer historyNo, Long knowledgeId)
      * @param historyNo historyNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> selectOnHistoryNo(Integer historyNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_on_history_no.sql");
         return executeQueryList(sql, KnowledgeHistoriesEntity.class, historyNo);
@@ -117,6 +125,7 @@ public List<KnowledgeHistoriesEntity> selectOnHistoryNo(Integer historyNo) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeHistoriesEntity.class, knowledgeId);
@@ -126,6 +135,7 @@ public List<KnowledgeHistoriesEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param historyNo historyNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> physicalSelectOnHistoryNo(Integer historyNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_on_history_no.sql");
         return executeQueryList(sql, KnowledgeHistoriesEntity.class, historyNo);
@@ -135,6 +145,7 @@ public List<KnowledgeHistoriesEntity> physicalSelectOnHistoryNo(Integer historyN
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeHistoriesEntity.class, knowledgeId);
@@ -143,6 +154,7 @@ public List<KnowledgeHistoriesEntity> physicalSelectOnKnowledgeId(Long knowledge
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM KNOWLEDGE_HISTORIES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java
index 8f1a94493..e3545f10e 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java
@@ -43,6 +43,7 @@ public static GenKnowledgeItemValuesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all.sql");
         return executeQueryList(sql, KnowledgeItemValuesEntity.class);
@@ -53,6 +54,7 @@ public List<KnowledgeItemValuesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, limit, offset);
@@ -64,6 +66,7 @@ public List<KnowledgeItemValuesEntity> physicalSelectAllWithPager(int limit, int
      * @param  typeId typeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeItemValuesEntity physicalSelectOnKey(Integer itemNo, Long knowledgeId, Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeItemValuesEntity.class, itemNo, knowledgeId, typeId);
@@ -72,6 +75,7 @@ public KnowledgeItemValuesEntity physicalSelectOnKey(Integer itemNo, Long knowle
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all.sql");
         return executeQueryList(sql, KnowledgeItemValuesEntity.class);
@@ -82,6 +86,7 @@ public List<KnowledgeItemValuesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, limit, offset);
@@ -90,6 +95,7 @@ public List<KnowledgeItemValuesEntity> selectAllWidthPager(int limit, int offset
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -101,6 +107,7 @@ public Integer selectCountAll() {
      * @param  typeId typeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeItemValuesEntity selectOnKey(Integer itemNo, Long knowledgeId, Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeItemValuesEntity.class, itemNo, knowledgeId, typeId);
@@ -110,6 +117,7 @@ public KnowledgeItemValuesEntity selectOnKey(Integer itemNo, Long knowledgeId, I
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> selectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_on_item_no.sql");
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, itemNo);
@@ -119,6 +127,7 @@ public List<KnowledgeItemValuesEntity> selectOnItemNo(Integer itemNo) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, knowledgeId);
@@ -128,6 +137,7 @@ public List<KnowledgeItemValuesEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param typeId typeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> selectOnTypeId(Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_on_type_id.sql");
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, typeId);
@@ -137,6 +147,7 @@ public List<KnowledgeItemValuesEntity> selectOnTypeId(Integer typeId) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> physicalSelectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_on_item_no.sql");
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, itemNo);
@@ -146,6 +157,7 @@ public List<KnowledgeItemValuesEntity> physicalSelectOnItemNo(Integer itemNo) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, knowledgeId);
@@ -155,6 +167,7 @@ public List<KnowledgeItemValuesEntity> physicalSelectOnKnowledgeId(Long knowledg
      * @param typeId typeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> physicalSelectOnTypeId(Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_on_type_id.sql");
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, typeId);
@@ -163,6 +176,7 @@ public List<KnowledgeItemValuesEntity> physicalSelectOnTypeId(Integer typeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM KNOWLEDGE_ITEM_VALUES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java
index f3ddcbeeb..0a82fea17 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java
@@ -43,6 +43,7 @@ public static GenKnowledgeTagsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all.sql");
         return executeQueryList(sql, KnowledgeTagsEntity.class);
@@ -53,6 +54,7 @@ public List<KnowledgeTagsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeTagsEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<KnowledgeTagsEntity> physicalSelectAllWithPager(int limit, int offse
      * @param  tagId tagId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeTagsEntity physicalSelectOnKey(Long knowledgeId, Integer tagId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeTagsEntity.class, knowledgeId, tagId);
@@ -71,6 +74,7 @@ public KnowledgeTagsEntity physicalSelectOnKey(Long knowledgeId, Integer tagId)
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all.sql");
         return executeQueryList(sql, KnowledgeTagsEntity.class);
@@ -81,6 +85,7 @@ public List<KnowledgeTagsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeTagsEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<KnowledgeTagsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  tagId tagId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeTagsEntity selectOnKey(Long knowledgeId, Integer tagId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeTagsEntity.class, knowledgeId, tagId);
@@ -108,6 +115,7 @@ public KnowledgeTagsEntity selectOnKey(Long knowledgeId, Integer tagId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeTagsEntity.class, knowledgeId);
@@ -117,6 +125,7 @@ public List<KnowledgeTagsEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param tagId tagId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> selectOnTagId(Integer tagId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_on_tag_id.sql");
         return executeQueryList(sql, KnowledgeTagsEntity.class, tagId);
@@ -126,6 +135,7 @@ public List<KnowledgeTagsEntity> selectOnTagId(Integer tagId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeTagsEntity.class, knowledgeId);
@@ -135,6 +145,7 @@ public List<KnowledgeTagsEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
      * @param tagId tagId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> physicalSelectOnTagId(Integer tagId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_on_tag_id.sql");
         return executeQueryList(sql, KnowledgeTagsEntity.class, tagId);
@@ -143,6 +154,7 @@ public List<KnowledgeTagsEntity> physicalSelectOnTagId(Integer tagId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM KNOWLEDGE_TAGS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java
index 3d246f340..6a4331f8f 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java
@@ -43,6 +43,7 @@ public static GenKnowledgeUsersDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all.sql");
         return executeQueryList(sql, KnowledgeUsersEntity.class);
@@ -53,6 +54,7 @@ public List<KnowledgeUsersEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeUsersEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<KnowledgeUsersEntity> physicalSelectAllWithPager(int limit, int offs
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeUsersEntity physicalSelectOnKey(Long knowledgeId, Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeUsersEntity.class, knowledgeId, userId);
@@ -71,6 +74,7 @@ public KnowledgeUsersEntity physicalSelectOnKey(Long knowledgeId, Integer userId
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all.sql");
         return executeQueryList(sql, KnowledgeUsersEntity.class);
@@ -81,6 +85,7 @@ public List<KnowledgeUsersEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgeUsersEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<KnowledgeUsersEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeUsersEntity selectOnKey(Long knowledgeId, Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgeUsersEntity.class, knowledgeId, userId);
@@ -108,6 +115,7 @@ public KnowledgeUsersEntity selectOnKey(Long knowledgeId, Integer userId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeUsersEntity.class, knowledgeId);
@@ -117,6 +125,7 @@ public List<KnowledgeUsersEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param userId userId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> selectOnUserId(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_on_user_id.sql");
         return executeQueryList(sql, KnowledgeUsersEntity.class, userId);
@@ -126,6 +135,7 @@ public List<KnowledgeUsersEntity> selectOnUserId(Integer userId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, KnowledgeUsersEntity.class, knowledgeId);
@@ -135,6 +145,7 @@ public List<KnowledgeUsersEntity> physicalSelectOnKnowledgeId(Long knowledgeId)
      * @param userId userId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> physicalSelectOnUserId(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_on_user_id.sql");
         return executeQueryList(sql, KnowledgeUsersEntity.class, userId);
@@ -143,6 +154,7 @@ public List<KnowledgeUsersEntity> physicalSelectOnUserId(Integer userId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM KNOWLEDGE_USERS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
index 0497b7936..a0c862c2d 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
@@ -43,6 +43,7 @@ public static GenKnowledgesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all.sql");
         return executeQueryList(sql, KnowledgesEntity.class);
@@ -53,6 +54,7 @@ public List<KnowledgesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgesEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<KnowledgesEntity> physicalSelectAllWithPager(int limit, int offset)
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgesEntity physicalSelectOnKey(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgesEntity.class, knowledgeId);
@@ -70,6 +73,7 @@ public KnowledgesEntity physicalSelectOnKey(Long knowledgeId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all.sql");
         return executeQueryList(sql, KnowledgesEntity.class);
@@ -80,6 +84,7 @@ public List<KnowledgesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all_with_pager.sql");
         return executeQueryList(sql, KnowledgesEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<KnowledgesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgesEntity selectOnKey(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_on_key.sql");
         return executeQuerySingle(sql, KnowledgesEntity.class, knowledgeId);
@@ -105,6 +112,7 @@ public KnowledgesEntity selectOnKey(Long knowledgeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM KNOWLEDGES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
index 6389575a8..83ddaf3fd 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
@@ -43,6 +43,7 @@ public static GenLikeCommentsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikeCommentsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql");
         return executeQueryList(sql, LikeCommentsEntity.class);
@@ -53,6 +54,7 @@ public List<LikeCommentsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikeCommentsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, LikeCommentsEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<LikeCommentsEntity> physicalSelectAllWithPager(int limit, int offset
      * @param  no no
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public LikeCommentsEntity physicalSelectOnKey(Long no) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, LikeCommentsEntity.class, no);
@@ -70,6 +73,7 @@ public LikeCommentsEntity physicalSelectOnKey(Long no) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikeCommentsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql");
         return executeQueryList(sql, LikeCommentsEntity.class);
@@ -80,6 +84,7 @@ public List<LikeCommentsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikeCommentsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql");
         return executeQueryList(sql, LikeCommentsEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<LikeCommentsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  no no
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public LikeCommentsEntity selectOnKey(Long no) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_on_key.sql");
         return executeQuerySingle(sql, LikeCommentsEntity.class, no);
@@ -105,6 +112,7 @@ public LikeCommentsEntity selectOnKey(Long no) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM LIKE_COMMENTS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
index 4b7e4b128..2497deb0b 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
@@ -43,6 +43,7 @@ public static GenLikesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all.sql");
         return executeQueryList(sql, LikesEntity.class);
@@ -53,6 +54,7 @@ public List<LikesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, LikesEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<LikesEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  no no
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public LikesEntity physicalSelectOnKey(Long no) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, LikesEntity.class, no);
@@ -70,6 +73,7 @@ public LikesEntity physicalSelectOnKey(Long no) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all.sql");
         return executeQueryList(sql, LikesEntity.class);
@@ -80,6 +84,7 @@ public List<LikesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all_with_pager.sql");
         return executeQueryList(sql, LikesEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<LikesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  no no
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public LikesEntity selectOnKey(Long no) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_on_key.sql");
         return executeQuerySingle(sql, LikesEntity.class, no);
@@ -105,6 +112,7 @@ public LikesEntity selectOnKey(Long no) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM LIKES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java
index 1f488fa5a..1074dba68 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java
@@ -43,6 +43,7 @@ public static GenMailHookConditionsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all.sql");
         return executeQueryList(sql, MailHookConditionsEntity.class);
@@ -53,6 +54,7 @@ public List<MailHookConditionsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, MailHookConditionsEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<MailHookConditionsEntity> physicalSelectAllWithPager(int limit, int
      * @param  hookId hookId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailHookConditionsEntity physicalSelectOnKey(Integer conditionNo, Integer hookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, MailHookConditionsEntity.class, conditionNo, hookId);
@@ -71,6 +74,7 @@ public MailHookConditionsEntity physicalSelectOnKey(Integer conditionNo, Integer
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all.sql");
         return executeQueryList(sql, MailHookConditionsEntity.class);
@@ -81,6 +85,7 @@ public List<MailHookConditionsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all_with_pager.sql");
         return executeQueryList(sql, MailHookConditionsEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<MailHookConditionsEntity> selectAllWidthPager(int limit, int offset)
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  hookId hookId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailHookConditionsEntity selectOnKey(Integer conditionNo, Integer hookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_on_key.sql");
         return executeQuerySingle(sql, MailHookConditionsEntity.class, conditionNo, hookId);
@@ -108,6 +115,7 @@ public MailHookConditionsEntity selectOnKey(Integer conditionNo, Integer hookId)
      * @param conditionNo conditionNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> selectOnConditionNo(Integer conditionNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_on_condition_no.sql");
         return executeQueryList(sql, MailHookConditionsEntity.class, conditionNo);
@@ -117,6 +125,7 @@ public List<MailHookConditionsEntity> selectOnConditionNo(Integer conditionNo) {
      * @param hookId hookId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> selectOnHookId(Integer hookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_on_hook_id.sql");
         return executeQueryList(sql, MailHookConditionsEntity.class, hookId);
@@ -126,6 +135,7 @@ public List<MailHookConditionsEntity> selectOnHookId(Integer hookId) {
      * @param conditionNo conditionNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> physicalSelectOnConditionNo(Integer conditionNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_on_condition_no.sql");
         return executeQueryList(sql, MailHookConditionsEntity.class, conditionNo);
@@ -135,6 +145,7 @@ public List<MailHookConditionsEntity> physicalSelectOnConditionNo(Integer condit
      * @param hookId hookId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> physicalSelectOnHookId(Integer hookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_on_hook_id.sql");
         return executeQueryList(sql, MailHookConditionsEntity.class, hookId);
@@ -143,6 +154,7 @@ public List<MailHookConditionsEntity> physicalSelectOnHookId(Integer hookId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM MAIL_HOOK_CONDITIONS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
index 68196a8ea..daae414e7 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
@@ -43,6 +43,7 @@ public static GenMailHooksDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHooksEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all.sql");
         return executeQueryList(sql, MailHooksEntity.class);
@@ -53,6 +54,7 @@ public List<MailHooksEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHooksEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, MailHooksEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<MailHooksEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  hookId hookId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailHooksEntity physicalSelectOnKey(Integer hookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, MailHooksEntity.class, hookId);
@@ -70,6 +73,7 @@ public MailHooksEntity physicalSelectOnKey(Integer hookId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHooksEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all.sql");
         return executeQueryList(sql, MailHooksEntity.class);
@@ -80,6 +84,7 @@ public List<MailHooksEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHooksEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all_with_pager.sql");
         return executeQueryList(sql, MailHooksEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<MailHooksEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  hookId hookId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailHooksEntity selectOnKey(Integer hookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_on_key.sql");
         return executeQuerySingle(sql, MailHooksEntity.class, hookId);
@@ -105,6 +112,7 @@ public MailHooksEntity selectOnKey(Integer hookId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM MAIL_HOOKS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java
index 88db5e38f..9d4c8852d 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java
@@ -43,6 +43,7 @@ public static GenMailLocaleTemplatesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all.sql");
         return executeQueryList(sql, MailLocaleTemplatesEntity.class);
@@ -53,6 +54,7 @@ public List<MailLocaleTemplatesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, MailLocaleTemplatesEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<MailLocaleTemplatesEntity> physicalSelectAllWithPager(int limit, int
      * @param  templateId templateId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailLocaleTemplatesEntity physicalSelectOnKey(String key, String templateId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, MailLocaleTemplatesEntity.class, key, templateId);
@@ -71,6 +74,7 @@ public MailLocaleTemplatesEntity physicalSelectOnKey(String key, String template
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all.sql");
         return executeQueryList(sql, MailLocaleTemplatesEntity.class);
@@ -81,6 +85,7 @@ public List<MailLocaleTemplatesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all_with_pager.sql");
         return executeQueryList(sql, MailLocaleTemplatesEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<MailLocaleTemplatesEntity> selectAllWidthPager(int limit, int offset
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  templateId templateId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailLocaleTemplatesEntity selectOnKey(String key, String templateId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_on_key.sql");
         return executeQuerySingle(sql, MailLocaleTemplatesEntity.class, key, templateId);
@@ -108,6 +115,7 @@ public MailLocaleTemplatesEntity selectOnKey(String key, String templateId) {
      * @param key key
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> selectOnKey(String key) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_on_col_key.sql");
         return executeQueryList(sql, MailLocaleTemplatesEntity.class, key);
@@ -117,6 +125,7 @@ public List<MailLocaleTemplatesEntity> selectOnKey(String key) {
      * @param templateId templateId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> selectOnTemplateId(String templateId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_on_template_id.sql");
         return executeQueryList(sql, MailLocaleTemplatesEntity.class, templateId);
@@ -126,6 +135,7 @@ public List<MailLocaleTemplatesEntity> selectOnTemplateId(String templateId) {
      * @param key key
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> physicalSelectOnKey(String key) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_on_col_key.sql");
         return executeQueryList(sql, MailLocaleTemplatesEntity.class, key);
@@ -135,6 +145,7 @@ public List<MailLocaleTemplatesEntity> physicalSelectOnKey(String key) {
      * @param templateId templateId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> physicalSelectOnTemplateId(String templateId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_on_template_id.sql");
         return executeQueryList(sql, MailLocaleTemplatesEntity.class, templateId);
@@ -143,6 +154,7 @@ public List<MailLocaleTemplatesEntity> physicalSelectOnTemplateId(String templat
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM MAIL_LOCALE_TEMPLATES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java
index a5c5c8fc4..b017644a7 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java
@@ -43,6 +43,7 @@ public static GenMailPostsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPostsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all.sql");
         return executeQueryList(sql, MailPostsEntity.class);
@@ -53,6 +54,7 @@ public List<MailPostsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPostsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, MailPostsEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<MailPostsEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  messageId messageId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailPostsEntity physicalSelectOnKey(String messageId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, MailPostsEntity.class, messageId);
@@ -70,6 +73,7 @@ public MailPostsEntity physicalSelectOnKey(String messageId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPostsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all.sql");
         return executeQueryList(sql, MailPostsEntity.class);
@@ -80,6 +84,7 @@ public List<MailPostsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPostsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all_with_pager.sql");
         return executeQueryList(sql, MailPostsEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<MailPostsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  messageId messageId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailPostsEntity selectOnKey(String messageId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_on_key.sql");
         return executeQuerySingle(sql, MailPostsEntity.class, messageId);
@@ -105,6 +112,7 @@ public MailPostsEntity selectOnKey(String messageId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM MAIL_POSTS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java
index 6f4dd9ddf..8c5170010 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java
@@ -43,6 +43,7 @@ public static GenMailPropertiesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all.sql");
         return executeQueryList(sql, MailPropertiesEntity.class);
@@ -53,6 +54,7 @@ public List<MailPropertiesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, MailPropertiesEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<MailPropertiesEntity> physicalSelectAllWithPager(int limit, int offs
      * @param  propertyKey propertyKey
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailPropertiesEntity physicalSelectOnKey(Integer hookId, String propertyKey) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, MailPropertiesEntity.class, hookId, propertyKey);
@@ -71,6 +74,7 @@ public MailPropertiesEntity physicalSelectOnKey(Integer hookId, String propertyK
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all.sql");
         return executeQueryList(sql, MailPropertiesEntity.class);
@@ -81,6 +85,7 @@ public List<MailPropertiesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all_with_pager.sql");
         return executeQueryList(sql, MailPropertiesEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<MailPropertiesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  propertyKey propertyKey
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailPropertiesEntity selectOnKey(Integer hookId, String propertyKey) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_on_key.sql");
         return executeQuerySingle(sql, MailPropertiesEntity.class, hookId, propertyKey);
@@ -108,6 +115,7 @@ public MailPropertiesEntity selectOnKey(Integer hookId, String propertyKey) {
      * @param hookId hookId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> selectOnHookId(Integer hookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_on_hook_id.sql");
         return executeQueryList(sql, MailPropertiesEntity.class, hookId);
@@ -117,6 +125,7 @@ public List<MailPropertiesEntity> selectOnHookId(Integer hookId) {
      * @param propertyKey propertyKey
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> selectOnPropertyKey(String propertyKey) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_on_property_key.sql");
         return executeQueryList(sql, MailPropertiesEntity.class, propertyKey);
@@ -126,6 +135,7 @@ public List<MailPropertiesEntity> selectOnPropertyKey(String propertyKey) {
      * @param hookId hookId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> physicalSelectOnHookId(Integer hookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_on_hook_id.sql");
         return executeQueryList(sql, MailPropertiesEntity.class, hookId);
@@ -135,6 +145,7 @@ public List<MailPropertiesEntity> physicalSelectOnHookId(Integer hookId) {
      * @param propertyKey propertyKey
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> physicalSelectOnPropertyKey(String propertyKey) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_on_property_key.sql");
         return executeQueryList(sql, MailPropertiesEntity.class, propertyKey);
@@ -143,6 +154,7 @@ public List<MailPropertiesEntity> physicalSelectOnPropertyKey(String propertyKey
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM MAIL_PROPERTIES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java
index 0698f0c0b..2905d7d54 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java
@@ -43,6 +43,7 @@ public static GenMailTemplatesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailTemplatesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all.sql");
         return executeQueryList(sql, MailTemplatesEntity.class);
@@ -53,6 +54,7 @@ public List<MailTemplatesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailTemplatesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, MailTemplatesEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<MailTemplatesEntity> physicalSelectAllWithPager(int limit, int offse
      * @param  templateId templateId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailTemplatesEntity physicalSelectOnKey(String templateId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, MailTemplatesEntity.class, templateId);
@@ -70,6 +73,7 @@ public MailTemplatesEntity physicalSelectOnKey(String templateId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailTemplatesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all.sql");
         return executeQueryList(sql, MailTemplatesEntity.class);
@@ -80,6 +84,7 @@ public List<MailTemplatesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailTemplatesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all_with_pager.sql");
         return executeQueryList(sql, MailTemplatesEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<MailTemplatesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  templateId templateId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailTemplatesEntity selectOnKey(String templateId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_on_key.sql");
         return executeQuerySingle(sql, MailTemplatesEntity.class, templateId);
@@ -105,6 +112,7 @@ public MailTemplatesEntity selectOnKey(String templateId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM MAIL_TEMPLATES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java
index d5fe87ffc..c61819a45 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java
@@ -43,6 +43,7 @@ public static GenNotifyConfigsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyConfigsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all.sql");
         return executeQueryList(sql, NotifyConfigsEntity.class);
@@ -53,6 +54,7 @@ public List<NotifyConfigsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyConfigsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, NotifyConfigsEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<NotifyConfigsEntity> physicalSelectAllWithPager(int limit, int offse
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public NotifyConfigsEntity physicalSelectOnKey(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, NotifyConfigsEntity.class, userId);
@@ -70,6 +73,7 @@ public NotifyConfigsEntity physicalSelectOnKey(Integer userId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyConfigsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all.sql");
         return executeQueryList(sql, NotifyConfigsEntity.class);
@@ -80,6 +84,7 @@ public List<NotifyConfigsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyConfigsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all_with_pager.sql");
         return executeQueryList(sql, NotifyConfigsEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<NotifyConfigsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public NotifyConfigsEntity selectOnKey(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_on_key.sql");
         return executeQuerySingle(sql, NotifyConfigsEntity.class, userId);
@@ -105,6 +112,7 @@ public NotifyConfigsEntity selectOnKey(Integer userId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM NOTIFY_CONFIGS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java
index 1e6a56304..9889901db 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java
@@ -43,6 +43,7 @@ public static GenNotifyQueuesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyQueuesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all.sql");
         return executeQueryList(sql, NotifyQueuesEntity.class);
@@ -53,6 +54,7 @@ public List<NotifyQueuesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyQueuesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, NotifyQueuesEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<NotifyQueuesEntity> physicalSelectAllWithPager(int limit, int offset
      * @param  hash hash
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public NotifyQueuesEntity physicalSelectOnKey(String hash) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, NotifyQueuesEntity.class, hash);
@@ -70,6 +73,7 @@ public NotifyQueuesEntity physicalSelectOnKey(String hash) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyQueuesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all.sql");
         return executeQueryList(sql, NotifyQueuesEntity.class);
@@ -80,6 +84,7 @@ public List<NotifyQueuesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyQueuesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all_with_pager.sql");
         return executeQueryList(sql, NotifyQueuesEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<NotifyQueuesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  hash hash
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public NotifyQueuesEntity selectOnKey(String hash) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_on_key.sql");
         return executeQuerySingle(sql, NotifyQueuesEntity.class, hash);
@@ -105,6 +112,7 @@ public NotifyQueuesEntity selectOnKey(String hash) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM NOTIFY_QUEUES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java
index 60718bebb..a5bdaba5c 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java
@@ -43,6 +43,7 @@ public static GenParticipantsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all.sql");
         return executeQueryList(sql, ParticipantsEntity.class);
@@ -53,6 +54,7 @@ public List<ParticipantsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, ParticipantsEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<ParticipantsEntity> physicalSelectAllWithPager(int limit, int offset
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ParticipantsEntity physicalSelectOnKey(Long knowledgeId, Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, ParticipantsEntity.class, knowledgeId, userId);
@@ -71,6 +74,7 @@ public ParticipantsEntity physicalSelectOnKey(Long knowledgeId, Integer userId)
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all.sql");
         return executeQueryList(sql, ParticipantsEntity.class);
@@ -81,6 +85,7 @@ public List<ParticipantsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all_with_pager.sql");
         return executeQueryList(sql, ParticipantsEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<ParticipantsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ParticipantsEntity selectOnKey(Long knowledgeId, Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_on_key.sql");
         return executeQuerySingle(sql, ParticipantsEntity.class, knowledgeId, userId);
@@ -108,6 +115,7 @@ public ParticipantsEntity selectOnKey(Long knowledgeId, Integer userId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, ParticipantsEntity.class, knowledgeId);
@@ -117,6 +125,7 @@ public List<ParticipantsEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param userId userId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> selectOnUserId(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_on_user_id.sql");
         return executeQueryList(sql, ParticipantsEntity.class, userId);
@@ -126,6 +135,7 @@ public List<ParticipantsEntity> selectOnUserId(Integer userId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, ParticipantsEntity.class, knowledgeId);
@@ -135,6 +145,7 @@ public List<ParticipantsEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
      * @param userId userId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> physicalSelectOnUserId(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_on_user_id.sql");
         return executeQueryList(sql, ParticipantsEntity.class, userId);
@@ -143,6 +154,7 @@ public List<ParticipantsEntity> physicalSelectOnUserId(Integer userId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM PARTICIPANTS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
index 948eeab27..7dc6cbe85 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
@@ -43,6 +43,7 @@ public static GenPinsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PinsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all.sql");
         return executeQueryList(sql, PinsEntity.class);
@@ -53,6 +54,7 @@ public List<PinsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PinsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, PinsEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<PinsEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  no no
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public PinsEntity physicalSelectOnKey(Integer no) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, PinsEntity.class, no);
@@ -70,6 +73,7 @@ public PinsEntity physicalSelectOnKey(Integer no) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PinsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all.sql");
         return executeQueryList(sql, PinsEntity.class);
@@ -80,6 +84,7 @@ public List<PinsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PinsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all_with_pager.sql");
         return executeQueryList(sql, PinsEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<PinsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  no no
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public PinsEntity selectOnKey(Integer no) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_on_key.sql");
         return executeQuerySingle(sql, PinsEntity.class, no);
@@ -105,6 +112,7 @@ public PinsEntity selectOnKey(Integer no) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM PINS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
index aa16c0934..3716ff87f 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
@@ -43,6 +43,7 @@ public static GenPointKnowledgeHistoriesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql");
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class);
@@ -53,6 +54,7 @@ public List<PointKnowledgeHistoriesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<PointKnowledgeHistoriesEntity> physicalSelectAllWithPager(int limit,
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public PointKnowledgeHistoriesEntity physicalSelectOnKey(Long historyNo, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, PointKnowledgeHistoriesEntity.class, historyNo, knowledgeId);
@@ -71,6 +74,7 @@ public PointKnowledgeHistoriesEntity physicalSelectOnKey(Long historyNo, Long kn
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql");
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class);
@@ -81,6 +85,7 @@ public List<PointKnowledgeHistoriesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql");
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<PointKnowledgeHistoriesEntity> selectAllWidthPager(int limit, int of
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public PointKnowledgeHistoriesEntity selectOnKey(Long historyNo, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_key.sql");
         return executeQuerySingle(sql, PointKnowledgeHistoriesEntity.class, historyNo, knowledgeId);
@@ -108,6 +115,7 @@ public PointKnowledgeHistoriesEntity selectOnKey(Long historyNo, Long knowledgeI
      * @param historyNo historyNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> selectOnHistoryNo(Long historyNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_history_no.sql");
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, historyNo);
@@ -117,6 +125,7 @@ public List<PointKnowledgeHistoriesEntity> selectOnHistoryNo(Long historyNo) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, knowledgeId);
@@ -126,6 +135,7 @@ public List<PointKnowledgeHistoriesEntity> selectOnKnowledgeId(Long knowledgeId)
      * @param historyNo historyNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> physicalSelectOnHistoryNo(Long historyNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_history_no.sql");
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, historyNo);
@@ -135,6 +145,7 @@ public List<PointKnowledgeHistoriesEntity> physicalSelectOnHistoryNo(Long histor
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, knowledgeId);
@@ -143,6 +154,7 @@ public List<PointKnowledgeHistoriesEntity> physicalSelectOnKnowledgeId(Long know
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM POINT_KNOWLEDGE_HISTORIES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
index 0407be1bb..ce6789c18 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
@@ -43,6 +43,7 @@ public static GenPointUserHistoriesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql");
         return executeQueryList(sql, PointUserHistoriesEntity.class);
@@ -53,6 +54,7 @@ public List<PointUserHistoriesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, PointUserHistoriesEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<PointUserHistoriesEntity> physicalSelectAllWithPager(int limit, int
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public PointUserHistoriesEntity physicalSelectOnKey(Long historyNo, Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, PointUserHistoriesEntity.class, historyNo, userId);
@@ -71,6 +74,7 @@ public PointUserHistoriesEntity physicalSelectOnKey(Long historyNo, Integer user
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql");
         return executeQueryList(sql, PointUserHistoriesEntity.class);
@@ -81,6 +85,7 @@ public List<PointUserHistoriesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql");
         return executeQueryList(sql, PointUserHistoriesEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<PointUserHistoriesEntity> selectAllWidthPager(int limit, int offset)
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public PointUserHistoriesEntity selectOnKey(Long historyNo, Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_key.sql");
         return executeQuerySingle(sql, PointUserHistoriesEntity.class, historyNo, userId);
@@ -108,6 +115,7 @@ public PointUserHistoriesEntity selectOnKey(Long historyNo, Integer userId) {
      * @param historyNo historyNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> selectOnHistoryNo(Long historyNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_history_no.sql");
         return executeQueryList(sql, PointUserHistoriesEntity.class, historyNo);
@@ -117,6 +125,7 @@ public List<PointUserHistoriesEntity> selectOnHistoryNo(Long historyNo) {
      * @param userId userId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> selectOnUserId(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_on_user_id.sql");
         return executeQueryList(sql, PointUserHistoriesEntity.class, userId);
@@ -126,6 +135,7 @@ public List<PointUserHistoriesEntity> selectOnUserId(Integer userId) {
      * @param historyNo historyNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> physicalSelectOnHistoryNo(Long historyNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_history_no.sql");
         return executeQueryList(sql, PointUserHistoriesEntity.class, historyNo);
@@ -135,6 +145,7 @@ public List<PointUserHistoriesEntity> physicalSelectOnHistoryNo(Long historyNo)
      * @param userId userId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> physicalSelectOnUserId(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_on_user_id.sql");
         return executeQueryList(sql, PointUserHistoriesEntity.class, userId);
@@ -143,6 +154,7 @@ public List<PointUserHistoriesEntity> physicalSelectOnUserId(Integer userId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM POINT_USER_HISTORIES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java
index 8ff4d6cc2..f57b994ff 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java
@@ -44,6 +44,7 @@ public static GenServiceConfigsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceConfigsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all.sql");
         return executeQueryList(sql, ServiceConfigsEntity.class);
@@ -54,6 +55,7 @@ public List<ServiceConfigsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceConfigsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, ServiceConfigsEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<ServiceConfigsEntity> physicalSelectAllWithPager(int limit, int offs
      * @param  serviceName serviceName
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ServiceConfigsEntity physicalSelectOnKey(String serviceName) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, ServiceConfigsEntity.class, serviceName);
@@ -71,6 +74,7 @@ public ServiceConfigsEntity physicalSelectOnKey(String serviceName) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceConfigsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all.sql");
         return executeQueryList(sql, ServiceConfigsEntity.class);
@@ -81,6 +85,7 @@ public List<ServiceConfigsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceConfigsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all_with_pager.sql");
         return executeQueryList(sql, ServiceConfigsEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<ServiceConfigsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -98,6 +104,7 @@ public Integer selectCountAll() {
      * @param  serviceName serviceName
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ServiceConfigsEntity selectOnKey(String serviceName) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_on_key.sql");
         return executeQuerySingle(sql, ServiceConfigsEntity.class, serviceName);
@@ -106,6 +113,7 @@ public ServiceConfigsEntity selectOnKey(String serviceName) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM SERVICE_CONFIGS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java
index 3f8aace86..2252396bb 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java
@@ -43,6 +43,7 @@ public static GenServiceLocaleConfigsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all.sql");
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class);
@@ -53,6 +54,7 @@ public List<ServiceLocaleConfigsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<ServiceLocaleConfigsEntity> physicalSelectAllWithPager(int limit, in
      * @param  serviceName serviceName
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ServiceLocaleConfigsEntity physicalSelectOnKey(String localeKey, String serviceName) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, ServiceLocaleConfigsEntity.class, localeKey, serviceName);
@@ -71,6 +74,7 @@ public ServiceLocaleConfigsEntity physicalSelectOnKey(String localeKey, String s
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all.sql");
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class);
@@ -81,6 +85,7 @@ public List<ServiceLocaleConfigsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all_with_pager.sql");
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<ServiceLocaleConfigsEntity> selectAllWidthPager(int limit, int offse
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  serviceName serviceName
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ServiceLocaleConfigsEntity selectOnKey(String localeKey, String serviceName) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_on_key.sql");
         return executeQuerySingle(sql, ServiceLocaleConfigsEntity.class, localeKey, serviceName);
@@ -108,6 +115,7 @@ public ServiceLocaleConfigsEntity selectOnKey(String localeKey, String serviceNa
      * @param localeKey localeKey
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> selectOnLocaleKey(String localeKey) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_on_locale_key.sql");
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class, localeKey);
@@ -117,6 +125,7 @@ public List<ServiceLocaleConfigsEntity> selectOnLocaleKey(String localeKey) {
      * @param serviceName serviceName
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> selectOnServiceName(String serviceName) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_on_service_name.sql");
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class, serviceName);
@@ -126,6 +135,7 @@ public List<ServiceLocaleConfigsEntity> selectOnServiceName(String serviceName)
      * @param localeKey localeKey
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> physicalSelectOnLocaleKey(String localeKey) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_on_locale_key.sql");
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class, localeKey);
@@ -135,6 +145,7 @@ public List<ServiceLocaleConfigsEntity> physicalSelectOnLocaleKey(String localeK
      * @param serviceName serviceName
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> physicalSelectOnServiceName(String serviceName) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_on_service_name.sql");
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class, serviceName);
@@ -143,6 +154,7 @@ public List<ServiceLocaleConfigsEntity> physicalSelectOnServiceName(String servi
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM SERVICE_LOCALE_CONFIGS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java
index 80c53a332..55bd4da6e 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java
@@ -43,6 +43,7 @@ public static GenStockKnowledgesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all.sql");
         return executeQueryList(sql, StockKnowledgesEntity.class);
@@ -53,6 +54,7 @@ public List<StockKnowledgesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, StockKnowledgesEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<StockKnowledgesEntity> physicalSelectAllWithPager(int limit, int off
      * @param  stockId stockId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public StockKnowledgesEntity physicalSelectOnKey(Long knowledgeId, Long stockId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, StockKnowledgesEntity.class, knowledgeId, stockId);
@@ -71,6 +74,7 @@ public StockKnowledgesEntity physicalSelectOnKey(Long knowledgeId, Long stockId)
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all.sql");
         return executeQueryList(sql, StockKnowledgesEntity.class);
@@ -81,6 +85,7 @@ public List<StockKnowledgesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all_with_pager.sql");
         return executeQueryList(sql, StockKnowledgesEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<StockKnowledgesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  stockId stockId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public StockKnowledgesEntity selectOnKey(Long knowledgeId, Long stockId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_on_key.sql");
         return executeQuerySingle(sql, StockKnowledgesEntity.class, knowledgeId, stockId);
@@ -108,6 +115,7 @@ public StockKnowledgesEntity selectOnKey(Long knowledgeId, Long stockId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, StockKnowledgesEntity.class, knowledgeId);
@@ -117,6 +125,7 @@ public List<StockKnowledgesEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param stockId stockId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> selectOnStockId(Long stockId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_on_stock_id.sql");
         return executeQueryList(sql, StockKnowledgesEntity.class, stockId);
@@ -126,6 +135,7 @@ public List<StockKnowledgesEntity> selectOnStockId(Long stockId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, StockKnowledgesEntity.class, knowledgeId);
@@ -135,6 +145,7 @@ public List<StockKnowledgesEntity> physicalSelectOnKnowledgeId(Long knowledgeId)
      * @param stockId stockId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> physicalSelectOnStockId(Long stockId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_on_stock_id.sql");
         return executeQueryList(sql, StockKnowledgesEntity.class, stockId);
@@ -143,6 +154,7 @@ public List<StockKnowledgesEntity> physicalSelectOnStockId(Long stockId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM STOCK_KNOWLEDGES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
index f63916e62..c82ae33e1 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
@@ -43,6 +43,7 @@ public static GenStocksDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all.sql");
         return executeQueryList(sql, StocksEntity.class);
@@ -53,6 +54,7 @@ public List<StocksEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, StocksEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<StocksEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  stockId stockId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public StocksEntity physicalSelectOnKey(Long stockId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, StocksEntity.class, stockId);
@@ -70,6 +73,7 @@ public StocksEntity physicalSelectOnKey(Long stockId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all.sql");
         return executeQueryList(sql, StocksEntity.class);
@@ -80,6 +84,7 @@ public List<StocksEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all_with_pager.sql");
         return executeQueryList(sql, StocksEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<StocksEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  stockId stockId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public StocksEntity selectOnKey(Long stockId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_on_key.sql");
         return executeQuerySingle(sql, StocksEntity.class, stockId);
@@ -105,6 +112,7 @@ public StocksEntity selectOnKey(Long stockId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM STOCKS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java
index adddcdbbd..a6f854a62 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java
@@ -43,6 +43,7 @@ public static GenSurveyAnswersDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all.sql");
         return executeQueryList(sql, SurveyAnswersEntity.class);
@@ -53,6 +54,7 @@ public List<SurveyAnswersEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, SurveyAnswersEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<SurveyAnswersEntity> physicalSelectAllWithPager(int limit, int offse
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyAnswersEntity physicalSelectOnKey(Integer answerId, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, SurveyAnswersEntity.class, answerId, knowledgeId);
@@ -71,6 +74,7 @@ public SurveyAnswersEntity physicalSelectOnKey(Integer answerId, Long knowledgeI
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all.sql");
         return executeQueryList(sql, SurveyAnswersEntity.class);
@@ -81,6 +85,7 @@ public List<SurveyAnswersEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all_with_pager.sql");
         return executeQueryList(sql, SurveyAnswersEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<SurveyAnswersEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyAnswersEntity selectOnKey(Integer answerId, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_on_key.sql");
         return executeQuerySingle(sql, SurveyAnswersEntity.class, answerId, knowledgeId);
@@ -108,6 +115,7 @@ public SurveyAnswersEntity selectOnKey(Integer answerId, Long knowledgeId) {
      * @param answerId answerId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> selectOnAnswerId(Integer answerId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_on_answer_id.sql");
         return executeQueryList(sql, SurveyAnswersEntity.class, answerId);
@@ -117,6 +125,7 @@ public List<SurveyAnswersEntity> selectOnAnswerId(Integer answerId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, SurveyAnswersEntity.class, knowledgeId);
@@ -126,6 +135,7 @@ public List<SurveyAnswersEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param answerId answerId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> physicalSelectOnAnswerId(Integer answerId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_on_answer_id.sql");
         return executeQueryList(sql, SurveyAnswersEntity.class, answerId);
@@ -135,6 +145,7 @@ public List<SurveyAnswersEntity> physicalSelectOnAnswerId(Integer answerId) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, SurveyAnswersEntity.class, knowledgeId);
@@ -143,6 +154,7 @@ public List<SurveyAnswersEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM SURVEY_ANSWERS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java
index 87e425952..bfc5ebfa4 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java
@@ -43,6 +43,7 @@ public static GenSurveyChoicesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all.sql");
         return executeQueryList(sql, SurveyChoicesEntity.class);
@@ -53,6 +54,7 @@ public List<SurveyChoicesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, SurveyChoicesEntity.class, limit, offset);
@@ -64,6 +66,7 @@ public List<SurveyChoicesEntity> physicalSelectAllWithPager(int limit, int offse
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyChoicesEntity physicalSelectOnKey(Integer choiceNo, Integer itemNo, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, SurveyChoicesEntity.class, choiceNo, itemNo, knowledgeId);
@@ -72,6 +75,7 @@ public SurveyChoicesEntity physicalSelectOnKey(Integer choiceNo, Integer itemNo,
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all.sql");
         return executeQueryList(sql, SurveyChoicesEntity.class);
@@ -82,6 +86,7 @@ public List<SurveyChoicesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all_with_pager.sql");
         return executeQueryList(sql, SurveyChoicesEntity.class, limit, offset);
@@ -90,6 +95,7 @@ public List<SurveyChoicesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -101,6 +107,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyChoicesEntity selectOnKey(Integer choiceNo, Integer itemNo, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_on_key.sql");
         return executeQuerySingle(sql, SurveyChoicesEntity.class, choiceNo, itemNo, knowledgeId);
@@ -110,6 +117,7 @@ public SurveyChoicesEntity selectOnKey(Integer choiceNo, Integer itemNo, Long kn
      * @param choiceNo choiceNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> selectOnChoiceNo(Integer choiceNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_on_choice_no.sql");
         return executeQueryList(sql, SurveyChoicesEntity.class, choiceNo);
@@ -119,6 +127,7 @@ public List<SurveyChoicesEntity> selectOnChoiceNo(Integer choiceNo) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> selectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_on_item_no.sql");
         return executeQueryList(sql, SurveyChoicesEntity.class, itemNo);
@@ -128,6 +137,7 @@ public List<SurveyChoicesEntity> selectOnItemNo(Integer itemNo) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, SurveyChoicesEntity.class, knowledgeId);
@@ -137,6 +147,7 @@ public List<SurveyChoicesEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param choiceNo choiceNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> physicalSelectOnChoiceNo(Integer choiceNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_on_choice_no.sql");
         return executeQueryList(sql, SurveyChoicesEntity.class, choiceNo);
@@ -146,6 +157,7 @@ public List<SurveyChoicesEntity> physicalSelectOnChoiceNo(Integer choiceNo) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> physicalSelectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_on_item_no.sql");
         return executeQueryList(sql, SurveyChoicesEntity.class, itemNo);
@@ -155,6 +167,7 @@ public List<SurveyChoicesEntity> physicalSelectOnItemNo(Integer itemNo) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, SurveyChoicesEntity.class, knowledgeId);
@@ -163,6 +176,7 @@ public List<SurveyChoicesEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM SURVEY_CHOICES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java
index f56e4ffc6..2e6f67cf4 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java
@@ -43,6 +43,7 @@ public static GenSurveyItemAnswersDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all.sql");
         return executeQueryList(sql, SurveyItemAnswersEntity.class);
@@ -53,6 +54,7 @@ public List<SurveyItemAnswersEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, SurveyItemAnswersEntity.class, limit, offset);
@@ -64,6 +66,7 @@ public List<SurveyItemAnswersEntity> physicalSelectAllWithPager(int limit, int o
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyItemAnswersEntity physicalSelectOnKey(Integer answerId, Integer itemNo, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, SurveyItemAnswersEntity.class, answerId, itemNo, knowledgeId);
@@ -72,6 +75,7 @@ public SurveyItemAnswersEntity physicalSelectOnKey(Integer answerId, Integer ite
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all.sql");
         return executeQueryList(sql, SurveyItemAnswersEntity.class);
@@ -82,6 +86,7 @@ public List<SurveyItemAnswersEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all_with_pager.sql");
         return executeQueryList(sql, SurveyItemAnswersEntity.class, limit, offset);
@@ -90,6 +95,7 @@ public List<SurveyItemAnswersEntity> selectAllWidthPager(int limit, int offset)
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -101,6 +107,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyItemAnswersEntity selectOnKey(Integer answerId, Integer itemNo, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_on_key.sql");
         return executeQuerySingle(sql, SurveyItemAnswersEntity.class, answerId, itemNo, knowledgeId);
@@ -110,6 +117,7 @@ public SurveyItemAnswersEntity selectOnKey(Integer answerId, Integer itemNo, Lon
      * @param answerId answerId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> selectOnAnswerId(Integer answerId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_on_answer_id.sql");
         return executeQueryList(sql, SurveyItemAnswersEntity.class, answerId);
@@ -119,6 +127,7 @@ public List<SurveyItemAnswersEntity> selectOnAnswerId(Integer answerId) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> selectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_on_item_no.sql");
         return executeQueryList(sql, SurveyItemAnswersEntity.class, itemNo);
@@ -128,6 +137,7 @@ public List<SurveyItemAnswersEntity> selectOnItemNo(Integer itemNo) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, SurveyItemAnswersEntity.class, knowledgeId);
@@ -137,6 +147,7 @@ public List<SurveyItemAnswersEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param answerId answerId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> physicalSelectOnAnswerId(Integer answerId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_on_answer_id.sql");
         return executeQueryList(sql, SurveyItemAnswersEntity.class, answerId);
@@ -146,6 +157,7 @@ public List<SurveyItemAnswersEntity> physicalSelectOnAnswerId(Integer answerId)
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> physicalSelectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_on_item_no.sql");
         return executeQueryList(sql, SurveyItemAnswersEntity.class, itemNo);
@@ -155,6 +167,7 @@ public List<SurveyItemAnswersEntity> physicalSelectOnItemNo(Integer itemNo) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, SurveyItemAnswersEntity.class, knowledgeId);
@@ -163,6 +176,7 @@ public List<SurveyItemAnswersEntity> physicalSelectOnKnowledgeId(Long knowledgeI
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM SURVEY_ITEM_ANSWERS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java
index c1c1f8160..c12079fb9 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java
@@ -43,6 +43,7 @@ public static GenSurveyItemsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all.sql");
         return executeQueryList(sql, SurveyItemsEntity.class);
@@ -53,6 +54,7 @@ public List<SurveyItemsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, SurveyItemsEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<SurveyItemsEntity> physicalSelectAllWithPager(int limit, int offset)
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyItemsEntity physicalSelectOnKey(Integer itemNo, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, SurveyItemsEntity.class, itemNo, knowledgeId);
@@ -71,6 +74,7 @@ public SurveyItemsEntity physicalSelectOnKey(Integer itemNo, Long knowledgeId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all.sql");
         return executeQueryList(sql, SurveyItemsEntity.class);
@@ -81,6 +85,7 @@ public List<SurveyItemsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all_with_pager.sql");
         return executeQueryList(sql, SurveyItemsEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<SurveyItemsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyItemsEntity selectOnKey(Integer itemNo, Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_on_key.sql");
         return executeQuerySingle(sql, SurveyItemsEntity.class, itemNo, knowledgeId);
@@ -108,6 +115,7 @@ public SurveyItemsEntity selectOnKey(Integer itemNo, Long knowledgeId) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> selectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_on_item_no.sql");
         return executeQueryList(sql, SurveyItemsEntity.class, itemNo);
@@ -117,6 +125,7 @@ public List<SurveyItemsEntity> selectOnItemNo(Integer itemNo) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> selectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_on_knowledge_id.sql");
         return executeQueryList(sql, SurveyItemsEntity.class, knowledgeId);
@@ -126,6 +135,7 @@ public List<SurveyItemsEntity> selectOnKnowledgeId(Long knowledgeId) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> physicalSelectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_on_item_no.sql");
         return executeQueryList(sql, SurveyItemsEntity.class, itemNo);
@@ -135,6 +145,7 @@ public List<SurveyItemsEntity> physicalSelectOnItemNo(Integer itemNo) {
      * @param knowledgeId knowledgeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_on_knowledge_id.sql");
         return executeQueryList(sql, SurveyItemsEntity.class, knowledgeId);
@@ -143,6 +154,7 @@ public List<SurveyItemsEntity> physicalSelectOnKnowledgeId(Long knowledgeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM SURVEY_ITEMS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java
index e46f71947..18f58d1bc 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java
@@ -43,6 +43,7 @@ public static GenSurveysDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveysEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all.sql");
         return executeQueryList(sql, SurveysEntity.class);
@@ -53,6 +54,7 @@ public List<SurveysEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveysEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, SurveysEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<SurveysEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveysEntity physicalSelectOnKey(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, SurveysEntity.class, knowledgeId);
@@ -70,6 +73,7 @@ public SurveysEntity physicalSelectOnKey(Long knowledgeId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveysEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all.sql");
         return executeQueryList(sql, SurveysEntity.class);
@@ -80,6 +84,7 @@ public List<SurveysEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveysEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all_with_pager.sql");
         return executeQueryList(sql, SurveysEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<SurveysEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  knowledgeId knowledgeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveysEntity selectOnKey(Long knowledgeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_on_key.sql");
         return executeQuerySingle(sql, SurveysEntity.class, knowledgeId);
@@ -105,6 +112,7 @@ public SurveysEntity selectOnKey(Long knowledgeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM SURVEYS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
index ef6e4230b..07fb18b97 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
@@ -43,6 +43,7 @@ public static GenTagsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all.sql");
         return executeQueryList(sql, TagsEntity.class);
@@ -53,6 +54,7 @@ public List<TagsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, TagsEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<TagsEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  tagId tagId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TagsEntity physicalSelectOnKey(Integer tagId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, TagsEntity.class, tagId);
@@ -70,6 +73,7 @@ public TagsEntity physicalSelectOnKey(Integer tagId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all.sql");
         return executeQueryList(sql, TagsEntity.class);
@@ -80,6 +84,7 @@ public List<TagsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all_with_pager.sql");
         return executeQueryList(sql, TagsEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<TagsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  tagId tagId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TagsEntity selectOnKey(Integer tagId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_on_key.sql");
         return executeQuerySingle(sql, TagsEntity.class, tagId);
@@ -105,6 +112,7 @@ public TagsEntity selectOnKey(Integer tagId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM TAGS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
index 0fa446953..31f633392 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
@@ -43,6 +43,7 @@ public static GenTemplateItemsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all.sql");
         return executeQueryList(sql, TemplateItemsEntity.class);
@@ -53,6 +54,7 @@ public List<TemplateItemsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, TemplateItemsEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<TemplateItemsEntity> physicalSelectAllWithPager(int limit, int offse
      * @param  typeId typeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TemplateItemsEntity physicalSelectOnKey(Integer itemNo, Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, TemplateItemsEntity.class, itemNo, typeId);
@@ -71,6 +74,7 @@ public TemplateItemsEntity physicalSelectOnKey(Integer itemNo, Integer typeId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all.sql");
         return executeQueryList(sql, TemplateItemsEntity.class);
@@ -81,6 +85,7 @@ public List<TemplateItemsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all_with_pager.sql");
         return executeQueryList(sql, TemplateItemsEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<TemplateItemsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  typeId typeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TemplateItemsEntity selectOnKey(Integer itemNo, Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_on_key.sql");
         return executeQuerySingle(sql, TemplateItemsEntity.class, itemNo, typeId);
@@ -108,6 +115,7 @@ public TemplateItemsEntity selectOnKey(Integer itemNo, Integer typeId) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> selectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_on_item_no.sql");
         return executeQueryList(sql, TemplateItemsEntity.class, itemNo);
@@ -117,6 +125,7 @@ public List<TemplateItemsEntity> selectOnItemNo(Integer itemNo) {
      * @param typeId typeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> selectOnTypeId(Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_on_type_id.sql");
         return executeQueryList(sql, TemplateItemsEntity.class, typeId);
@@ -126,6 +135,7 @@ public List<TemplateItemsEntity> selectOnTypeId(Integer typeId) {
      * @param itemNo itemNo
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> physicalSelectOnItemNo(Integer itemNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_on_item_no.sql");
         return executeQueryList(sql, TemplateItemsEntity.class, itemNo);
@@ -135,6 +145,7 @@ public List<TemplateItemsEntity> physicalSelectOnItemNo(Integer itemNo) {
      * @param typeId typeId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> physicalSelectOnTypeId(Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_on_type_id.sql");
         return executeQueryList(sql, TemplateItemsEntity.class, typeId);
@@ -143,6 +154,7 @@ public List<TemplateItemsEntity> physicalSelectOnTypeId(Integer typeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM TEMPLATE_ITEMS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
index 3f00ac3d6..c81db6ee2 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
@@ -43,6 +43,7 @@ public static GenTemplateMastersDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateMastersEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all.sql");
         return executeQueryList(sql, TemplateMastersEntity.class);
@@ -53,6 +54,7 @@ public List<TemplateMastersEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateMastersEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, TemplateMastersEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<TemplateMastersEntity> physicalSelectAllWithPager(int limit, int off
      * @param  typeId typeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TemplateMastersEntity physicalSelectOnKey(Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, TemplateMastersEntity.class, typeId);
@@ -70,6 +73,7 @@ public TemplateMastersEntity physicalSelectOnKey(Integer typeId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateMastersEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all.sql");
         return executeQueryList(sql, TemplateMastersEntity.class);
@@ -80,6 +84,7 @@ public List<TemplateMastersEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateMastersEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all_with_pager.sql");
         return executeQueryList(sql, TemplateMastersEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<TemplateMastersEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  typeId typeId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TemplateMastersEntity selectOnKey(Integer typeId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_on_key.sql");
         return executeQuerySingle(sql, TemplateMastersEntity.class, typeId);
@@ -105,6 +112,7 @@ public TemplateMastersEntity selectOnKey(Integer typeId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM TEMPLATE_MASTERS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java
index 81d688106..c2157d24f 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java
@@ -43,6 +43,7 @@ public static GenTokensDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TokensEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all.sql");
         return executeQueryList(sql, TokensEntity.class);
@@ -53,6 +54,7 @@ public List<TokensEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TokensEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, TokensEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<TokensEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  token token
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TokensEntity physicalSelectOnKey(String token) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, TokensEntity.class, token);
@@ -70,6 +73,7 @@ public TokensEntity physicalSelectOnKey(String token) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TokensEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all.sql");
         return executeQueryList(sql, TokensEntity.class);
@@ -80,6 +84,7 @@ public List<TokensEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TokensEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all_with_pager.sql");
         return executeQueryList(sql, TokensEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<TokensEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  token token
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TokensEntity selectOnKey(String token) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_on_key.sql");
         return executeQuerySingle(sql, TokensEntity.class, token);
@@ -105,6 +112,7 @@ public TokensEntity selectOnKey(String token) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM TOKENS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
index 7b347930a..93c84ffa5 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
@@ -43,6 +43,7 @@ public static GenUserBadgesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql");
         return executeQueryList(sql, UserBadgesEntity.class);
@@ -53,6 +54,7 @@ public List<UserBadgesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, UserBadgesEntity.class, limit, offset);
@@ -63,6 +65,7 @@ public List<UserBadgesEntity> physicalSelectAllWithPager(int limit, int offset)
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public UserBadgesEntity physicalSelectOnKey(Integer no, Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, UserBadgesEntity.class, no, userId);
@@ -71,6 +74,7 @@ public UserBadgesEntity physicalSelectOnKey(Integer no, Integer userId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql");
         return executeQueryList(sql, UserBadgesEntity.class);
@@ -81,6 +85,7 @@ public List<UserBadgesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql");
         return executeQueryList(sql, UserBadgesEntity.class, limit, offset);
@@ -89,6 +94,7 @@ public List<UserBadgesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -99,6 +105,7 @@ public Integer selectCountAll() {
      * @param  userId userId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public UserBadgesEntity selectOnKey(Integer no, Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_key.sql");
         return executeQuerySingle(sql, UserBadgesEntity.class, no, userId);
@@ -108,6 +115,7 @@ public UserBadgesEntity selectOnKey(Integer no, Integer userId) {
      * @param no no
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> selectOnNo(Integer no) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_no.sql");
         return executeQueryList(sql, UserBadgesEntity.class, no);
@@ -117,6 +125,7 @@ public List<UserBadgesEntity> selectOnNo(Integer no) {
      * @param userId userId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> selectOnUserId(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_on_user_id.sql");
         return executeQueryList(sql, UserBadgesEntity.class, userId);
@@ -126,6 +135,7 @@ public List<UserBadgesEntity> selectOnUserId(Integer userId) {
      * @param no no
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> physicalSelectOnNo(Integer no) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_no.sql");
         return executeQueryList(sql, UserBadgesEntity.class, no);
@@ -135,6 +145,7 @@ public List<UserBadgesEntity> physicalSelectOnNo(Integer no) {
      * @param userId userId
      * @return list
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> physicalSelectOnUserId(Integer userId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_on_user_id.sql");
         return executeQueryList(sql, UserBadgesEntity.class, userId);
@@ -143,6 +154,7 @@ public List<UserBadgesEntity> physicalSelectOnUserId(Integer userId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM USER_BADGES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
index 5341053d6..8ce0c10d3 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
@@ -43,6 +43,7 @@ public static GenViewHistoriesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ViewHistoriesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all.sql");
         return executeQueryList(sql, ViewHistoriesEntity.class);
@@ -53,6 +54,7 @@ public List<ViewHistoriesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ViewHistoriesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, ViewHistoriesEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<ViewHistoriesEntity> physicalSelectAllWithPager(int limit, int offse
      * @param  historyNo historyNo
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ViewHistoriesEntity physicalSelectOnKey(Long historyNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, ViewHistoriesEntity.class, historyNo);
@@ -70,6 +73,7 @@ public ViewHistoriesEntity physicalSelectOnKey(Long historyNo) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ViewHistoriesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all.sql");
         return executeQueryList(sql, ViewHistoriesEntity.class);
@@ -80,6 +84,7 @@ public List<ViewHistoriesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ViewHistoriesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all_with_pager.sql");
         return executeQueryList(sql, ViewHistoriesEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<ViewHistoriesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  historyNo historyNo
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ViewHistoriesEntity selectOnKey(Long historyNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_on_key.sql");
         return executeQuerySingle(sql, ViewHistoriesEntity.class, historyNo);
@@ -105,6 +112,7 @@ public ViewHistoriesEntity selectOnKey(Long historyNo) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM VIEW_HISTORIES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
index 748de697d..572b6d1d9 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
@@ -43,6 +43,7 @@ public static GenVotesDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<VotesEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all.sql");
         return executeQueryList(sql, VotesEntity.class);
@@ -53,6 +54,7 @@ public List<VotesEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<VotesEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, VotesEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<VotesEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  voteNo voteNo
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public VotesEntity physicalSelectOnKey(Long voteNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, VotesEntity.class, voteNo);
@@ -70,6 +73,7 @@ public VotesEntity physicalSelectOnKey(Long voteNo) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<VotesEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all.sql");
         return executeQueryList(sql, VotesEntity.class);
@@ -80,6 +84,7 @@ public List<VotesEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<VotesEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all_with_pager.sql");
         return executeQueryList(sql, VotesEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<VotesEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  voteNo voteNo
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public VotesEntity selectOnKey(Long voteNo) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_on_key.sql");
         return executeQuerySingle(sql, VotesEntity.class, voteNo);
@@ -105,6 +112,7 @@ public VotesEntity selectOnKey(Long voteNo) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM VOTES";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
index ecbf46f84..09e519a3b 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
@@ -43,6 +43,7 @@ public static GenWebhookConfigsDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhookConfigsEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all.sql");
         return executeQueryList(sql, WebhookConfigsEntity.class);
@@ -53,6 +54,7 @@ public List<WebhookConfigsEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhookConfigsEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, WebhookConfigsEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<WebhookConfigsEntity> physicalSelectAllWithPager(int limit, int offs
      * @param  hookId hookId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public WebhookConfigsEntity physicalSelectOnKey(Integer hookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, WebhookConfigsEntity.class, hookId);
@@ -70,6 +73,7 @@ public WebhookConfigsEntity physicalSelectOnKey(Integer hookId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhookConfigsEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all.sql");
         return executeQueryList(sql, WebhookConfigsEntity.class);
@@ -80,6 +84,7 @@ public List<WebhookConfigsEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhookConfigsEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all_with_pager.sql");
         return executeQueryList(sql, WebhookConfigsEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<WebhookConfigsEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  hookId hookId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public WebhookConfigsEntity selectOnKey(Integer hookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_on_key.sql");
         return executeQuerySingle(sql, WebhookConfigsEntity.class, hookId);
@@ -105,6 +112,7 @@ public WebhookConfigsEntity selectOnKey(Integer hookId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM WEBHOOK_CONFIGS";
         return executeQuerySingle(sql, Integer.class);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java
index b92181fa3..00aba93cb 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java
@@ -43,6 +43,7 @@ public static GenWebhooksDao get() {
      * Select all data.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhooksEntity> physicalSelectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all.sql");
         return executeQueryList(sql, WebhooksEntity.class);
@@ -53,6 +54,7 @@ public List<WebhooksEntity> physicalSelectAll() {
      * @param offset offset
      * @return all data on limit and offset
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhooksEntity> physicalSelectAllWithPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all_with_pager.sql");
         return executeQueryList(sql, WebhooksEntity.class, limit, offset);
@@ -62,6 +64,7 @@ public List<WebhooksEntity> physicalSelectAllWithPager(int limit, int offset) {
      * @param  webhookId webhookId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public WebhooksEntity physicalSelectOnKey(String webhookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_on_key.sql");
         return executeQuerySingle(sql, WebhooksEntity.class, webhookId);
@@ -70,6 +73,7 @@ public WebhooksEntity physicalSelectOnKey(String webhookId) {
      * Select all data that not deleted.
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhooksEntity> selectAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all.sql");
         return executeQueryList(sql, WebhooksEntity.class);
@@ -80,6 +84,7 @@ public List<WebhooksEntity> selectAll() {
      * @param offset offset
      * @return all data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhooksEntity> selectAllWidthPager(int limit, int offset) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all_with_pager.sql");
         return executeQueryList(sql, WebhooksEntity.class, limit, offset);
@@ -88,6 +93,7 @@ public List<WebhooksEntity> selectAllWidthPager(int limit, int offset) {
      * Select count that not deleted.
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public Integer selectCountAll() { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_count_all.sql");
         return executeQuerySingle(sql, Integer.class);
@@ -97,6 +103,7 @@ public Integer selectCountAll() {
      * @param  webhookId webhookId
      * @return data
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public WebhooksEntity selectOnKey(String webhookId) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_on_key.sql");
         return executeQuerySingle(sql, WebhooksEntity.class, webhookId);
@@ -105,6 +112,7 @@ public WebhooksEntity selectOnKey(String webhookId) {
      * Count all data
      * @return count
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public int physicalCountAll() {
         String sql = "SELECT COUNT(*) FROM WEBHOOKS";
         return executeQuerySingle(sql, Integer.class);

From 00da34e25ed44d2ae32bd0ee4c999e8f6abed5db Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 4 Sep 2017 23:05:28 +0900
Subject: [PATCH 045/138] #840 Add add point process at comment insert

---
 .../deploy/v1_11_0/Migrate_1_11_2.java        | 166 ++++++++++--------
 .../activity/AbstractActivityProcessor.java   |  10 +-
 .../AbstractAddPointForCommentProcessor.java  |  76 ++++++++
 ...AbstractAddPointForKnowledgeProcessor.java |  24 ++-
 .../knowledge/logic/activity/Activity.java    |   4 +-
 .../logic/activity/ActivityLogic.java         |  12 +-
 .../logic/activity/ActivityProcessor.java     |   8 +-
 .../activity/KnowledgeCommentActivity.java    |  38 ++++
 src/main/resources/log4j.xml                  |   7 +
 9 files changed, 259 insertions(+), 86 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/KnowledgeCommentActivity.java

diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 9d51a8289..06774d849 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -7,6 +7,7 @@
 import org.support.project.common.log.LogFactory;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.UserConfig;
+import org.support.project.knowledge.dao.CommentsDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.dao.LikesDao;
 import org.support.project.knowledge.dao.ParticipantsDao;
@@ -14,6 +15,7 @@
 import org.support.project.knowledge.dao.SurveyAnswersDao;
 import org.support.project.knowledge.dao.ViewHistoriesDao;
 import org.support.project.knowledge.deploy.Migrate;
+import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.ParticipantsEntity;
@@ -29,12 +31,14 @@
 import org.support.project.web.entity.UsersEntity;
 
 public class Migrate_1_11_2 implements Migrate {
+    private static final int _WAIT = 50;
     /** ログ */
     private static final Log LOG = LogFactory.getLog(Migrate_1_11_2.class);
 
     public static Migrate_1_11_2 get() {
         return org.support.project.di.Container.getComp(Migrate_1_11_2.class);
     }
+    private int limit = 1; // 1件毎にコミットいれないと、別コネクションで取得して結果をクリアしてしまう？
 
     @Override
     public boolean doMigrate() throws Exception {
@@ -48,14 +52,11 @@ public boolean doMigrate() throws Exception {
         doSetViewCountToKnowledge();
         // ユーザについているポイントをクリア
         clearUserPoint();
-        
         // Knowledgeを登録したイベントによりポイントを集計
         doAddPointByKnowledge();
         // Knowledgeを参照したイベントによりポイントを集計
         doAddPointByKnowledgeShow();
         // Knowledgeにイイネを押したイベントによりポイント集計
-        doAddPointByKnowledgeShow();
-        // Knowledgeにイイネを押したイベントによりポイント集計
         doAddPointByKnowledgeLike();
         // Knowledgeをストックイベントによりポイント集計
         doAddPointByKnowledgeStock();
@@ -63,255 +64,278 @@ public boolean doMigrate() throws Exception {
         doAddPointByKnowledgeAnswer();
         // Knowledgeイベント参加したイベントによりポイント集計
         doAddPointByKnowledgeJoinEvent();
+        // コメントを登録したイベントによりポイント集計
+        doAddPointByKnowledgeComment();
         
         
         return true;
     }
     
     
+    private void doAddPointByKnowledgeComment() throws InterruptedException {
+        LOG.info("Aggregate point by comment");
+        List<CommentsEntity> list;
+        int offset = 0;
+        do {
+            list = doAddPointByKnowledgeComment(offset, limit);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<CommentsEntity> doAddPointByKnowledgeComment(int offset, int limit) {
+        List<CommentsEntity> list;
+        list = CommentsDao.get().selectAllWidthPager(limit, offset);
+        for (CommentsEntity item : list) {
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.debug("    comment [" + item.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_COMMENT_ADD, user, item.getInsertDatetime(), item);
+        }
+        return list;
+    }
+
     private void doAddPointByKnowledgeJoinEvent() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge join event");
         List<ParticipantsEntity> list;
         int offset = 0;
-        int limit = 50;
         do {
             list = doAddPointByKnowledgeJoinEvent(offset, limit);
             offset = offset + limit;
             synchronized (this) {
-                wait(200);
+                wait(_WAIT);
             }
         } while (list.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private List<ParticipantsEntity> doAddPointByKnowledgeJoinEvent(int offset, int limit) {
-        LOG.info("Aggregate point by knowledge join event");
+    public List<ParticipantsEntity> doAddPointByKnowledgeJoinEvent(int offset, int limit) {
         List<ParticipantsEntity> list;
         list = ParticipantsDao.get().selectAllWidthPager(limit, offset);
         for (ParticipantsEntity item : list) {
             KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
-                LOG.info("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
                 continue;
             }
             LoginedUser user = new LoginedUser();
             UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
             if (account == null) {
-                LOG.info("    event user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
                 continue;
             }
             user.setLoginUser(account);
-            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
             ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_ADD, user, item.getInsertDatetime(), knowledge);
         }
         return list;
     }
 
     private void doAddPointByKnowledgeAnswer() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge answer");
         List<SurveyAnswersEntity> list;
         int offset = 0;
-        int limit = 50;
         do {
             list = doAddPointByKnowledgeAnswer(offset, limit);
             offset = offset + limit;
             synchronized (this) {
-                wait(200);
+                wait(_WAIT);
             }
         } while (list.size() > 0);
     }
 
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private List<SurveyAnswersEntity> doAddPointByKnowledgeAnswer(int offset, int limit) {
-        LOG.info("Aggregate point by knowledge answer");
+    public List<SurveyAnswersEntity> doAddPointByKnowledgeAnswer(int offset, int limit) {
         List<SurveyAnswersEntity> list;
         list = SurveyAnswersDao.get().selectAllWidthPager(limit, offset);
-        for (SurveyAnswersEntity answer : list) {
-            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(answer.getKnowledgeId());
+        for (SurveyAnswersEntity item : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
-                LOG.info("    knowledge [" + answer.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
                 continue;
             }
             LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(answer.getInsertUser());
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
             if (account == null) {
-                LOG.info("    event user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
                 continue;
             }
             user.setLoginUser(account);
-            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_ANSWER, user, answer.getInsertDatetime(), knowledge);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_ANSWER, user, item.getInsertDatetime(), knowledge);
         }
         return list;
     }
 
     private void doAddPointByKnowledgeStock() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge stock");
         List<StockKnowledgesEntity> list;
         int offset = 0;
-        int limit = 50;
         do {
             list = doAddPointByKnowledgeStock(offset, limit);
             offset = offset + limit;
             synchronized (this) {
-                wait(200);
+                wait(_WAIT);
             }
         } while (list.size() > 0);
     }
 
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset, int limit) {
-        LOG.info("Aggregate point by knowledge stock");
+    public List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset, int limit) {
         List<StockKnowledgesEntity> list;
         list = StockKnowledgesDao.get().selectAllWidthPager(limit, offset);
-        for (StockKnowledgesEntity stock : list) {
-            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(stock.getKnowledgeId());
+        for (StockKnowledgesEntity item : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
-                LOG.info("    knowledge [" + stock.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
                 continue;
             }
             LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(stock.getInsertUser());
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
             if (account == null) {
-                LOG.info("    event user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
                 continue;
             }
             user.setLoginUser(account);
-            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_STOCK, user, stock.getInsertDatetime(), knowledge);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_STOCK, user, item.getInsertDatetime(), knowledge);
         }
         return list;
     }
 
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     private void doAddPointByKnowledgeLike() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge like");
         List<LikesEntity> list;
         int offset = 0;
-        int limit = 50;
         do {
             list = doAddPointByKnowledgeLike(offset, limit);
             offset = offset + limit;
             synchronized (this) {
-                wait(200);
+                wait(_WAIT);
             }
         } while (list.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private List<LikesEntity> doAddPointByKnowledgeLike(int offset, int limit) {
-        LOG.info("Aggregate point by knowledge like");
+    public List<LikesEntity> doAddPointByKnowledgeLike(int offset, int limit) {
         List<LikesEntity> list;
         list = LikesDao.get().selectAllWidthPager(limit, offset);
-        for (LikesEntity like : list) {
-            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(like.getKnowledgeId());
+        for (LikesEntity item : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
-                LOG.info("    knowledge [" + like.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
                 continue;
             }
             LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(like.getInsertUser());
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
             if (account == null) {
-                LOG.info("    event user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
                 continue;
             }
             user.setLoginUser(account);
-            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, user, like.getInsertDatetime(), knowledge);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, user, item.getInsertDatetime(), knowledge);
         }
         return list;
     }
     
     private void doAddPointByKnowledgeShow() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge show");
         List<ViewHistoriesEntity> list;
         int offset = 0;
-        int limit = 50;
         do {
             list = doAddPointByKnowledgeShow(offset, limit);
             offset = offset + limit;
             synchronized (this) {
-                wait(200);
+                wait(_WAIT);
             }
         } while (list.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset, int limit) {
-        LOG.info("Aggregate point by knowledge show");
+    public List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset, int limit) {
         List<ViewHistoriesEntity> list;
         list = ViewHistoriesDao.get().selectAllWidthPager(limit, offset);
-        for (ViewHistoriesEntity viewHistoriesEntity : list) {
-            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(viewHistoriesEntity.getKnowledgeId());
+        for (ViewHistoriesEntity item : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
-                LOG.info("    knowledge [" + viewHistoriesEntity.getKnowledgeId() + "] is not found. so skip add point by knowledge show.");
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge show.");
                 continue;
             }
             LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(viewHistoriesEntity.getInsertUser());
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
             if (account == null) {
-                LOG.info("    event user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge show.");
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge show.");
                 continue;
             }
             user.setLoginUser(account);
-            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, user, viewHistoriesEntity.getInsertDatetime(), knowledge);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, user, item.getInsertDatetime(), knowledge);
         }
         return list;
     }
 
     public void doAddPointByKnowledge() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge insert");
         List<KnowledgesEntity> knowledges;
         int offset = 0;
-        int limit = 50;
         do {
             knowledges = doAddPointByKnowledge(offset, limit);
             offset = offset + limit;
             synchronized (this) {
-                wait(200);
+                wait(_WAIT);
             }
         } while (knowledges.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private List<KnowledgesEntity> doAddPointByKnowledge(int offset, int limit) {
-        LOG.info("Aggregate point by knowledge insert");
+    public List<KnowledgesEntity> doAddPointByKnowledge(int offset, int limit) {
         List<KnowledgesEntity> knowledges;
         knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset);
-        for (KnowledgesEntity knowledge : knowledges) {
+        for (KnowledgesEntity item : knowledges) {
             LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(knowledge.getInsertUser());
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
             if (account == null) {
-                LOG.info("    insert user [" + knowledge.getInsertUser() + "] is not found. so skip add point by knowledge insert.");
+                LOG.debug("    insert user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge insert.");
                 continue;
             }
             user.setLoginUser(account);
-            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, user, knowledge.getInsertDatetime(), knowledge);
+            LOG.debug("    knowledge [" + item.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, user, item.getInsertDatetime(), item);
         }
         return knowledges;
     }
     
     private void doSetViewCountToKnowledge() throws InterruptedException {
+        LOG.info("Set view count to Knowledge");
         List<KnowledgesEntity> knowledges;
         int offset = 0;
-        int limit = 50;
         do {
             knowledges = doSetViewCountToKnowledge(offset, limit);
             offset = offset + limit;
             synchronized (this) {
-                wait(200);
+                wait(_WAIT);
             }
         } while (knowledges.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private List<KnowledgesEntity> doSetViewCountToKnowledge(int offset, int limit) {
-        LOG.info("Set view count to Knowledge");
+    public List<KnowledgesEntity> doSetViewCountToKnowledge(int offset, int limit) {
         List<KnowledgesEntity> knowledges;
         knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset);
         for (KnowledgesEntity knowledge : knowledges) {
-            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] ");
             long count = ViewHistoriesDao.get().selectCountOnKnowledgeId(knowledge.getKnowledgeId());
             KnowledgesDao.get().updateViewCount(count, knowledge.getKnowledgeId());
-            
             //ついでにポイントも初期化
             KnowledgesDao.get().updatePoint(knowledge.getKnowledgeId(), 0);
+            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] is updated. view count : " + count);
         }
         return knowledges;
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private void clearUserPoint() {
+    public void clearUserPoint() {
         UserConfigsDao.get().removeAllUserConfig(AppConfig.get().getSystemName(), UserConfig.POINT);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
index 4cc5bf77a..33f361902 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
@@ -4,7 +4,10 @@
 import java.sql.Timestamp;
 import java.util.Date;
 
+import org.support.project.aop.Aspect;
 import org.support.project.common.config.INT_FLAG;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.StringUtils;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.UserConfig;
@@ -25,6 +28,7 @@
  * @author koda
  */
 public abstract class AbstractActivityProcessor implements ActivityProcessor {
+    private static final Log LOG = LogFactory.getLog(AbstractActivityProcessor.class);
     private static Object lockUser = new Object();
     private static Object lockKnowledge = new Object();
     
@@ -76,6 +80,7 @@ protected boolean isExistsActivity(int userId, Activity kind, String target) {
      * @param kind アクティビティの種類
      * @param target そのアクティビティでポイントを付与する対象
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     protected ActivitiesEntity addActivity(Activity kind, String target) {
         ActivitiesEntity entity = new ActivitiesEntity();
         entity.setUserId(eventUser.getUserId());
@@ -98,6 +103,7 @@ protected ActivitiesEntity addActivity(Activity kind, String target) {
      * @param point
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     protected int addPointForUser(int targetUser, long activityNo, int type, int point) {
         synchronized(lockUser) {
             long num = PointUserHistoriesDao.get().selectNumOnUser(targetUser);
@@ -139,6 +145,7 @@ protected int addPointForUser(int targetUser, long activityNo, int type, int poi
      * @param point
      * @return
      */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     protected int addPointForKnowledge(long knowledgeId, long activityNo, int type, int point) {
         synchronized (lockKnowledge) {
             long num = PointKnowledgeHistoriesDao.get().selectNumOnKnowledge(knowledgeId);
@@ -157,8 +164,9 @@ protected int addPointForKnowledge(long knowledgeId, long activityNo, int type,
             // Daoのupdateメソッドなどを使うと、「更新者」が更新されるので、ポイントのみを更新するメソッドを呼ぶ
             // なお、記事の存在チェックは行わない
             int now = KnowledgesDao.get().selectPoint(knowledgeId);
+            LOG.info("Add point [knowledge]" + knowledgeId + " [point]" + point + " [now]" + now);
             now = now + point;
-            KnowledgesDao.get().updatePoint(knowledgeId, point);
+            KnowledgesDao.get().updatePoint(knowledgeId, now);
             return now;
         }
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
index 2ecf4f345..78e8c289d 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
@@ -1,8 +1,15 @@
 package org.support.project.knowledge.logic.activity;
 
+import org.support.project.aop.Aspect;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.entity.ActivitiesEntity;
 import org.support.project.knowledge.entity.CommentsEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
 
 public abstract class AbstractAddPointForCommentProcessor extends AbstractActivityProcessor {
+    private static final Log LOG = LogFactory.getLog(AbstractAddPointForCommentProcessor.class);
     private CommentsEntity comment;
     /**
      * @return the comment
@@ -16,4 +23,73 @@ public CommentsEntity getComment() {
     public void setComment(CommentsEntity comment) {
         this.comment = comment;
     }
+    
+    protected abstract Activity getActivity();
+    protected abstract TypeAndPoint getTypeAndPointForActivityExecuter();
+    protected abstract TypeAndPoint getTypeAndPointForCommentOwner();
+    protected abstract TypeAndPoint getTypeAndPointForKnowledge();
+    
+    @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void execute() throws Exception {
+        if (getComment() == null || eventUser == null) {
+            // ありえないけど念のため確認
+            return;
+        }
+        if (isExistsActivity(eventUser.getUserId(), getActivity(), String.valueOf(getComment().getCommentNo()))) {
+            LOG.info("This activity is already exists. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+                    + " [comment]" + getComment().getCommentNo());
+            return;
+        }
+        KnowledgesEntity parentKnowledge = KnowledgesDao.get().selectOnKey(getComment().getKnowledgeId());
+        if (parentKnowledge == null) {
+            LOG.info("Knowledge is not found. [comment] " + getComment().getCommentNo() + " [knowledge]" + getComment().getKnowledgeId());
+            return;
+        }
+        
+        LOG.info("activity process started. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+        + " [comment]" + getComment().getCommentNo());
+        
+        StringBuilder logmsg = new StringBuilder();
+        logmsg.append("Activity : " + getActivity().toString());
+        
+         // ポイント発行アクティビティを生成
+        ActivitiesEntity activity = addActivity(
+                getActivity(),
+                String.valueOf(getComment().getCommentNo()));
+        
+        // 実行したユーザのポイントアップ
+        TypeAndPoint exec = getTypeAndPointForActivityExecuter();
+        if (exec != null) {
+            int point = addPointForUser(
+                    eventUser.getUserId(), // ターゲットは、実行したユーザ
+                    activity.getActivityNo(),
+                    exec.type,
+                    exec.point);
+            logmsg.append("\n\tAdd event user: [id]" + eventUser.getUserId() + " [type]" + exec.type + " [add]" + exec.point + " [result]" + point);
+        }
+         // コメントの登録者のポイントをアップ
+        TypeAndPoint owner = getTypeAndPointForCommentOwner();
+        if (owner != null) {
+            int point = addPointForUser(
+                    getComment().getInsertUser(), // ターゲットは登録者
+                    activity.getActivityNo(),
+                    owner.type,
+                    owner.point);
+            logmsg.append("\n\tAdd owner user: [id]" + getComment().getInsertUser() + " [type]" + owner.type + " [add]" + owner.point + " [result]" + point);
+        }
+         // 記事のポイントアップ（コメントにはポイントをもっていないので、親のナレッジのポイントをアップ）
+        TypeAndPoint knowledge = getTypeAndPointForKnowledge();
+        if (knowledge != null) {
+            int point = addPointForKnowledge(
+                    parentKnowledge.getKnowledgeId(),
+                    activity.getActivityNo(),
+                    knowledge.type,
+                    knowledge.point);
+            logmsg.append("\n\tAdd knowledge: [id]" + parentKnowledge.getKnowledgeId() + " [type]" + knowledge.type + " [add]" + knowledge.point + " [result]" + point);
+        }
+        LOG.info(logmsg.toString());
+    }
+    
+    
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
index 1d3c70e9f..51334644a 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
@@ -1,9 +1,13 @@
 package org.support.project.knowledge.logic.activity;
 
+import org.support.project.aop.Aspect;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
 import org.support.project.knowledge.entity.ActivitiesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 
 public abstract class AbstractAddPointForKnowledgeProcessor extends AbstractActivityProcessor {
+    private static final Log LOG = LogFactory.getLog(AbstractAddPointForKnowledgeProcessor.class);
     private KnowledgesEntity knowledge;
     /**
      * @return the knowledge
@@ -24,47 +28,61 @@ public void setKnowledge(KnowledgesEntity knowledge) {
     protected abstract TypeAndPoint getTypeAndPointForKnowledge();
     
     @Override
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void execute() throws Exception {
         if (getKnowledge() == null || eventUser == null) {
             // ありえないけど念のため確認
             return;
         }
         if (isExistsActivity(eventUser.getUserId(), getActivity(), String.valueOf(getKnowledge().getKnowledgeId()))) {
+            LOG.info("This activity is already exists. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+                    + " [knowledge]" + getKnowledge().getKnowledgeId());
             // 既に指定のKnowledge登録済
             return;
         }
+        LOG.info("activity process started. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+        + " [knowledge]" + getKnowledge().getKnowledgeId());
+        
+        StringBuilder logmsg = new StringBuilder();
+        logmsg.append("Activity : " + getActivity().toString());
+        
          // ポイント発行アクティビティを生成
         ActivitiesEntity activity = addActivity(
                 getActivity(),
                 String.valueOf(getKnowledge().getKnowledgeId()));
         
+        
         // 実行したユーザのポイントアップ
         TypeAndPoint exec = getTypeAndPointForActivityExecuter();
         if (exec != null) {
-            addPointForUser(
+            int point = addPointForUser(
                     eventUser.getUserId(), // ターゲットは、実行したユーザ
                     activity.getActivityNo(),
                     exec.type,
                     exec.point);
+            logmsg.append("\n\tAdd event user: [id]" + eventUser.getUserId() + " [type]" + exec.type + " [add]" + exec.point + " [result]" + point);
         }
          // 記事の登録者のポイントをアップ
         TypeAndPoint owner = getTypeAndPointForKnowledgeOwner();
         if (owner != null) {
-            addPointForUser(
+            int point = addPointForUser(
                     getKnowledge().getInsertUser(), // ターゲットは登録者
                     activity.getActivityNo(),
                     owner.type,
                     owner.point);
+            logmsg.append("\n\tAdd owner user: [id]" + getKnowledge().getInsertUser() + " [type]" + owner.type + " [add]" + owner.point + " [result]" + point);
         }
          // 記事のポイントアップ
         TypeAndPoint knowledge = getTypeAndPointForKnowledge();
         if (knowledge != null) {
-            addPointForKnowledge(
+            int point = addPointForKnowledge(
                     getKnowledge().getKnowledgeId(),
                     activity.getActivityNo(),
                     knowledge.type,
                     knowledge.point);
+            logmsg.append("\n\tAdd knowledge: [id]" + getKnowledge().getKnowledgeId() + " [type]" + knowledge.type + " [add]" + knowledge.point + " [result]" + point);
         }
+        LOG.info(logmsg.toString());
     }
 
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/Activity.java b/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
index 4bcd0c21c..280f57261 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
@@ -20,7 +20,7 @@
  * 
  * 種類  | 獲得のタイプ  | ポイント付与先 | ポイント    | 獲得タイプの意味
  * 1    | 11          | 記事登録者    | 50       | 記事を投稿したら投稿者にポイント追加
- * 1    | 12          | 記事         | 50       | 登録された記事のポイント初期値
+ * 1    | 13          | 記事         | 50       | 登録された記事のポイント初期値
  * 2    | 21          | 参照者       | 1        | 記事を参照するアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
  * 2    | 22          | 記事登録者    | 1        | 自分が登録された記事が参照されたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
  * 2    | 23          | 記事         | 1        | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
@@ -37,7 +37,7 @@
  * 6    | 62          | 記事登録者    | 5       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
  * 6    | 63          | 記事         | 5       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
  * 101  | 1011        | 登録者       | 20       | コメントを投稿すると、投稿者にポイント追加
- * 101  | 1012        | 記事         | 20       | 記事にコメントが付くと、その記事に対しポイント追加
+ * 101  | 1013        | 記事         | 20       | 記事にコメントが付くと、その記事に対しポイント追加
  * 102  | 1021        | 参照者       | 2       | イイネを押すと、押した人にポイント追加
  * 102  | 1022        | 登録者       | 10       | コメントにイイネが付くと、そのコメントを登録したユーザにポイントが付く
  * 102  | 1023        | 記事         | 10       | コメントにイイネがつくと、そのコメントの記事に対しポイント追加
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index b2e7c1e16..3f5160c0c 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -37,12 +37,12 @@ private List<ActivityProcessor> getActivityProcessors(Activity activity) {
             array.add(KnowledgeAnswerActivity.get());
         } else if (activity == Activity.KNOWLEDGE_EVENT_ADD) {
             array.add(KnowledgeEventActivity.get());
+        } else if (activity == Activity.KNOWLEDGE_COMMENT_ADD) {
+            array.add(KnowledgeCommentActivity.get());
         }
-        
-        
-        
         return array;
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     private void execute(Activity activity, LoginedUser eventUser, Date eventDateTime, KnowledgesEntity knowledge, CommentsEntity comment) {
         List<ActivityProcessor> processors = this.getActivityProcessors(activity);
         for (ActivityProcessor activityProcessor : processors) {
@@ -53,14 +53,14 @@ private void execute(Activity activity, LoginedUser eventUser, Date eventDateTim
             }
             if (activityProcessor instanceof AbstractAddPointForKnowledgeProcessor) {
                 if (knowledge == null) {
-                    LOG.warn("bad parameter [knowledge]");
+                    LOG.warn("bad parameter [knowledge], because it is null.");
                     continue;
                 }
                 AbstractAddPointForKnowledgeProcessor processor = (AbstractAddPointForKnowledgeProcessor) activityProcessor;
                 processor.setKnowledge(knowledge);
             } else if (activityProcessor instanceof AbstractAddPointForCommentProcessor) {
-                if (knowledge == null) {
-                    LOG.warn("bad parameter [comment]");
+                if (comment == null) {
+                    LOG.warn("bad parameter [comment], because it is null.");
                     continue;
                 }
                 AbstractAddPointForCommentProcessor processor = (AbstractAddPointForCommentProcessor) activityProcessor;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
index 8cd8ac780..941865b1b 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
@@ -4,7 +4,7 @@ public interface ActivityProcessor {
     /*
      * 種類  | 獲得のタイプ  | ポイント付与先 | ポイント    | 獲得タイプの意味
      * 1    | 11          | 記事登録者    | 50       | 記事を投稿したら投稿者にポイント追加
-     * 1    | 12          | 記事         | 50       | 登録された記事のポイント初期値
+     * 1    | 13          | 記事         | 50       | 登録された記事のポイント初期値
      * 2    | 21          | 参照者       | 1        | 記事を参照するアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
      * 2    | 22          | 記事登録者    | 1        | 自分が登録された記事が参照されたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
      * 2    | 23          | 記事         | 1        | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
@@ -21,7 +21,7 @@ public interface ActivityProcessor {
      * 6    | 62          | 記事登録者    | 5       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
      * 6    | 63          | 記事         | 5       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
      * 101  | 1011        | 登録者       | 20       | コメントを投稿すると、投稿者にポイント追加
-     * 101  | 1012        | 記事         | 20       | 記事にコメントが付くと、その記事に対しポイント追加
+     * 101  | 1013        | 記事         | 20       | 記事にコメントが付くと、その記事に対しポイント追加
      * 102  | 1021        | 参照者       | 2       | イイネを押すと、押した人にポイント追加
      * 102  | 1022        | 登録者       | 10       | コメントにイイネが付くと、そのコメントを登録したユーザにポイントが付く
      * 102  | 1023        | 記事         | 10       | コメントにイイネがつくと、そのコメントの記事に対しポイント追加
@@ -30,7 +30,7 @@ public interface ActivityProcessor {
      * -6   | -63         | 記事         | 5       | 記事のポイントが追加（取り消しなのでマイナス）     * 
      */
     public static final int TYPE_KNOWLEDGE_DO_INSERT = 11;
-    public static final int TYPE_KNOWLEDGE_INSERTED = 12;
+    public static final int TYPE_KNOWLEDGE_INSERTED = 13;
     public static final int TYPE_KNOWLEDGE_DO_SHOW = 21;
     public static final int TYPE_KNOWLEDGE_SHOWN_BY_OHER = 22;
     public static final int TYPE_KNOWLEDGE_SHOWN = 23;
@@ -46,6 +46,8 @@ public interface ActivityProcessor {
     public static final int TYPE_KNOWLEDGE_DO_JOIN_EVENT = 61;
     public static final int TYPE_KNOWLEDGE_JOINED_BY_OHER = 62;
     public static final int TYPE_KNOWLEDGE_JOINED = 63;
+    public static final int TYPE_KNOWLEDGE_DO_ADD_COMMENT = 1011;
+    public static final int TYPE_KNOWLEDGE_ADDED_COMMENT = 1013;
     
     void execute() throws Exception;
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeCommentActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeCommentActivity.java
new file mode 100644
index 000000000..a37dbfc68
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeCommentActivity.java
@@ -0,0 +1,38 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+
+/**
+ * 
+ * 101  | 1011        | 登録者       | 20       | コメントを投稿すると、投稿者にポイント追加
+ * 101  | 1012        | 記事         | 20       | 記事にコメントが付くと、その記事に対しポイント追加
+ * 
+ * @author koda
+ */
+public class KnowledgeCommentActivity extends AbstractAddPointForCommentProcessor {
+    private static final Log LOG = LogFactory.getLog(KnowledgeCommentActivity.class);
+    public static KnowledgeCommentActivity get() {
+        return Container.getComp(KnowledgeCommentActivity.class);
+    }
+    
+    @Override
+    protected Activity getActivity() {
+        LOG.debug("Start add point process on add comment knowledge.");
+        return Activity.KNOWLEDGE_COMMENT_ADD;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_ADD_COMMENT, 20);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForCommentOwner() {
+        return null;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledge() {
+        return new TypeAndPoint(TYPE_KNOWLEDGE_ADDED_COMMENT, 20);
+    }
+
+}
diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
index c75941cea..e90bbdae9 100644
--- a/src/main/resources/log4j.xml
+++ b/src/main/resources/log4j.xml
@@ -44,6 +44,13 @@
     <category name="org.support.project.web.filter.LoggingFilter">
         <level value="INFO" />
     </category>
+    <category name="org.support.project.ormapping.transaction.Transaction">
+        <level value="INFO" />
+    </category>
+    <category name="org.support.project.ormapping.dao.AbstractDao">
+        <level value="INFO" />
+    </category>
+    
 
     <category name="org.support.project.knowledge.bat">
         <level value="INFO" />

From 6ab8f5f30ac38592f068e1f9c5266bb8423102af Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 5 Sep 2017 00:02:17 +0900
Subject: [PATCH 046/138] #840 Add sort order

---
 .../dao/gen/GenAccountImagesDao.java          | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenActivitiesDao.java   | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenBadgesDao.java       | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenCommentsDao.java     | 45 +++++++++++++++++++
 .../dao/gen/GenDraftItemValuesDao.java        | 45 +++++++++++++++++++
 .../dao/gen/GenDraftKnowledgesDao.java        | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenEventsDao.java       | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenItemChoicesDao.java  | 45 +++++++++++++++++++
 .../dao/gen/GenKnowledgeEditGroupsDao.java    | 45 +++++++++++++++++++
 .../dao/gen/GenKnowledgeEditUsersDao.java     | 45 +++++++++++++++++++
 .../dao/gen/GenKnowledgeFilesDao.java         | 45 +++++++++++++++++++
 .../dao/gen/GenKnowledgeGroupsDao.java        | 45 +++++++++++++++++++
 .../dao/gen/GenKnowledgeHistoriesDao.java     | 45 +++++++++++++++++++
 .../dao/gen/GenKnowledgeItemValuesDao.java    | 45 +++++++++++++++++++
 .../dao/gen/GenKnowledgeTagsDao.java          | 45 +++++++++++++++++++
 .../dao/gen/GenKnowledgeUsersDao.java         | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenKnowledgesDao.java   | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenLikeCommentsDao.java | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenLikesDao.java        | 45 +++++++++++++++++++
 .../dao/gen/GenMailHookConditionsDao.java     | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenMailHooksDao.java    | 45 +++++++++++++++++++
 .../dao/gen/GenMailLocaleTemplatesDao.java    | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenMailPostsDao.java    | 45 +++++++++++++++++++
 .../dao/gen/GenMailPropertiesDao.java         | 45 +++++++++++++++++++
 .../dao/gen/GenMailTemplatesDao.java          | 45 +++++++++++++++++++
 .../dao/gen/GenNotifyConfigsDao.java          | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenNotifyQueuesDao.java | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenParticipantsDao.java | 45 +++++++++++++++++++
 .../project/knowledge/dao/gen/GenPinsDao.java | 45 +++++++++++++++++++
 .../gen/GenPointKnowledgeHistoriesDao.java    | 45 +++++++++++++++++++
 .../dao/gen/GenPointUserHistoriesDao.java     | 45 +++++++++++++++++++
 .../dao/gen/GenServiceConfigsDao.java         | 45 +++++++++++++++++++
 .../dao/gen/GenServiceLocaleConfigsDao.java   | 45 +++++++++++++++++++
 .../dao/gen/GenStockKnowledgesDao.java        | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenStocksDao.java       | 45 +++++++++++++++++++
 .../dao/gen/GenSurveyAnswersDao.java          | 45 +++++++++++++++++++
 .../dao/gen/GenSurveyChoicesDao.java          | 45 +++++++++++++++++++
 .../dao/gen/GenSurveyItemAnswersDao.java      | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenSurveyItemsDao.java  | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenSurveysDao.java      | 45 +++++++++++++++++++
 .../project/knowledge/dao/gen/GenTagsDao.java | 45 +++++++++++++++++++
 .../dao/gen/GenTemplateItemsDao.java          | 45 +++++++++++++++++++
 .../dao/gen/GenTemplateMastersDao.java        | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenTokensDao.java       | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenUserBadgesDao.java   | 45 +++++++++++++++++++
 .../dao/gen/GenViewHistoriesDao.java          | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenVotesDao.java        | 45 +++++++++++++++++++
 .../dao/gen/GenWebhookConfigsDao.java         | 45 +++++++++++++++++++
 .../knowledge/dao/gen/GenWebhooksDao.java     | 45 +++++++++++++++++++
 .../AccountImagesDao_physical_select_all.sql  |  2 +-
 ...agesDao_physical_select_all_with_pager.sql |  2 +-
 .../AccountImagesDao_select_all.sql           |  2 +-
 ...AccountImagesDao_select_all_with_pager.sql |  2 +-
 .../ActivitiesDao_physical_select_all.sql     |  2 +-
 ...tiesDao_physical_select_all_with_pager.sql |  2 +-
 .../ActivitiesDao_select_all.sql              |  2 +-
 .../ActivitiesDao_select_all_with_pager.sql   |  2 +-
 .../BadgesDao_physical_select_all.sql         |  2 +-
 ...dgesDao_physical_select_all_with_pager.sql |  2 +-
 .../sql/BadgesDao/BadgesDao_select_all.sql    |  2 +-
 .../BadgesDao_select_all_with_pager.sql       |  2 +-
 .../CommentsDao_physical_select_all.sql       |  2 +-
 ...entsDao_physical_select_all_with_pager.sql |  2 +-
 .../CommentsDao/CommentsDao_select_all.sql    |  2 +-
 .../CommentsDao_select_all_with_pager.sql     |  2 +-
 ...DraftItemValuesDao_physical_select_all.sql |  2 +-
 ...luesDao_physical_select_all_with_pager.sql |  2 +-
 .../DraftItemValuesDao_select_all.sql         |  2 +-
 ...aftItemValuesDao_select_all_with_pager.sql |  2 +-
 ...DraftKnowledgesDao_physical_select_all.sql |  2 +-
 ...dgesDao_physical_select_all_with_pager.sql |  2 +-
 .../DraftKnowledgesDao_select_all.sql         |  2 +-
 ...aftKnowledgesDao_select_all_with_pager.sql |  2 +-
 .../EventsDao_physical_select_all.sql         |  2 +-
 ...entsDao_physical_select_all_with_pager.sql |  2 +-
 .../sql/EventsDao/EventsDao_select_all.sql    |  2 +-
 .../EventsDao_select_all_with_pager.sql       |  2 +-
 .../ItemChoicesDao_physical_select_all.sql    |  2 +-
 ...icesDao_physical_select_all_with_pager.sql |  2 +-
 .../ItemChoicesDao_select_all.sql             |  2 +-
 .../ItemChoicesDao_select_all_with_pager.sql  |  2 +-
 ...ledgeEditGroupsDao_physical_select_all.sql |  2 +-
 ...oupsDao_physical_select_all_with_pager.sql |  2 +-
 .../KnowledgeEditGroupsDao_select_all.sql     |  2 +-
 ...dgeEditGroupsDao_select_all_with_pager.sql |  2 +-
 ...wledgeEditUsersDao_physical_select_all.sql |  2 +-
 ...sersDao_physical_select_all_with_pager.sql |  2 +-
 .../KnowledgeEditUsersDao_select_all.sql      |  2 +-
 ...edgeEditUsersDao_select_all_with_pager.sql |  2 +-
 .../KnowledgeFilesDao_physical_select_all.sql |  2 +-
 ...ilesDao_physical_select_all_with_pager.sql |  2 +-
 .../KnowledgeFilesDao_select_all.sql          |  2 +-
 ...nowledgeFilesDao_select_all_with_pager.sql |  2 +-
 ...KnowledgeGroupsDao_physical_select_all.sql |  2 +-
 ...oupsDao_physical_select_all_with_pager.sql |  2 +-
 .../KnowledgeGroupsDao_select_all.sql         |  2 +-
 ...owledgeGroupsDao_select_all_with_pager.sql |  2 +-
 ...wledgeHistoriesDao_physical_select_all.sql |  2 +-
 ...riesDao_physical_select_all_with_pager.sql |  2 +-
 .../KnowledgeHistoriesDao_select_all.sql      |  2 +-
 ...edgeHistoriesDao_select_all_with_pager.sql |  2 +-
 ...ledgeItemValuesDao_physical_select_all.sql |  2 +-
 ...luesDao_physical_select_all_with_pager.sql |  2 +-
 .../KnowledgeItemValuesDao_select_all.sql     |  2 +-
 ...dgeItemValuesDao_select_all_with_pager.sql |  2 +-
 .../KnowledgeTagsDao_physical_select_all.sql  |  2 +-
 ...TagsDao_physical_select_all_with_pager.sql |  2 +-
 .../KnowledgeTagsDao_select_all.sql           |  2 +-
 ...KnowledgeTagsDao_select_all_with_pager.sql |  2 +-
 .../KnowledgeUsersDao_physical_select_all.sql |  2 +-
 ...sersDao_physical_select_all_with_pager.sql |  2 +-
 .../KnowledgeUsersDao_select_all.sql          |  2 +-
 ...nowledgeUsersDao_select_all_with_pager.sql |  2 +-
 .../KnowledgesDao_physical_select_all.sql     |  2 +-
 ...dgesDao_physical_select_all_with_pager.sql |  2 +-
 .../KnowledgesDao_select_all.sql              |  2 +-
 .../KnowledgesDao_select_all_with_pager.sql   |  2 +-
 .../LikeCommentsDao_physical_select_all.sql   |  2 +-
 ...entsDao_physical_select_all_with_pager.sql |  2 +-
 .../LikeCommentsDao_select_all.sql            |  2 +-
 .../LikeCommentsDao_select_all_with_pager.sql |  2 +-
 .../LikesDao/LikesDao_physical_select_all.sql |  2 +-
 ...ikesDao_physical_select_all_with_pager.sql |  2 +-
 .../dao/sql/LikesDao/LikesDao_select_all.sql  |  2 +-
 .../LikesDao_select_all_with_pager.sql        |  2 +-
 ...lHookConditionsDao_physical_select_all.sql |  2 +-
 ...ionsDao_physical_select_all_with_pager.sql |  2 +-
 .../MailHookConditionsDao_select_all.sql      |  2 +-
 ...ookConditionsDao_select_all_with_pager.sql |  2 +-
 .../MailHooksDao_physical_select_all.sql      |  2 +-
 ...ooksDao_physical_select_all_with_pager.sql |  2 +-
 .../MailHooksDao/MailHooksDao_select_all.sql  |  2 +-
 .../MailHooksDao_select_all_with_pager.sql    |  2 +-
 ...LocaleTemplatesDao_physical_select_all.sql |  2 +-
 ...atesDao_physical_select_all_with_pager.sql |  2 +-
 .../MailLocaleTemplatesDao_select_all.sql     |  2 +-
 ...caleTemplatesDao_select_all_with_pager.sql |  2 +-
 .../MailPostsDao_physical_select_all.sql      |  2 +-
 ...ostsDao_physical_select_all_with_pager.sql |  2 +-
 .../MailPostsDao/MailPostsDao_select_all.sql  |  2 +-
 .../MailPostsDao_select_all_with_pager.sql    |  2 +-
 .../MailPropertiesDao_physical_select_all.sql |  2 +-
 ...tiesDao_physical_select_all_with_pager.sql |  2 +-
 .../MailPropertiesDao_select_all.sql          |  2 +-
 ...ailPropertiesDao_select_all_with_pager.sql |  2 +-
 .../MailTemplatesDao_physical_select_all.sql  |  2 +-
 ...atesDao_physical_select_all_with_pager.sql |  2 +-
 .../MailTemplatesDao_select_all.sql           |  2 +-
 ...MailTemplatesDao_select_all_with_pager.sql |  2 +-
 .../NotifyConfigsDao_physical_select_all.sql  |  2 +-
 ...figsDao_physical_select_all_with_pager.sql |  2 +-
 .../NotifyConfigsDao_select_all.sql           |  2 +-
 ...NotifyConfigsDao_select_all_with_pager.sql |  2 +-
 .../NotifyQueuesDao_physical_select_all.sql   |  2 +-
 ...euesDao_physical_select_all_with_pager.sql |  2 +-
 .../NotifyQueuesDao_select_all.sql            |  2 +-
 .../NotifyQueuesDao_select_all_with_pager.sql |  2 +-
 .../ParticipantsDao_physical_select_all.sql   |  2 +-
 ...antsDao_physical_select_all_with_pager.sql |  2 +-
 .../ParticipantsDao_select_all.sql            |  2 +-
 .../ParticipantsDao_select_all_with_pager.sql |  2 +-
 .../PinsDao/PinsDao_physical_select_all.sql   |  2 +-
 ...PinsDao_physical_select_all_with_pager.sql |  2 +-
 .../dao/sql/PinsDao/PinsDao_select_all.sql    |  2 +-
 .../PinsDao/PinsDao_select_all_with_pager.sql |  2 +-
 ...wledgeHistoriesDao_physical_select_all.sql |  2 +-
 ...riesDao_physical_select_all_with_pager.sql |  2 +-
 .../PointKnowledgeHistoriesDao_select_all.sql |  2 +-
 ...edgeHistoriesDao_select_all_with_pager.sql |  2 +-
 ...ntUserHistoriesDao_physical_select_all.sql |  2 +-
 ...riesDao_physical_select_all_with_pager.sql |  2 +-
 .../PointUserHistoriesDao_select_all.sql      |  2 +-
 ...UserHistoriesDao_select_all_with_pager.sql |  2 +-
 .../ServiceConfigsDao_physical_select_all.sql |  2 +-
 ...figsDao_physical_select_all_with_pager.sql |  2 +-
 .../ServiceConfigsDao_select_all.sql          |  2 +-
 ...erviceConfigsDao_select_all_with_pager.sql |  2 +-
 ...ceLocaleConfigsDao_physical_select_all.sql |  2 +-
 ...figsDao_physical_select_all_with_pager.sql |  2 +-
 .../ServiceLocaleConfigsDao_select_all.sql    |  2 +-
 ...LocaleConfigsDao_select_all_with_pager.sql |  2 +-
 ...StockKnowledgesDao_physical_select_all.sql |  2 +-
 ...dgesDao_physical_select_all_with_pager.sql |  2 +-
 .../StockKnowledgesDao_select_all.sql         |  2 +-
 ...ockKnowledgesDao_select_all_with_pager.sql |  2 +-
 .../StocksDao_physical_select_all.sql         |  2 +-
 ...ocksDao_physical_select_all_with_pager.sql |  2 +-
 .../sql/StocksDao/StocksDao_select_all.sql    |  2 +-
 .../StocksDao_select_all_with_pager.sql       |  2 +-
 .../SurveyAnswersDao_physical_select_all.sql  |  2 +-
 ...wersDao_physical_select_all_with_pager.sql |  2 +-
 .../SurveyAnswersDao_select_all.sql           |  2 +-
 ...SurveyAnswersDao_select_all_with_pager.sql |  2 +-
 .../SurveyChoicesDao_physical_select_all.sql  |  2 +-
 ...icesDao_physical_select_all_with_pager.sql |  2 +-
 .../SurveyChoicesDao_select_all.sql           |  2 +-
 ...SurveyChoicesDao_select_all_with_pager.sql |  2 +-
 ...rveyItemAnswersDao_physical_select_all.sql |  2 +-
 ...wersDao_physical_select_all_with_pager.sql |  2 +-
 .../SurveyItemAnswersDao_select_all.sql       |  2 +-
 ...eyItemAnswersDao_select_all_with_pager.sql |  2 +-
 .../SurveyItemsDao_physical_select_all.sql    |  2 +-
 ...temsDao_physical_select_all_with_pager.sql |  2 +-
 .../SurveyItemsDao_select_all.sql             |  2 +-
 .../SurveyItemsDao_select_all_with_pager.sql  |  2 +-
 .../SurveysDao_physical_select_all.sql        |  2 +-
 ...veysDao_physical_select_all_with_pager.sql |  2 +-
 .../sql/SurveysDao/SurveysDao_select_all.sql  |  2 +-
 .../SurveysDao_select_all_with_pager.sql      |  2 +-
 .../TagsDao/TagsDao_physical_select_all.sql   |  2 +-
 ...TagsDao_physical_select_all_with_pager.sql |  2 +-
 .../dao/sql/TagsDao/TagsDao_select_all.sql    |  2 +-
 .../TagsDao/TagsDao_select_all_with_pager.sql |  2 +-
 .../TemplateItemsDao_physical_select_all.sql  |  2 +-
 ...temsDao_physical_select_all_with_pager.sql |  2 +-
 .../TemplateItemsDao_select_all.sql           |  2 +-
 ...TemplateItemsDao_select_all_with_pager.sql |  2 +-
 ...TemplateMastersDao_physical_select_all.sql |  2 +-
 ...tersDao_physical_select_all_with_pager.sql |  2 +-
 .../TemplateMastersDao_select_all.sql         |  2 +-
 ...mplateMastersDao_select_all_with_pager.sql |  2 +-
 .../TokensDao_physical_select_all.sql         |  2 +-
 ...kensDao_physical_select_all_with_pager.sql |  2 +-
 .../sql/TokensDao/TokensDao_select_all.sql    |  2 +-
 .../TokensDao_select_all_with_pager.sql       |  2 +-
 .../UserBadgesDao_physical_select_all.sql     |  2 +-
 ...dgesDao_physical_select_all_with_pager.sql |  2 +-
 .../UserBadgesDao_select_all.sql              |  2 +-
 .../UserBadgesDao_select_all_with_pager.sql   |  2 +-
 .../ViewHistoriesDao_physical_select_all.sql  |  2 +-
 ...riesDao_physical_select_all_with_pager.sql |  2 +-
 .../ViewHistoriesDao_select_all.sql           |  2 +-
 ...ViewHistoriesDao_select_all_with_pager.sql |  2 +-
 .../VotesDao/VotesDao_physical_select_all.sql |  2 +-
 ...otesDao_physical_select_all_with_pager.sql |  2 +-
 .../dao/sql/VotesDao/VotesDao_select_all.sql  |  2 +-
 .../VotesDao_select_all_with_pager.sql        |  2 +-
 .../WebhookConfigsDao_physical_select_all.sql |  2 +-
 ...figsDao_physical_select_all_with_pager.sql |  2 +-
 .../WebhookConfigsDao_select_all.sql          |  2 +-
 ...ebhookConfigsDao_select_all_with_pager.sql |  2 +-
 .../WebhooksDao_physical_select_all.sql       |  2 +-
 ...ooksDao_physical_select_all_with_pager.sql |  2 +-
 .../WebhooksDao/WebhooksDao_select_all.sql    |  2 +-
 .../WebhooksDao_select_all_with_pager.sql     |  2 +-
 245 files changed, 2401 insertions(+), 196 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
index 48f17cdc7..0827f862c 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
@@ -13,6 +13,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -46,7 +47,17 @@ public static GenAccountImagesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<AccountImagesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<AccountImagesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, AccountImagesEntity.class);
     }
     /**
@@ -57,7 +68,19 @@ public List<AccountImagesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<AccountImagesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<AccountImagesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, AccountImagesEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public AccountImagesEntity physicalSelectOnKey(Long imageId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<AccountImagesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<AccountImagesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, AccountImagesEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<AccountImagesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<AccountImagesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<AccountImagesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, AccountImagesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
index 84312aa0b..77bcf0065 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenActivitiesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ActivitiesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ActivitiesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ActivitiesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<ActivitiesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ActivitiesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ActivitiesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ActivitiesEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public ActivitiesEntity physicalSelectOnKey(Long activityNo) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ActivitiesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ActivitiesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ActivitiesEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<ActivitiesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ActivitiesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ActivitiesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ActivitiesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
index ec4abda90..8c159b812 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenBadgesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<BadgesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<BadgesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, BadgesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<BadgesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<BadgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<BadgesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, BadgesEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public BadgesEntity physicalSelectOnKey(Integer no) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<BadgesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<BadgesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, BadgesEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<BadgesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<BadgesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<BadgesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, BadgesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
index ee8ea80fe..f8f48dfd7 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenCommentsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<CommentsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<CommentsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, CommentsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<CommentsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<CommentsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<CommentsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, CommentsEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public CommentsEntity physicalSelectOnKey(Long commentNo) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<CommentsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<CommentsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, CommentsEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<CommentsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<CommentsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<CommentsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, CommentsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java
index 292ea2e95..25123fdd0 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenDraftItemValuesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<DraftItemValuesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, DraftItemValuesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<DraftItemValuesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<DraftItemValuesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, DraftItemValuesEntity.class, limit, offset);
     }
     /**
@@ -77,7 +100,17 @@ public DraftItemValuesEntity physicalSelectOnKey(Long draftId, Integer itemNo, I
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<DraftItemValuesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, DraftItemValuesEntity.class);
     }
     /**
@@ -88,7 +121,19 @@ public List<DraftItemValuesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftItemValuesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<DraftItemValuesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, DraftItemValuesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
index 5a5a22fd7..943943414 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenDraftKnowledgesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftKnowledgesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<DraftKnowledgesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, DraftKnowledgesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<DraftKnowledgesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftKnowledgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<DraftKnowledgesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, DraftKnowledgesEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public DraftKnowledgesEntity physicalSelectOnKey(Long draftId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftKnowledgesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<DraftKnowledgesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, DraftKnowledgesEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<DraftKnowledgesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<DraftKnowledgesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<DraftKnowledgesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, DraftKnowledgesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java
index 9364fcd38..b3af83bab 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenEventsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<EventsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<EventsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, EventsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<EventsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<EventsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<EventsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, EventsEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public EventsEntity physicalSelectOnKey(Long knowledgeId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<EventsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<EventsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, EventsEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<EventsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<EventsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<EventsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, EventsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java
index 0160a8b26..d7f63210c 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenItemChoicesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ItemChoicesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ItemChoicesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<ItemChoicesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ItemChoicesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ItemChoicesEntity.class, limit, offset);
     }
     /**
@@ -77,7 +100,17 @@ public ItemChoicesEntity physicalSelectOnKey(Integer choiceNo, Integer itemNo, I
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ItemChoicesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ItemChoicesEntity.class);
     }
     /**
@@ -88,7 +121,19 @@ public List<ItemChoicesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ItemChoicesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ItemChoicesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ItemChoicesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java
index da6171a3f..d64b1b6d1 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenKnowledgeEditGroupsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeEditGroupsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<KnowledgeEditGroupsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeEditGroupsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public KnowledgeEditGroupsEntity physicalSelectOnKey(Integer groupId, Long knowl
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeEditGroupsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<KnowledgeEditGroupsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditGroupsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeEditGroupsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeEditGroupsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java
index 2f1718f82..6e08954f4 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenKnowledgeEditUsersDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeEditUsersEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeEditUsersEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<KnowledgeEditUsersEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeEditUsersEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeEditUsersEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public KnowledgeEditUsersEntity physicalSelectOnKey(Long knowledgeId, Integer us
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeEditUsersEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeEditUsersEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<KnowledgeEditUsersEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeEditUsersEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeEditUsersEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeEditUsersEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
index f2194f67f..a996f7a7c 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
@@ -13,6 +13,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -46,7 +47,17 @@ public static GenKnowledgeFilesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeFilesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeFilesEntity.class);
     }
     /**
@@ -57,7 +68,19 @@ public List<KnowledgeFilesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeFilesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeFilesEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public KnowledgeFilesEntity physicalSelectOnKey(Long fileNo) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeFilesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeFilesEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<KnowledgeFilesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeFilesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeFilesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeFilesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java
index 6fd2d3d8f..d99a468a7 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenKnowledgeGroupsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeGroupsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeGroupsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<KnowledgeGroupsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeGroupsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeGroupsEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public KnowledgeGroupsEntity physicalSelectOnKey(Integer groupId, Long knowledge
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeGroupsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeGroupsEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<KnowledgeGroupsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeGroupsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeGroupsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeGroupsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java
index 4031d8d38..146c02755 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenKnowledgeHistoriesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeHistoriesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeHistoriesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<KnowledgeHistoriesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeHistoriesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeHistoriesEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public KnowledgeHistoriesEntity physicalSelectOnKey(Integer historyNo, Long know
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeHistoriesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeHistoriesEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<KnowledgeHistoriesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeHistoriesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeHistoriesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeHistoriesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java
index e3545f10e..3aff11032 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenKnowledgeItemValuesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeItemValuesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeItemValuesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<KnowledgeItemValuesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeItemValuesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, limit, offset);
     }
     /**
@@ -77,7 +100,17 @@ public KnowledgeItemValuesEntity physicalSelectOnKey(Integer itemNo, Long knowle
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeItemValuesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeItemValuesEntity.class);
     }
     /**
@@ -88,7 +121,19 @@ public List<KnowledgeItemValuesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeItemValuesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeItemValuesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeItemValuesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java
index 0a82fea17..e7ecb1997 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenKnowledgeTagsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeTagsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeTagsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<KnowledgeTagsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeTagsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeTagsEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public KnowledgeTagsEntity physicalSelectOnKey(Long knowledgeId, Integer tagId)
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeTagsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeTagsEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<KnowledgeTagsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeTagsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeTagsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeTagsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java
index 6a4331f8f..5928b2047 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenKnowledgeUsersDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeUsersEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeUsersEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<KnowledgeUsersEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeUsersEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeUsersEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public KnowledgeUsersEntity physicalSelectOnKey(Long knowledgeId, Integer userId
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeUsersEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeUsersEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<KnowledgeUsersEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgeUsersEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgeUsersEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgeUsersEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
index a0c862c2d..96d323737 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenKnowledgesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<KnowledgesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgesEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public KnowledgesEntity physicalSelectOnKey(Long knowledgeId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgesEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<KnowledgesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, KnowledgesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
index 83ddaf3fd..95dc16aae 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenLikeCommentsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikeCommentsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<LikeCommentsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, LikeCommentsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<LikeCommentsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikeCommentsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<LikeCommentsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, LikeCommentsEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public LikeCommentsEntity physicalSelectOnKey(Long no) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikeCommentsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<LikeCommentsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, LikeCommentsEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<LikeCommentsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikeCommentsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<LikeCommentsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, LikeCommentsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
index 2497deb0b..2b8a4a564 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenLikesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<LikesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, LikesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<LikesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<LikesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, LikesEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public LikesEntity physicalSelectOnKey(Long no) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<LikesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, LikesEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<LikesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<LikesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, LikesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java
index 1074dba68..3f940e367 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenMailHookConditionsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookConditionsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailHookConditionsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<MailHookConditionsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookConditionsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailHookConditionsEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public MailHookConditionsEntity physicalSelectOnKey(Integer conditionNo, Integer
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookConditionsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailHookConditionsEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<MailHookConditionsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHookConditionsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookConditionsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailHookConditionsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
index daae414e7..a34ab4d24 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenMailHooksDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHooksEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHooksEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailHooksEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<MailHooksEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHooksEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHooksEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailHooksEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public MailHooksEntity physicalSelectOnKey(Integer hookId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHooksEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHooksEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailHooksEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<MailHooksEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailHooksEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHooksEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailHooksEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java
index 9d4c8852d..64557990e 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenMailLocaleTemplatesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailLocaleTemplatesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailLocaleTemplatesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<MailLocaleTemplatesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailLocaleTemplatesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailLocaleTemplatesEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public MailLocaleTemplatesEntity physicalSelectOnKey(String key, String template
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailLocaleTemplatesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailLocaleTemplatesEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<MailLocaleTemplatesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailLocaleTemplatesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailLocaleTemplatesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailLocaleTemplatesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java
index b017644a7..4587eac5a 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenMailPostsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPostsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailPostsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailPostsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<MailPostsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPostsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailPostsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailPostsEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public MailPostsEntity physicalSelectOnKey(String messageId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPostsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailPostsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailPostsEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<MailPostsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPostsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailPostsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailPostsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java
index 8c5170010..6a27f700d 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenMailPropertiesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailPropertiesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailPropertiesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<MailPropertiesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailPropertiesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailPropertiesEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public MailPropertiesEntity physicalSelectOnKey(Integer hookId, String propertyK
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailPropertiesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailPropertiesEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<MailPropertiesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailPropertiesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailPropertiesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailPropertiesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java
index 2905d7d54..b7f085f95 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenMailTemplatesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailTemplatesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailTemplatesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailTemplatesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<MailTemplatesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailTemplatesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailTemplatesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailTemplatesEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public MailTemplatesEntity physicalSelectOnKey(String templateId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailTemplatesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailTemplatesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailTemplatesEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<MailTemplatesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<MailTemplatesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailTemplatesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, MailTemplatesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java
index c61819a45..0ae77eb7a 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenNotifyConfigsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyConfigsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotifyConfigsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, NotifyConfigsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<NotifyConfigsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyConfigsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotifyConfigsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, NotifyConfigsEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public NotifyConfigsEntity physicalSelectOnKey(Integer userId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyConfigsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotifyConfigsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, NotifyConfigsEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<NotifyConfigsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyConfigsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotifyConfigsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, NotifyConfigsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java
index 9889901db..faf2a0dba 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenNotifyQueuesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyQueuesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotifyQueuesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, NotifyQueuesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<NotifyQueuesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyQueuesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotifyQueuesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, NotifyQueuesEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public NotifyQueuesEntity physicalSelectOnKey(String hash) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyQueuesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotifyQueuesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, NotifyQueuesEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<NotifyQueuesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<NotifyQueuesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotifyQueuesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, NotifyQueuesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java
index a5bdaba5c..64d102d1e 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenParticipantsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ParticipantsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ParticipantsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<ParticipantsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ParticipantsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ParticipantsEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public ParticipantsEntity physicalSelectOnKey(Long knowledgeId, Integer userId)
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ParticipantsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ParticipantsEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<ParticipantsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ParticipantsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ParticipantsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
index 7dc6cbe85..689df893e 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenPinsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PinsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PinsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PinsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<PinsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PinsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PinsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PinsEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public PinsEntity physicalSelectOnKey(Integer no) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PinsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PinsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PinsEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<PinsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PinsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PinsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PinsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
index 3716ff87f..7eb1dd082 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenPointKnowledgeHistoriesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PointKnowledgeHistoriesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<PointKnowledgeHistoriesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PointKnowledgeHistoriesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public PointKnowledgeHistoriesEntity physicalSelectOnKey(Long historyNo, Long kn
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PointKnowledgeHistoriesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<PointKnowledgeHistoriesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointKnowledgeHistoriesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PointKnowledgeHistoriesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PointKnowledgeHistoriesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
index ce6789c18..120b27492 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenPointUserHistoriesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PointUserHistoriesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PointUserHistoriesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<PointUserHistoriesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PointUserHistoriesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PointUserHistoriesEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public PointUserHistoriesEntity physicalSelectOnKey(Long historyNo, Integer user
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PointUserHistoriesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PointUserHistoriesEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<PointUserHistoriesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<PointUserHistoriesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PointUserHistoriesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, PointUserHistoriesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java
index f57b994ff..07b16964c 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java
@@ -13,6 +13,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -46,7 +47,17 @@ public static GenServiceConfigsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceConfigsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ServiceConfigsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ServiceConfigsEntity.class);
     }
     /**
@@ -57,7 +68,19 @@ public List<ServiceConfigsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceConfigsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ServiceConfigsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ServiceConfigsEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public ServiceConfigsEntity physicalSelectOnKey(String serviceName) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceConfigsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ServiceConfigsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ServiceConfigsEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<ServiceConfigsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceConfigsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ServiceConfigsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ServiceConfigsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java
index 2252396bb..a110f295a 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenServiceLocaleConfigsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ServiceLocaleConfigsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<ServiceLocaleConfigsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ServiceLocaleConfigsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public ServiceLocaleConfigsEntity physicalSelectOnKey(String localeKey, String s
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ServiceLocaleConfigsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<ServiceLocaleConfigsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ServiceLocaleConfigsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ServiceLocaleConfigsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ServiceLocaleConfigsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java
index 55bd4da6e..022821c5f 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenStockKnowledgesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<StockKnowledgesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, StockKnowledgesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<StockKnowledgesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<StockKnowledgesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, StockKnowledgesEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public StockKnowledgesEntity physicalSelectOnKey(Long knowledgeId, Long stockId)
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<StockKnowledgesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, StockKnowledgesEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<StockKnowledgesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<StockKnowledgesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, StockKnowledgesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
index c82ae33e1..6c30ac221 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenStocksDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<StocksEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, StocksEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<StocksEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<StocksEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, StocksEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public StocksEntity physicalSelectOnKey(Long stockId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<StocksEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, StocksEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<StocksEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StocksEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<StocksEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, StocksEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java
index a6f854a62..b26ec4394 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenSurveyAnswersDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyAnswersEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyAnswersEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<SurveyAnswersEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyAnswersEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyAnswersEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public SurveyAnswersEntity physicalSelectOnKey(Integer answerId, Long knowledgeI
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyAnswersEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyAnswersEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<SurveyAnswersEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyAnswersEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyAnswersEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java
index bfc5ebfa4..923e04691 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenSurveyChoicesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyChoicesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyChoicesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<SurveyChoicesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyChoicesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyChoicesEntity.class, limit, offset);
     }
     /**
@@ -77,7 +100,17 @@ public SurveyChoicesEntity physicalSelectOnKey(Integer choiceNo, Integer itemNo,
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyChoicesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyChoicesEntity.class);
     }
     /**
@@ -88,7 +121,19 @@ public List<SurveyChoicesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyChoicesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyChoicesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyChoicesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java
index 2e6f67cf4..efea18977 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenSurveyItemAnswersDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyItemAnswersEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyItemAnswersEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<SurveyItemAnswersEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyItemAnswersEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyItemAnswersEntity.class, limit, offset);
     }
     /**
@@ -77,7 +100,17 @@ public SurveyItemAnswersEntity physicalSelectOnKey(Integer answerId, Integer ite
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyItemAnswersEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyItemAnswersEntity.class);
     }
     /**
@@ -88,7 +121,19 @@ public List<SurveyItemAnswersEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemAnswersEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyItemAnswersEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyItemAnswersEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java
index c12079fb9..4002ab94d 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenSurveyItemsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyItemsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyItemsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<SurveyItemsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyItemsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyItemsEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public SurveyItemsEntity physicalSelectOnKey(Integer itemNo, Long knowledgeId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyItemsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyItemsEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<SurveyItemsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyItemsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyItemsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveyItemsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java
index 18f58d1bc..2775e5e4f 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenSurveysDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveysEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveysEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveysEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<SurveysEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveysEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveysEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveysEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public SurveysEntity physicalSelectOnKey(Long knowledgeId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveysEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveysEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveysEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<SurveysEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveysEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveysEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, SurveysEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
index 07fb18b97..e1c181ce2 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenTagsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TagsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TagsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<TagsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TagsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TagsEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public TagsEntity physicalSelectOnKey(Integer tagId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TagsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TagsEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<TagsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TagsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TagsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TagsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
index 31f633392..b1efca39d 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenTemplateItemsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TemplateItemsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TemplateItemsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<TemplateItemsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TemplateItemsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TemplateItemsEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public TemplateItemsEntity physicalSelectOnKey(Integer itemNo, Integer typeId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TemplateItemsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TemplateItemsEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<TemplateItemsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateItemsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TemplateItemsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TemplateItemsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
index c81db6ee2..e32d8a4a8 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenTemplateMastersDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateMastersEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TemplateMastersEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TemplateMastersEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<TemplateMastersEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateMastersEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TemplateMastersEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TemplateMastersEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public TemplateMastersEntity physicalSelectOnKey(Integer typeId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateMastersEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TemplateMastersEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TemplateMastersEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<TemplateMastersEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TemplateMastersEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TemplateMastersEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TemplateMastersEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java
index c2157d24f..c6a66487e 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenTokensDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TokensEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TokensEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TokensEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<TokensEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TokensEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TokensEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TokensEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public TokensEntity physicalSelectOnKey(String token) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TokensEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TokensEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TokensEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<TokensEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<TokensEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<TokensEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, TokensEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
index 93c84ffa5..34d535ce0 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenUserBadgesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<UserBadgesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, UserBadgesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<UserBadgesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<UserBadgesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, UserBadgesEntity.class, limit, offset);
     }
     /**
@@ -76,7 +99,17 @@ public UserBadgesEntity physicalSelectOnKey(Integer no, Integer userId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<UserBadgesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, UserBadgesEntity.class);
     }
     /**
@@ -87,7 +120,19 @@ public List<UserBadgesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<UserBadgesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<UserBadgesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, UserBadgesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
index 8ce0c10d3..a3c0cc933 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenViewHistoriesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ViewHistoriesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ViewHistoriesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ViewHistoriesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<ViewHistoriesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ViewHistoriesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ViewHistoriesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ViewHistoriesEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public ViewHistoriesEntity physicalSelectOnKey(Long historyNo) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ViewHistoriesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ViewHistoriesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ViewHistoriesEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<ViewHistoriesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ViewHistoriesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ViewHistoriesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, ViewHistoriesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
index 572b6d1d9..18f5d4148 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenVotesDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<VotesEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<VotesEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, VotesEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<VotesEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<VotesEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<VotesEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, VotesEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public VotesEntity physicalSelectOnKey(Long voteNo) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<VotesEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<VotesEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, VotesEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<VotesEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<VotesEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<VotesEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, VotesEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
index 09e519a3b..9900d3901 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenWebhookConfigsDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhookConfigsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<WebhookConfigsEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, WebhookConfigsEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<WebhookConfigsEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhookConfigsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<WebhookConfigsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, WebhookConfigsEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public WebhookConfigsEntity physicalSelectOnKey(Integer hookId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhookConfigsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<WebhookConfigsEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, WebhookConfigsEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<WebhookConfigsEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhookConfigsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<WebhookConfigsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, WebhookConfigsEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java
index 00aba93cb..b59db8fd9 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java
@@ -12,6 +12,7 @@
 import org.support.project.ormapping.common.DBUserPool;
 import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
 
@@ -45,7 +46,17 @@ public static GenWebhooksDao get() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhooksEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<WebhooksEntity> physicalSelectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, WebhooksEntity.class);
     }
     /**
@@ -56,7 +67,19 @@ public List<WebhooksEntity> physicalSelectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhooksEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<WebhooksEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, WebhooksEntity.class, limit, offset);
     }
     /**
@@ -75,7 +98,17 @@ public WebhooksEntity physicalSelectOnKey(String webhookId) {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhooksEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<WebhooksEntity> selectAll(Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, WebhooksEntity.class);
     }
     /**
@@ -86,7 +119,19 @@ public List<WebhooksEntity> selectAll() {
      */
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<WebhooksEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<WebhooksEntity> selectAllWidthPager(int limit, int offset, Order order) { 
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
         return executeQueryList(sql, WebhooksEntity.class, limit, offset);
     }
     /**
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all.sql
index 05c99dcbc..d9fe88d5b 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM ACCOUNT_IMAGES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all_with_pager.sql
index 6f6c461dc..b4bb78832 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM ACCOUNT_IMAGES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all.sql
index 9b8cb5f2b..67457d91a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM ACCOUNT_IMAGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all_with_pager.sql
index b15971f09..00dc47770 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/AccountImagesDao/AccountImagesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM ACCOUNT_IMAGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql
index 102b8deff..3cc74a316 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM ACTIVITIES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql
index 23c6aa4ac..bc56c5983 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM ACTIVITIES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql
index c91673718..acdb93dba 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM ACTIVITIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql
index 04fd4dd78..d7a72ffd4 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ActivitiesDao/ActivitiesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM ACTIVITIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql
index 672bd3f10..b17af757e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM BADGES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql
index 8148bf1cc..4be7e5ffa 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM BADGES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql
index 39228e58a..f1ae31120 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM BADGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql
index 537924423..32eb748e2 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/BadgesDao/BadgesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM BADGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all.sql
index cff77c4a1..2a882635e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM COMMENTS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all_with_pager.sql
index f24694900..10e1969ad 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM COMMENTS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all.sql
index 9eb803227..85f3cddc8 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM COMMENTS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all_with_pager.sql
index 13b473781..15d797739 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/CommentsDao/CommentsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM COMMENTS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all.sql
index dc88dde4b..4b37341fa 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM DRAFT_ITEM_VALUES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all_with_pager.sql
index 4f4440c74..08d96ce3a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM DRAFT_ITEM_VALUES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all.sql
index 8a6863a14..27e0ee3bd 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM DRAFT_ITEM_VALUES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all_with_pager.sql
index cc17a2082..9c79a450f 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/DraftItemValuesDao/DraftItemValuesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM DRAFT_ITEM_VALUES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all.sql
index da016fc70..0b6da5ba1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM DRAFT_KNOWLEDGES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all_with_pager.sql
index 8a6a8e269..53269d0a0 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM DRAFT_KNOWLEDGES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all.sql
index 5a120a2e3..44c90e2bb 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM DRAFT_KNOWLEDGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all_with_pager.sql
index bef5717f9..65d374e64 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/DraftKnowledgesDao/DraftKnowledgesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM DRAFT_KNOWLEDGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all.sql
index 5fc15c5e3..d3652cd9e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM EVENTS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all_with_pager.sql
index 1d7431868..786652b8a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM EVENTS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all.sql
index 3ab913f89..e5d7da632 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM EVENTS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all_with_pager.sql
index a17c1dd65..759c4e703 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/EventsDao/EventsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM EVENTS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all.sql
index 51103ce9f..c61416e20 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM ITEM_CHOICES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all_with_pager.sql
index 552054a79..9f62bd6bd 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM ITEM_CHOICES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all.sql
index f8bd11b3e..4e361e439 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM ITEM_CHOICES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all_with_pager.sql
index 5c08c1e32..fc952e1a8 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ItemChoicesDao/ItemChoicesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM ITEM_CHOICES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all.sql
index 4a5aa5b18..5b0b10105 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM KNOWLEDGE_EDIT_GROUPS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all_with_pager.sql
index 15f675a44..7ddb83fa0 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_EDIT_GROUPS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all.sql
index a5d58e789..d66f58541 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_EDIT_GROUPS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all_with_pager.sql
index d682a9915..335bc46c8 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditGroupsDao/KnowledgeEditGroupsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM KNOWLEDGE_EDIT_GROUPS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all.sql
index 5952e4ec0..dcb01c1ef 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM KNOWLEDGE_EDIT_USERS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all_with_pager.sql
index 3ab1ee664..ab77bd414 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_EDIT_USERS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all.sql
index 873e8fed0..ea63bc117 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_EDIT_USERS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all_with_pager.sql
index decbb8817..e3cb3b46b 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeEditUsersDao/KnowledgeEditUsersDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM KNOWLEDGE_EDIT_USERS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all.sql
index b4cf17aa9..9bd4613f0 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM KNOWLEDGE_FILES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all_with_pager.sql
index 9b0d48881..dbd1f2747 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_FILES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all.sql
index b76b0624b..1d2d6882b 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_FILES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all_with_pager.sql
index d2c530fb5..e3e7905ae 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeFilesDao/KnowledgeFilesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM KNOWLEDGE_FILES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all.sql
index 865195387..1c59cbf65 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM KNOWLEDGE_GROUPS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all_with_pager.sql
index aac8b1817..a6213dbd5 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_GROUPS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all.sql
index 9c0beab79..68c770c2e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_GROUPS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all_with_pager.sql
index 5f3c4244f..2bb96212a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeGroupsDao/KnowledgeGroupsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM KNOWLEDGE_GROUPS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all.sql
index d343d5899..c69c550c5 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM KNOWLEDGE_HISTORIES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all_with_pager.sql
index eac6b6fa3..e53aa2891 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_HISTORIES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all.sql
index d646b1029..b581cbc26 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_HISTORIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all_with_pager.sql
index 58710fc5d..25e535d0a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeHistoriesDao/KnowledgeHistoriesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM KNOWLEDGE_HISTORIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all.sql
index 31ff00706..3af609b6d 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM KNOWLEDGE_ITEM_VALUES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all_with_pager.sql
index 33f03e067..fbbe3d8c8 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_ITEM_VALUES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all.sql
index 3d74ff94b..f15f7f345 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_ITEM_VALUES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all_with_pager.sql
index 8d691d7cb..e9f5a4d09 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeItemValuesDao/KnowledgeItemValuesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM KNOWLEDGE_ITEM_VALUES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all.sql
index 3c99636c5..73f783cc4 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM KNOWLEDGE_TAGS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all_with_pager.sql
index 76146a855..2ac548fc8 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_TAGS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all.sql
index db26f8e55..0bf0a1f09 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_TAGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all_with_pager.sql
index dd6d2371c..037d3b4a1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeTagsDao/KnowledgeTagsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM KNOWLEDGE_TAGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all.sql
index 807327e25..f8ce5b1b7 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM KNOWLEDGE_USERS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all_with_pager.sql
index 869bca4c3..bceeef594 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_USERS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all.sql
index e44aab5fe..20eef7b2c 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGE_USERS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all_with_pager.sql
index f06c235f4..f55d07a63 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgeUsersDao/KnowledgeUsersDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM KNOWLEDGE_USERS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all.sql
index 80d3e5083..fc9021de1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM KNOWLEDGES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all_with_pager.sql
index 42e31d59a..c13f85dd3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all.sql
index 83836cfcc..cf0889603 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM KNOWLEDGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all_with_pager.sql
index 5784aca68..923c907fa 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM KNOWLEDGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql
index ab669161d..ab3ca5e9a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM LIKE_COMMENTS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql
index 65d77d109..5af12b4a4 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM LIKE_COMMENTS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql
index 55b863319..47a16a313 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM LIKE_COMMENTS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql
index e883b0d22..479bf92d3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM LIKE_COMMENTS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all.sql
index 6eafc36d9..dfa07252c 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM LIKES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all_with_pager.sql
index 1c8c02b4a..add355e85 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM LIKES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all.sql
index 79bbb0642..56da73612 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM LIKES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all_with_pager.sql
index 5e8f556ce..1b3ff62f2 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/LikesDao/LikesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM LIKES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all.sql
index 751881b13..0cae96353 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM MAIL_HOOK_CONDITIONS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all_with_pager.sql
index 2fce7f7ce..dd8f0c1cd 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_HOOK_CONDITIONS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all.sql
index d26f458f6..16fa652a7 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_HOOK_CONDITIONS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all_with_pager.sql
index 68c1ba998..96c6c2cac 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookConditionsDao/MailHookConditionsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM MAIL_HOOK_CONDITIONS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all.sql
index 1f79ec4ba..6dd63c3f2 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM MAIL_HOOKS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all_with_pager.sql
index 3a9e3be60..b696cca5e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_HOOKS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all.sql
index 487a61997..8fe047012 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_HOOKS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all_with_pager.sql
index baa251941..d8a1b7fda 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHooksDao/MailHooksDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM MAIL_HOOKS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all.sql
index 3de9feaf5..d51fe6edf 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM MAIL_LOCALE_TEMPLATES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all_with_pager.sql
index 3e83de1c0..7a4f944ac 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_LOCALE_TEMPLATES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all.sql
index da3eb9940..5eda535d3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_LOCALE_TEMPLATES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all_with_pager.sql
index c39e67d11..aa2256a30 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailLocaleTemplatesDao/MailLocaleTemplatesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM MAIL_LOCALE_TEMPLATES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all.sql
index 521589bef..2a432aba1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM MAIL_POSTS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all_with_pager.sql
index 65f5d0cf5..7ef1f4491 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_POSTS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all.sql
index 217caa8a9..113b27e83 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_POSTS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all_with_pager.sql
index b51f174d9..a76903f9d 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailPostsDao/MailPostsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM MAIL_POSTS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all.sql
index ebdc6ad4b..973937acd 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM MAIL_PROPERTIES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all_with_pager.sql
index a7c99c6a9..bef27148e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_PROPERTIES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all.sql
index 91b5059e6..206d7c05f 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_PROPERTIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all_with_pager.sql
index 20be0fa61..54c1a3b90 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailPropertiesDao/MailPropertiesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM MAIL_PROPERTIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all.sql
index 9324bd15e..39a556ce3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM MAIL_TEMPLATES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all_with_pager.sql
index bc7166145..6c4b64477 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_TEMPLATES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all.sql
index 7acefcace..26cb0d58e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM MAIL_TEMPLATES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all_with_pager.sql
index 5012a9ba6..fa22d0c0a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailTemplatesDao/MailTemplatesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM MAIL_TEMPLATES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all.sql
index 7efa15f35..1160b23eb 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM NOTIFY_CONFIGS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all_with_pager.sql
index b079c2ecd..abfb51cce 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM NOTIFY_CONFIGS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all.sql
index b5816a083..6326a8392 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM NOTIFY_CONFIGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all_with_pager.sql
index fd30f7386..831949d1a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyConfigsDao/NotifyConfigsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM NOTIFY_CONFIGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all.sql
index 93682534c..cfc34e0ee 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM NOTIFY_QUEUES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all_with_pager.sql
index 7873229a7..cd55e48e3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM NOTIFY_QUEUES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all.sql
index e5efdad2b..a682db2d1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM NOTIFY_QUEUES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all_with_pager.sql
index 72cbb0d88..bfb34d7e4 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotifyQueuesDao/NotifyQueuesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM NOTIFY_QUEUES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all.sql
index 65ef42da1..dc0687834 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM PARTICIPANTS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all_with_pager.sql
index fe52c87b0..724efafda 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM PARTICIPANTS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all.sql
index dcb1a4ec2..5d6b08ca5 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM PARTICIPANTS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all_with_pager.sql
index 10786f4a8..c76715ee2 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ParticipantsDao/ParticipantsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM PARTICIPANTS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all.sql
index 1d5f064c4..c55a0acf5 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM PINS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all_with_pager.sql
index b8592b739..c04f0bed1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM PINS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all.sql
index 93f9c9001..50af119a1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM PINS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all_with_pager.sql
index f9ac0fb5e..168f5c8f9 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PinsDao/PinsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM PINS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql
index 53862db97..dcf926a57 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM POINT_KNOWLEDGE_HISTORIES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql
index b22d177d2..fd313ad42 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM POINT_KNOWLEDGE_HISTORIES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql
index 364e92359..5d269ac93 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM POINT_KNOWLEDGE_HISTORIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql
index 25db49873..9a1204373 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM POINT_KNOWLEDGE_HISTORIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql
index 61a114237..f3e595980 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM POINT_USER_HISTORIES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql
index 82a1295a5..dd9233042 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM POINT_USER_HISTORIES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql
index cd439a370..dd2d18683 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM POINT_USER_HISTORIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql
index b45c1578c..c5d8eadcc 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM POINT_USER_HISTORIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all.sql
index a2fae29db..5fcdfe052 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM SERVICE_CONFIGS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all_with_pager.sql
index 80b8fcfe4..287941361 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SERVICE_CONFIGS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all.sql
index f0b7b3af5..83311d3fc 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SERVICE_CONFIGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all_with_pager.sql
index b0c65d984..5992ef29f 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceConfigsDao/ServiceConfigsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM SERVICE_CONFIGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all.sql
index c2742dce3..f92fe405e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM SERVICE_LOCALE_CONFIGS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all_with_pager.sql
index 01e2470d3..18c7740d2 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SERVICE_LOCALE_CONFIGS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all.sql
index 0de3d42e5..e2c839120 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SERVICE_LOCALE_CONFIGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all_with_pager.sql
index 40c4d4157..5d31741ad 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ServiceLocaleConfigsDao/ServiceLocaleConfigsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM SERVICE_LOCALE_CONFIGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all.sql
index 5a3b9b827..286ff6de1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM STOCK_KNOWLEDGES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all_with_pager.sql
index f18418b4f..9a83dd42d 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM STOCK_KNOWLEDGES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all.sql
index 368b5477c..270d613d9 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM STOCK_KNOWLEDGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all_with_pager.sql
index 3897cf73d..ddb52a4e1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/StockKnowledgesDao/StockKnowledgesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM STOCK_KNOWLEDGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all.sql
index 08bf43ad8..22bfcb081 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM STOCKS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all_with_pager.sql
index 782f3c3ba..bc6417e51 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM STOCKS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all.sql
index 223478509..728acc91c 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM STOCKS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all_with_pager.sql
index 00a05d7ca..48747e5f3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/StocksDao/StocksDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM STOCKS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all.sql
index 688165e03..3496f3812 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM SURVEY_ANSWERS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all_with_pager.sql
index 920aa2768..2e4520470 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SURVEY_ANSWERS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all.sql
index b55bb41b9..b689ac79e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SURVEY_ANSWERS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all_with_pager.sql
index 7295ee4f1..bf83cc1ea 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyAnswersDao/SurveyAnswersDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM SURVEY_ANSWERS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all.sql
index cbcfb099c..f45ad33a2 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM SURVEY_CHOICES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all_with_pager.sql
index f5da780b6..453d80bbb 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SURVEY_CHOICES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all.sql
index 302e5fb15..88c8f7f4a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SURVEY_CHOICES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all_with_pager.sql
index 3e14b4ff8..9add32f50 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyChoicesDao/SurveyChoicesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM SURVEY_CHOICES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all.sql
index bb4ecfda2..0398829e7 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM SURVEY_ITEM_ANSWERS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all_with_pager.sql
index 5da5b9fcb..862d4d143 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SURVEY_ITEM_ANSWERS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all.sql
index 911883289..de7d43064 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SURVEY_ITEM_ANSWERS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all_with_pager.sql
index 7b4f30d02..c59b4076c 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemAnswersDao/SurveyItemAnswersDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM SURVEY_ITEM_ANSWERS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all.sql
index 6f4724c6d..ebfcbe64c 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM SURVEY_ITEMS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all_with_pager.sql
index bedb3c232..fa8f7d29b 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SURVEY_ITEMS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all.sql
index 6e462336a..44868f7a3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SURVEY_ITEMS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all_with_pager.sql
index a943b170c..276c68d47 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveyItemsDao/SurveyItemsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM SURVEY_ITEMS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all.sql
index 3e48ed5f8..4de782d95 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM SURVEYS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all_with_pager.sql
index 6500107ce..c61836dfa 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SURVEYS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all.sql
index 68ea205c7..0dd9e2c06 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM SURVEYS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all_with_pager.sql
index 90b8d9e5b..5eb1c8192 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/SurveysDao/SurveysDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM SURVEYS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all.sql
index 0e8fa2bf5..199fbf136 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM TAGS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all_with_pager.sql
index f7f5b4eb4..ed0923d51 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM TAGS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all.sql
index 6caa5ff3f..98980af47 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM TAGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all_with_pager.sql
index b5e442b6a..ba0394559 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TagsDao/TagsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM TAGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all.sql
index 998e37de2..acc8d942c 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM TEMPLATE_ITEMS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all_with_pager.sql
index 8f5cb2908..1ce066257 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM TEMPLATE_ITEMS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all.sql
index aa87cd125..c377b9fed 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM TEMPLATE_ITEMS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all_with_pager.sql
index 9dda3c85e..a43f889ba 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM TEMPLATE_ITEMS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all.sql
index 87f5440ef..f289b8ce1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM TEMPLATE_MASTERS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all_with_pager.sql
index 1e788b305..16fa79cb1 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM TEMPLATE_MASTERS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all.sql
index 2f4751cb6..703b44581 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM TEMPLATE_MASTERS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all_with_pager.sql
index 983b18b6f..33d760355 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM TEMPLATE_MASTERS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all.sql
index 7fa82fc05..e6066449c 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM TOKENS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all_with_pager.sql
index b704def52..50f99adfa 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM TOKENS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all.sql
index d3cb05f49..2ef2dce3a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM TOKENS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all_with_pager.sql
index 1787498bd..3db81a7a8 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TokensDao/TokensDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM TOKENS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql
index 2716b818a..312c4b02a 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM USER_BADGES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql
index 44cd4f122..a07313184 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM USER_BADGES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql
index be3e4b966..d2548e8dd 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM USER_BADGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql
index 4c7e11199..971425eeb 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/UserBadgesDao/UserBadgesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM USER_BADGES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all.sql
index f1fd776a2..6458998a9 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM VIEW_HISTORIES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all_with_pager.sql
index 1b6e981cb..7b35865fa 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM VIEW_HISTORIES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all.sql
index 77eb26044..cd276008e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM VIEW_HISTORIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all_with_pager.sql
index 06f9c9472..c292e2788 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ViewHistoriesDao/ViewHistoriesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM VIEW_HISTORIES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all.sql
index db5d760cf..752b1a715 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM VOTES
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all_with_pager.sql
index 3f5340933..314ffb518 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM VOTES
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all.sql
index 917e7c1ca..b24b56c74 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM VOTES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all_with_pager.sql
index c73001927..405a2063c 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/VotesDao/VotesDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM VOTES
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all.sql
index e86af8ba3..9a33ff531 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM WEBHOOK_CONFIGS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all_with_pager.sql
index 9cf9036ec..1849952b4 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM WEBHOOK_CONFIGS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all.sql
index 71f2f9726..29fb81048 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM WEBHOOK_CONFIGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all_with_pager.sql
index f886be5cd..c8c10d953 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/WebhookConfigsDao/WebhookConfigsDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM WEBHOOK_CONFIGS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all.sql
index 063debb21..4eeeece46 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all.sql
@@ -1,2 +1,2 @@
 SELECT * FROM WEBHOOKS
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all_with_pager.sql
index 08c0b7067..2214e3a73 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_physical_select_all_with_pager.sql
@@ -1,3 +1,3 @@
 SELECT * FROM WEBHOOKS
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all.sql
index 0b4ba969b..4d09aa4a4 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all.sql
@@ -1,3 +1,3 @@
 SELECT * FROM WEBHOOKS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC;
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all_with_pager.sql
index 03192ce1e..0a94e7fc3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all_with_pager.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/WebhooksDao/WebhooksDao_select_all_with_pager.sql
@@ -1,4 +1,4 @@
 SELECT * FROM WEBHOOKS
 WHERE DELETE_FLAG = 0
-ORDER BY INSERT_DATETIME DESC
+ORDER BY INSERT_DATETIME %s
 LIMIT ? OFFSET ?;

From b64486631f3a6497a6d3ce2c28931392f632d8f3 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 5 Sep 2017 00:21:56 +0900
Subject: [PATCH 047/138] #840 Set order for data select sql

---
 .../project/knowledge/dao/ViewHistoriesDao.java | 12 ++++++++++++
 .../deploy/v1_11_0/Migrate_1_11_2.java          | 17 +++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
index 5e72ee923..483dd47fc 100644
--- a/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
@@ -8,6 +8,7 @@
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.dao.gen.GenViewHistoriesDao;
+import org.support.project.knowledge.entity.ViewHistoriesEntity;
 import org.support.project.knowledge.vo.StockKnowledge;
 
 /**
@@ -62,4 +63,15 @@ public long selectCountOnKnowledgeId(Long knowledgeId) {
         return executeQuerySingle(sql, Long.class, knowledgeId);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ViewHistoriesEntity> selectDistinctAllWidthPager(int limit, int offset) {
+        String sql = "SELECT * FROM VIEW_HISTORIES AS M WHERE NOT EXISTS ("
+                + "SELECT 1 FROM VIEW_HISTORIES AS S WHERE M.KNOWLEDGE_ID = S.KNOWLEDGE_ID "
+                + "AND M.INSERT_USER = S.INSERT_USER "
+                + "AND M.INSERT_DATETIME > S.INSERT_DATETIME"
+                + ") AND M.INSERT_USER IS NOT NULL "
+                + "ORDER BY M.KNOWLEDGE_ID ASC LIMIT ? OFFSET ?;";
+        return executeQueryList(sql.toString(), ViewHistoriesEntity.class, limit, offset);
+    }
+
 }
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 06774d849..d655eff53 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -24,6 +24,7 @@
 import org.support.project.knowledge.entity.ViewHistoriesEntity;
 import org.support.project.knowledge.logic.activity.Activity;
 import org.support.project.knowledge.logic.activity.ActivityLogic;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.tool.dao.InitializeDao;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.dao.UserConfigsDao;
@@ -87,7 +88,7 @@ private void doAddPointByKnowledgeComment() throws InterruptedException {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<CommentsEntity> doAddPointByKnowledgeComment(int offset, int limit) {
         List<CommentsEntity> list;
-        list = CommentsDao.get().selectAllWidthPager(limit, offset);
+        list = CommentsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (CommentsEntity item : list) {
             LoginedUser user = new LoginedUser();
             UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
@@ -117,7 +118,7 @@ private void doAddPointByKnowledgeJoinEvent() throws InterruptedException {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ParticipantsEntity> doAddPointByKnowledgeJoinEvent(int offset, int limit) {
         List<ParticipantsEntity> list;
-        list = ParticipantsDao.get().selectAllWidthPager(limit, offset);
+        list = ParticipantsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (ParticipantsEntity item : list) {
             KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
@@ -153,7 +154,7 @@ private void doAddPointByKnowledgeAnswer() throws InterruptedException {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<SurveyAnswersEntity> doAddPointByKnowledgeAnswer(int offset, int limit) {
         List<SurveyAnswersEntity> list;
-        list = SurveyAnswersDao.get().selectAllWidthPager(limit, offset);
+        list = SurveyAnswersDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (SurveyAnswersEntity item : list) {
             KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
@@ -189,7 +190,7 @@ private void doAddPointByKnowledgeStock() throws InterruptedException {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset, int limit) {
         List<StockKnowledgesEntity> list;
-        list = StockKnowledgesDao.get().selectAllWidthPager(limit, offset);
+        list = StockKnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (StockKnowledgesEntity item : list) {
             KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
@@ -224,7 +225,7 @@ private void doAddPointByKnowledgeLike() throws InterruptedException {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> doAddPointByKnowledgeLike(int offset, int limit) {
         List<LikesEntity> list;
-        list = LikesDao.get().selectAllWidthPager(limit, offset);
+        list = LikesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (LikesEntity item : list) {
             KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
@@ -259,7 +260,7 @@ private void doAddPointByKnowledgeShow() throws InterruptedException {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset, int limit) {
         List<ViewHistoriesEntity> list;
-        list = ViewHistoriesDao.get().selectAllWidthPager(limit, offset);
+        list = ViewHistoriesDao.get().selectDistinctAllWidthPager(limit, offset);
         for (ViewHistoriesEntity item : list) {
             KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
@@ -294,7 +295,7 @@ public void doAddPointByKnowledge() throws InterruptedException {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> doAddPointByKnowledge(int offset, int limit) {
         List<KnowledgesEntity> knowledges;
-        knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset);
+        knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (KnowledgesEntity item : knowledges) {
             LoginedUser user = new LoginedUser();
             UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
@@ -324,7 +325,7 @@ private void doSetViewCountToKnowledge() throws InterruptedException {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> doSetViewCountToKnowledge(int offset, int limit) {
         List<KnowledgesEntity> knowledges;
-        knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset);
+        knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (KnowledgesEntity knowledge : knowledges) {
             long count = ViewHistoriesDao.get().selectCountOnKnowledgeId(knowledge.getKnowledgeId());
             KnowledgesDao.get().updateViewCount(count, knowledge.getKnowledgeId());

From 219320ba362299f3c294ca92a49ac3e032c8a9ab Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 5 Sep 2017 06:23:21 +0900
Subject: [PATCH 048/138] #840 Add add point process at comment like

---
 .../control/open/KnowledgeControl.java        |  2 +-
 .../control/protect/KnowledgeControl.java     |  2 +-
 .../deploy/v1_11_0/Migrate_1_11_2.java        | 66 +++++++++++++++----
 .../knowledge/logic/activity/Activity.java    | 20 +++---
 .../logic/activity/ActivityLogic.java         |  6 +-
 .../logic/activity/ActivityProcessor.java     | 35 ++--------
 ...tivity.java => CommentInsertActivity.java} | 14 ++--
 .../logic/activity/CommentLikeActivity.java   | 39 +++++++++++
 8 files changed, 119 insertions(+), 65 deletions(-)
 rename src/main/java/org/support/project/knowledge/logic/activity/{KnowledgeCommentActivity.java => CommentInsertActivity.java} (65%)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java

diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 7d3da5b87..4c2219713 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -680,7 +680,7 @@ public Boundary likecomment() throws InvalidParamException {
         LikeCount likeCount = new LikeCount();
         likeCount.setCount(count);
         
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_COMMENT_LIKE, getLoginedUser(), new Date(),
+        ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, getLoginedUser(), new Date(),
                 CommentsDao.get().selectOnKey(commentNo));
         return send(likeCount);
     }
diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index 1f345d056..b61667683 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -493,7 +493,7 @@ public Boundary comment() throws Exception {
         }
 
         CommentsEntity commentsEntity = KnowledgeLogic.get().saveComment(knowledgeId, comment, fileNos, getLoginedUser());
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_COMMENT_ADD, getLoginedUser(), new Date(), commentsEntity);
+        ActivityLogic.get().processActivity(Activity.COMMENT_INSERT, getLoginedUser(), new Date(), commentsEntity);
 
         return super.redirect(getRequest().getContextPath() + "/open.knowledge/view/" + knowledgeId + params);
     }
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index d655eff53..84dce4acb 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -9,6 +9,7 @@
 import org.support.project.knowledge.config.UserConfig;
 import org.support.project.knowledge.dao.CommentsDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.LikeCommentsDao;
 import org.support.project.knowledge.dao.LikesDao;
 import org.support.project.knowledge.dao.ParticipantsDao;
 import org.support.project.knowledge.dao.StockKnowledgesDao;
@@ -17,6 +18,7 @@
 import org.support.project.knowledge.deploy.Migrate;
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.ParticipantsEntity;
 import org.support.project.knowledge.entity.StockKnowledgesEntity;
@@ -66,15 +68,51 @@ public boolean doMigrate() throws Exception {
         // Knowledgeイベント参加したイベントによりポイント集計
         doAddPointByKnowledgeJoinEvent();
         // コメントを登録したイベントによりポイント集計
-        doAddPointByKnowledgeComment();
-        
+        doAddPointByCommentInsert();
+        // コメントへのイイネイベントによりポイント集計
+        doAddPointByCommentLike();
         
         return true;
     }
     
-    
-    private void doAddPointByKnowledgeComment() throws InterruptedException {
-        LOG.info("Aggregate point by comment");
+    private void doAddPointByCommentLike() throws InterruptedException {
+        LOG.info("Aggregate point by comment like");
+        List<LikeCommentsEntity> list;
+        int offset = 0;
+        do {
+            list = doAddPointByCommentLike(offset, limit);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private List<LikeCommentsEntity> doAddPointByCommentLike(int offset, int limit2) {
+        List<LikeCommentsEntity> list;
+        list = LikeCommentsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (LikeCommentsEntity item : list) {
+            CommentsEntity comment = CommentsDao.get().selectOnKey(item.getCommentNo());
+            if (comment == null) {
+                LOG.debug("    comment [" + item.getCommentNo() + "] is not found. so skip add point by comment like.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by comment like.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.debug("    comment [" + item.getCommentNo() + "], knowledge [ " + comment.getKnowledgeId() + "]");
+            ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, user, item.getInsertDatetime(), comment);
+        }
+        return list;
+    }
+
+    private void doAddPointByCommentInsert() throws InterruptedException {
+        LOG.info("Aggregate point by comment insert");
         List<CommentsEntity> list;
         int offset = 0;
         do {
@@ -93,12 +131,12 @@ public List<CommentsEntity> doAddPointByKnowledgeComment(int offset, int limit)
             LoginedUser user = new LoginedUser();
             UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
             if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by comment insert.");
                 continue;
             }
             user.setLoginUser(account);
-            LOG.debug("    comment [" + item.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_COMMENT_ADD, user, item.getInsertDatetime(), item);
+            LOG.debug("    comment [" + item.getCommentNo() + "], knowledge [ " + item.getKnowledgeId() + "]");
+            ActivityLogic.get().processActivity(Activity.COMMENT_INSERT, user, item.getInsertDatetime(), item);
         }
         return list;
     }
@@ -122,13 +160,13 @@ public List<ParticipantsEntity> doAddPointByKnowledgeJoinEvent(int offset, int l
         for (ParticipantsEntity item : list) {
             KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
-                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge event.");
                 continue;
             }
             LoginedUser user = new LoginedUser();
             UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
             if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge event.");
                 continue;
             }
             user.setLoginUser(account);
@@ -158,13 +196,13 @@ public List<SurveyAnswersEntity> doAddPointByKnowledgeAnswer(int offset, int lim
         for (SurveyAnswersEntity item : list) {
             KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
-                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge survey answer.");
                 continue;
             }
             LoginedUser user = new LoginedUser();
             UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
             if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge survey answer.");
                 continue;
             }
             user.setLoginUser(account);
@@ -194,13 +232,13 @@ public List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset, int li
         for (StockKnowledgesEntity item : list) {
             KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
             if (knowledge == null) {
-                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge stock.");
                 continue;
             }
             LoginedUser user = new LoginedUser();
             UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
             if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge stock.");
                 continue;
             }
             user.setLoginUser(account);
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/Activity.java b/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
index 280f57261..db5d3e730 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
@@ -11,7 +11,7 @@
  * 5    | knowledge_id  | アンケート回答
  * 6    | knowledge_id  | イベント参加
  * 101  | comment_no    | コメント登録
- * 102  | comment_no    | コメントにイイネ登録
+ * 103  | comment_no    | コメントにイイネ登録
  * -6   | knowledge_id  | イベント参加の取り消し
  * 
  * ---------------------------------------------------------------------------
@@ -38,9 +38,9 @@
  * 6    | 63          | 記事         | 5       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
  * 101  | 1011        | 登録者       | 20       | コメントを投稿すると、投稿者にポイント追加
  * 101  | 1013        | 記事         | 20       | 記事にコメントが付くと、その記事に対しポイント追加
- * 102  | 1021        | 参照者       | 2       | イイネを押すと、押した人にポイント追加
- * 102  | 1022        | 登録者       | 10       | コメントにイイネが付くと、そのコメントを登録したユーザにポイントが付く
- * 102  | 1023        | 記事         | 10       | コメントにイイネがつくと、そのコメントの記事に対しポイント追加
+ * 103  | 1031        | 参照者       | 2       | イイネを押すと、押した人にポイント追加
+ * 103  | 1032        | 登録者       | 10       | コメントにイイネが付くと、そのコメントを登録したユーザにポイントが付く
+ * 103  | 1033        | 記事         | 10       | コメントにイイネがつくと、そのコメントの記事に対しポイント追加
  * -6   | -61         | 参照者       | 5        | イベント参加者にポイント付与（取り消しなのでマイナス）
  * -6   | -62         | 記事登録者    | 5       | 記事の登録者にポイント追加（取り消しなのでマイナス）
  * -6   | -63         | 記事         | 5       | 記事のポイントが追加（取り消しなのでマイナス）
@@ -60,8 +60,8 @@ public enum Activity {
     KNOWLEDGE_ANSWER, // アンケートに回答した
     KNOWLEDGE_EVENT_ADD, // イベントに参加した
     KNOWLEDGE_EVENT_DELETE, // イベント参加キャンセル
-    KNOWLEDGE_COMMENT_ADD, // コメント追加
-    KNOWLEDGE_COMMENT_LIKE; // コメントにイイネを押した
+    COMMENT_INSERT, // コメント追加
+    COMMENT_LIKE; // コメントにイイネを押した
     
     public int getValue() {
         if (this == KNOWLEDGE_INSERT) {
@@ -78,9 +78,9 @@ public int getValue() {
             return 6;
         } else if (this ==KNOWLEDGE_EVENT_DELETE) {
             return -6;
-        } else if (this ==KNOWLEDGE_COMMENT_ADD) {
+        } else if (this ==COMMENT_INSERT) {
             return 101;
-        } else if (this ==KNOWLEDGE_COMMENT_LIKE) {
+        } else if (this ==COMMENT_LIKE) {
             return 102;
         }
         return Integer.MIN_VALUE;
@@ -102,9 +102,9 @@ public static Activity getType(int type) {
         } else if (type == -6) {
             return KNOWLEDGE_EVENT_DELETE;
         } else if (type == 101) {
-            return KNOWLEDGE_COMMENT_ADD;
+            return COMMENT_INSERT;
         } else if (type == 102) {
-            return KNOWLEDGE_COMMENT_LIKE;
+            return COMMENT_LIKE;
         }
         return NONE;
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index 3f5160c0c..d5ea5dd0d 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -37,8 +37,10 @@ private List<ActivityProcessor> getActivityProcessors(Activity activity) {
             array.add(KnowledgeAnswerActivity.get());
         } else if (activity == Activity.KNOWLEDGE_EVENT_ADD) {
             array.add(KnowledgeEventActivity.get());
-        } else if (activity == Activity.KNOWLEDGE_COMMENT_ADD) {
-            array.add(KnowledgeCommentActivity.get());
+        } else if (activity == Activity.COMMENT_INSERT) {
+            array.add(CommentInsertActivity.get());
+        } else if (activity == Activity.COMMENT_LIKE) {
+            array.add(CommentLikeActivity.get());
         }
         return array;
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
index 941865b1b..647c2093b 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
@@ -1,34 +1,6 @@
 package org.support.project.knowledge.logic.activity;
 
 public interface ActivityProcessor {
-    /*
-     * 種類  | 獲得のタイプ  | ポイント付与先 | ポイント    | 獲得タイプの意味
-     * 1    | 11          | 記事登録者    | 50       | 記事を投稿したら投稿者にポイント追加
-     * 1    | 13          | 記事         | 50       | 登録された記事のポイント初期値
-     * 2    | 21          | 参照者       | 1        | 記事を参照するアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
-     * 2    | 22          | 記事登録者    | 1        | 自分が登録された記事が参照されたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
-     * 2    | 23          | 記事         | 1        | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
-     * 3    | 31          | 参照者       | 2        | 記事にイイネのアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
-     * 3    | 32          | 記事登録者    | 10       | 自分が登録された記事にイイネがついたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
-     * 3    | 33          | 記事         | 10       | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
-     * 4    | 41          | 参照者       | 0        | ストックした場合、ストックした人にポイントは付与しない
-     * 4    | 42          | 記事登録者    | 2       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
-     * 4    | 43          | 記事         | 2       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
-     * 5    | 51          | 参照者       | 3        | アンケート回答者にポイント付与
-     * 5    | 52          | 記事登録者    | 3       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
-     * 5    | 53          | 記事         | 3       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
-     * 6    | 61          | 参照者       | 5        | イベント参加者にポイント付与
-     * 6    | 62          | 記事登録者    | 5       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
-     * 6    | 63          | 記事         | 5       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
-     * 101  | 1011        | 登録者       | 20       | コメントを投稿すると、投稿者にポイント追加
-     * 101  | 1013        | 記事         | 20       | 記事にコメントが付くと、その記事に対しポイント追加
-     * 102  | 1021        | 参照者       | 2       | イイネを押すと、押した人にポイント追加
-     * 102  | 1022        | 登録者       | 10       | コメントにイイネが付くと、そのコメントを登録したユーザにポイントが付く
-     * 102  | 1023        | 記事         | 10       | コメントにイイネがつくと、そのコメントの記事に対しポイント追加
-     * -6   | -61         | 参照者       | 5        | イベント参加者にポイント付与（取り消しなのでマイナス）
-     * -6   | -62         | 記事登録者    | 5       | 記事の登録者にポイント追加（取り消しなのでマイナス）
-     * -6   | -63         | 記事         | 5       | 記事のポイントが追加（取り消しなのでマイナス）     * 
-     */
     public static final int TYPE_KNOWLEDGE_DO_INSERT = 11;
     public static final int TYPE_KNOWLEDGE_INSERTED = 13;
     public static final int TYPE_KNOWLEDGE_DO_SHOW = 21;
@@ -46,8 +18,11 @@ public interface ActivityProcessor {
     public static final int TYPE_KNOWLEDGE_DO_JOIN_EVENT = 61;
     public static final int TYPE_KNOWLEDGE_JOINED_BY_OHER = 62;
     public static final int TYPE_KNOWLEDGE_JOINED = 63;
-    public static final int TYPE_KNOWLEDGE_DO_ADD_COMMENT = 1011;
-    public static final int TYPE_KNOWLEDGE_ADDED_COMMENT = 1013;
+    public static final int TYPE_COMMENT_DO_INSERT = 1011;
+    public static final int TYPE_COMMENT_INSERTED = 1013;
+    public static final int TYPE_COMMENT_DO_LIKE = 1031;
+    public static final int TYPE_COMMENT_LIKED_BY_OHER = 1032;
+    public static final int TYPE_COMMENT_LIKED = 1033;
     
     void execute() throws Exception;
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeCommentActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java
similarity index 65%
rename from src/main/java/org/support/project/knowledge/logic/activity/KnowledgeCommentActivity.java
rename to src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java
index a37dbfc68..e7bc061a5 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeCommentActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java
@@ -11,20 +11,20 @@
  * 
  * @author koda
  */
-public class KnowledgeCommentActivity extends AbstractAddPointForCommentProcessor {
-    private static final Log LOG = LogFactory.getLog(KnowledgeCommentActivity.class);
-    public static KnowledgeCommentActivity get() {
-        return Container.getComp(KnowledgeCommentActivity.class);
+public class CommentInsertActivity extends AbstractAddPointForCommentProcessor {
+    private static final Log LOG = LogFactory.getLog(CommentInsertActivity.class);
+    public static CommentInsertActivity get() {
+        return Container.getComp(CommentInsertActivity.class);
     }
     
     @Override
     protected Activity getActivity() {
         LOG.debug("Start add point process on add comment knowledge.");
-        return Activity.KNOWLEDGE_COMMENT_ADD;
+        return Activity.COMMENT_INSERT;
     }
     @Override
     protected TypeAndPoint getTypeAndPointForActivityExecuter() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_ADD_COMMENT, 20);
+        return new TypeAndPoint(TYPE_COMMENT_DO_INSERT, 20);
     }
     @Override
     protected TypeAndPoint getTypeAndPointForCommentOwner() {
@@ -32,7 +32,7 @@ protected TypeAndPoint getTypeAndPointForCommentOwner() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_ADDED_COMMENT, 20);
+        return new TypeAndPoint(TYPE_COMMENT_INSERTED, 20);
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
new file mode 100644
index 000000000..64c0d8783
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
@@ -0,0 +1,39 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.Container;
+
+/**
+ * 
+ * 103  | 1031        | 参照者       | 2       | イイネを押すと、押した人にポイント追加
+ * 103  | 1032        | 登録者       | 10       | コメントにイイネが付くと、そのコメントを登録したユーザにポイントが付く
+ * 103  | 1033        | 記事         | 10       | コメントにイイネがつくと、そのコメントの記事に対しポイント追加
+ * 
+ * @author koda
+ */
+public class CommentLikeActivity extends AbstractAddPointForCommentProcessor {
+    private static final Log LOG = LogFactory.getLog(CommentLikeActivity.class);
+    public static CommentLikeActivity get() {
+        return Container.getComp(CommentLikeActivity.class);
+    }
+    
+    @Override
+    protected Activity getActivity() {
+        LOG.debug("Start add point process on add comment knowledge.");
+        return Activity.COMMENT_LIKE;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        return new TypeAndPoint(TYPE_COMMENT_DO_LIKE, 2);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForCommentOwner() {
+        return new TypeAndPoint(TYPE_COMMENT_LIKED_BY_OHER, 10);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledge() {
+        return new TypeAndPoint(TYPE_COMMENT_LIKED, 10);
+    }
+
+}

From fbc84166d553b0708540d4d628c4a5d5d87beb9c Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 5 Sep 2017 06:57:25 +0900
Subject: [PATCH 049/138] #840 Adjust points

---
 .../project/knowledge/dao/LikesDao.java       |  9 ++++++++
 .../knowledge/dao/ViewHistoriesDao.java       |  6 ++++++
 .../activity/KnowledgeInsertActivity.java     | 16 ++++++++++++--
 .../logic/activity/KnowledgeLikeActivity.java | 21 +++++++++++++++++--
 .../logic/activity/KnowledgeShowActivity.java | 20 ++++++++++++++++--
 5 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/dao/LikesDao.java b/src/main/java/org/support/project/knowledge/dao/LikesDao.java
index 758299ace..55accd9be 100644
--- a/src/main/java/org/support/project/knowledge/dao/LikesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/LikesDao.java
@@ -33,6 +33,14 @@ public Long countOnKnowledgeId(Long knowledgeId) {
         String sql = "SELECT COUNT(*) FROM LIKES WHERE KNOWLEDGE_ID = ?";
         return super.executeQuerySingle(sql, Long.class, knowledgeId);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public long selectUniqueUserCountOnKnowledgeId(Long knowledgeId) {
+        String sql = "SELECT COUNT(*) FROM ("
+                + "SELECT KNOWLEDGE_ID, INSERT_USER FROM LIKES WHERE KNOWLEDGE_ID = ? GROUP BY KNOWLEDGE_ID, INSERT_USER) AS SUBQ";
+        return super.executeQuerySingle(sql, Long.class, knowledgeId);
+    }
+
+    
 
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<LikesEntity> selectOnKnowledge(Long knowledgeId, int offset, int limit) {
@@ -46,4 +54,5 @@ public LikesEntity selectExistsOnUser(Long knowledgeId, Integer userId) {
         return super.executeQuerySingle(sql, LikesEntity.class, knowledgeId, userId);
     }
 
+
 }
diff --git a/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
index 483dd47fc..4e8cbe0a7 100644
--- a/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ViewHistoriesDao.java
@@ -62,6 +62,12 @@ public long selectCountOnKnowledgeId(Long knowledgeId) {
         String sql = "SELECT COUNT(*) FROM VIEW_HISTORIES WHERE KNOWLEDGE_ID = ?";
         return executeQuerySingle(sql, Long.class, knowledgeId);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public long selectUniqueUserCountOnKnowledgeId(Long knowledgeId) {
+        String sql = "SELECT COUNT(*) FROM ("
+                + "SELECT KNOWLEDGE_ID, INSERT_USER FROM VIEW_HISTORIES WHERE KNOWLEDGE_ID = ? GROUP BY KNOWLEDGE_ID, INSERT_USER) AS SUBQ";
+        return executeQuerySingle(sql, Long.class, knowledgeId);
+    }
 
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ViewHistoriesEntity> selectDistinctAllWidthPager(int limit, int offset) {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
index 75a36ded1..b1aa66db0 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
@@ -2,6 +2,7 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -25,9 +26,20 @@ protected Activity getActivity() {
         LOG.debug("Start add point process on insert knowledge.");
         return Activity.KNOWLEDGE_INSERT;
     }
+    
+    private int getPoint() {
+        // 文章が多い力先はポイントが高いように調整
+        int point = 50;
+        if (StringUtils.isNotEmpty(getKnowledge().getContent()) && getKnowledge().getContent().length() > 700) {
+            int add = (getKnowledge().getContent().length() - 700) / 50;
+            point += add;
+        }
+        return point;
+    }
+    
     @Override
     protected TypeAndPoint getTypeAndPointForActivityExecuter() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_INSERT, 50);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_INSERT, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
@@ -35,6 +47,6 @@ protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_INSERTED, 50);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_INSERTED, getPoint());
     }
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
index c74b9000f..68d8a134b 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
@@ -3,6 +3,7 @@
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.di.Container;
+import org.support.project.knowledge.dao.LikesDao;
 
 /**
  * 
@@ -18,6 +19,22 @@ public static KnowledgeLikeActivity get() {
         return Container.getComp(KnowledgeLikeActivity.class);
     }
     
+    private int getPoint() {
+        // ユニークユーザのイイネ件数によりポイントを増やす
+        int point = 10;
+        long count = LikesDao.get().selectUniqueUserCountOnKnowledgeId(getKnowledge().getKnowledgeId());
+        int add = 0;
+        if (count > 100) {
+            add = 1000;
+        } else if (count > 100){
+            add = ((int) count - 100 ) / 2; // 100人を超えると、2人毎に1ポイント増えるようになる
+        } else if (count > 10){
+            add = (int) count / 5; // 5人を超えると、ポイントが増える(5人毎に１ポイント）
+        }
+        point += add;
+        return point;
+    }
+    
     @Override
     protected Activity getActivity() {
         LOG.debug("Start add point process on like knowledge.");
@@ -29,11 +46,11 @@ protected TypeAndPoint getTypeAndPointForActivityExecuter() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_LIKED_BY_OHER, 10);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_LIKED_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_LIKED, 10);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_LIKED, getPoint());
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
index 559d89218..9b559b924 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
@@ -5,6 +5,7 @@
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.ViewHistoriesDao;
 
 /**
  * 
@@ -27,17 +28,32 @@ protected Activity getActivity() {
         LOG.debug("Start add point process on show knowledge.");
         return Activity.KNOWLEDGE_SHOW;
     }
+    private int getPoint() {
+        // ユニークな参照者が多くなると、ポイントが増えるように調整(投稿数が少なくても、良い記事を書けばポイントが高くなる）
+        int point = 1;
+        long count = ViewHistoriesDao.get().selectUniqueUserCountOnKnowledgeId(getKnowledge().getKnowledgeId());
+        int add = 0;
+        if (count > 1000) {
+            add = 200;
+        } else if (count > 100){
+            add = ((int) count - 100 ) / 5; // 100人を超えると、5人毎に1ポイント増えるようになる
+        } else if (count > 10){
+            add = (int) count / 10; // 10人を超えると、ポイントが増える(10人毎に１ポイント）
+        }
+        point += add;
+        return point;
+    }
     @Override
     protected TypeAndPoint getTypeAndPointForActivityExecuter() {
         return new TypeAndPoint(TYPE_KNOWLEDGE_DO_SHOW, 1);
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_SHOWN_BY_OHER, 1);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_SHOWN_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_SHOWN, 1);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_SHOWN, getPoint());
     }
 
 }

From 37fb798b0bdff8b7ebe05cbb0c5d961d5c661489 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 5 Sep 2017 22:22:55 +0900
Subject: [PATCH 050/138] #840 Show Contribution Point on account and knowledge
 page

---
 .gitignore                                    |  1 +
 .../control/open/AccountControl.java          |  6 ++
 .../control/open/KnowledgeControl.java        |  5 +-
 .../project/knowledge/dao/CommentsDao.java    |  7 ++
 .../knowledge/dao/LikeCommentsDao.java        |  7 ++
 .../knowledge/dao/ParticipantsDao.java        |  9 ++-
 .../project/knowledge/logic/AccountLogic.java | 22 ++++++
 .../activity/AbstractActivityProcessor.java   |  3 +
 .../AbstractAddPointForCommentProcessor.java  |  3 +
 ...AbstractAddPointForKnowledgeProcessor.java |  3 +
 .../logic/activity/CommentInsertActivity.java | 32 +++++++-
 .../logic/activity/CommentLikeActivity.java   | 34 ++++++++-
 .../activity/KnowledgeAnswerActivity.java     | 18 ++++-
 .../activity/KnowledgeEventActivity.java      | 36 ++++++++-
 .../logic/activity/KnowledgeLikeActivity.java | 12 +++
 .../activity/KnowledgeStockActivity.java      | 20 ++++-
 src/main/resources/appresource.properties     |  3 +
 src/main/resources/appresource_ja.properties  |  7 +-
 .../WEB-INF/views/open/account/account.jsp    | 34 ++++++++-
 .../partials/partials-view-count.jsp          | 75 ++++++++++++-------
 .../partials/partials-view-editor.jsp         |  2 +-
 .../WEB-INF/views/open/knowledge/view.jsp     |  8 +-
 22 files changed, 295 insertions(+), 52 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e24992a0..c965ba72d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ target
 .eclipse-pmd
 .checkstyle
 node
+.idea
diff --git a/src/main/java/org/support/project/knowledge/control/open/AccountControl.java b/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
index 67b1c1aa9..775c8bfc3 100644
--- a/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
@@ -21,6 +21,7 @@
 import org.support.project.knowledge.entity.AccountImagesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.TemplateMastersEntity;
+import org.support.project.knowledge.logic.AccountLogic;
 import org.support.project.knowledge.logic.IdenticonLogic;
 import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.knowledge.vo.AccountInfo;
@@ -93,6 +94,7 @@ public Boundary info() throws Exception {
         }
         List<KnowledgesEntity> knowledges = KnowledgeLogic.get().showKnowledgeOnUser(userId, getLoginedUser(), offset * PAGE_LIMIT, PAGE_LIMIT);
         List<StockKnowledge> stocks = KnowledgeLogic.get().setStockInfo(knowledges, getLoginedUser());
+        KnowledgeLogic.get().setViewed(stocks, getLoginedUser());
         setAttribute("knowledges", stocks);
 
         int previous = offset - 1;
@@ -110,6 +112,10 @@ public Boundary info() throws Exception {
         }
         setAttribute("templates", templates);
         
+        long point = AccountLogic.get().getPoint(userId);
+        setAttribute("point", point);
+        
+        
         return forward("account.jsp");
     }
 
diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 4c2219713..6f9ae8f89 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -204,7 +204,8 @@ public Boundary view() throws InvalidParamException, ParseException {
         // 編集権限
         List<LabelValue> editors = TargetLogic.get().selectEditorsViewOnKnowledgeId(knowledgeId, loginedUser);
         setAttribute("editors", editors);
-        boolean edit = knowledgeLogic.isEditor(loginedUser, entity, editors);
+        List<LabelValue> editors2 = TargetLogic.get().selectEditorsOnKnowledgeId(knowledgeId);
+        boolean edit = knowledgeLogic.isEditor(loginedUser, entity, editors2);
         setAttribute("edit", edit);
 
         ArrayList<Long> knowledgeIds = new ArrayList<Long>();
@@ -218,6 +219,8 @@ public Boundary view() throws InvalidParamException, ParseException {
         setAttribute("stocks", stocks);
         
         ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, getLoginedUser(), new Date(), entity);
+        long point = KnowledgesDao.get().selectPoint(entity.getKnowledgeId());
+        setAttribute("point", point);
         
         return forward("view.jsp");
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/CommentsDao.java b/src/main/java/org/support/project/knowledge/dao/CommentsDao.java
index 9dc93b6f6..1d5f5dba5 100644
--- a/src/main/java/org/support/project/knowledge/dao/CommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/CommentsDao.java
@@ -50,4 +50,11 @@ public Integer countOnKnowledgeId(Long knowledgeId) {
         return super.executeQuerySingle(sql, Integer.class, knowledgeId);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public long selectUniqueUserCountOnKnowledgeId(Long knowledgeId) {
+        String sql = "SELECT COUNT(*) FROM ("
+                + "SELECT KNOWLEDGE_ID, INSERT_USER FROM COMMENTS WHERE KNOWLEDGE_ID = ? GROUP BY KNOWLEDGE_ID, INSERT_USER) AS SUBQ";
+        return super.executeQuerySingle(sql, Long.class, knowledgeId);
+    }
+
 }
diff --git a/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
index f5da3524a..30c4c61f3 100644
--- a/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
@@ -44,6 +44,13 @@ public LikeCommentsEntity selectExistsOnUser(Long commentNo, Integer userId) {
         return super.executeQuerySingle(sql, LikeCommentsEntity.class, commentNo, userId);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public long selectUniqueUserCountOnCommentNo(Long commentNo) {
+        String sql = "SELECT COUNT(*) FROM ("
+                + "SELECT COMMENT_NO, INSERT_USER FROM LIKE_COMMENTS WHERE COMMENT_NO = ? GROUP BY COMMENT_NO, INSERT_USER) AS SUBQ";
+        return super.executeQuerySingle(sql, Long.class, commentNo);
+    }
+
 
 
 }
diff --git a/src/main/java/org/support/project/knowledge/dao/ParticipantsDao.java b/src/main/java/org/support/project/knowledge/dao/ParticipantsDao.java
index 6c7b70fff..3dcc571d8 100644
--- a/src/main/java/org/support/project/knowledge/dao/ParticipantsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ParticipantsDao.java
@@ -6,9 +6,7 @@
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-
 import org.support.project.knowledge.dao.gen.GenParticipantsDao;
-import org.support.project.knowledge.vo.GroupUser;
 import org.support.project.knowledge.vo.Participation;
 import org.support.project.ormapping.common.SQLManager;
 
@@ -39,6 +37,13 @@ public List<Participation> selectParticipations(Long knowledgeId) {
         return executeQueryList(sql, Participation.class, knowledgeId);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public long selectUniqueUserCountOnKnowledgeId(Long knowledgeId) {
+        String sql = "SELECT COUNT(*) FROM ("
+                + "SELECT KNOWLEDGE_ID, USER_ID FROM PARTICIPANTS WHERE KNOWLEDGE_ID = ? GROUP BY KNOWLEDGE_ID, USER_ID) AS SUBQ";
+        return super.executeQuerySingle(sql, Long.class, knowledgeId);
+    }
+
 
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/AccountLogic.java b/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
index 81b4b4e62..1be5ac7d8 100644
--- a/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
@@ -19,6 +19,8 @@
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.UserConfig;
 import org.support.project.knowledge.dao.AccountImagesDao;
 import org.support.project.knowledge.entity.AccountImagesEntity;
 import org.support.project.knowledge.vo.UploadFile;
@@ -26,10 +28,12 @@
 import org.support.project.web.dao.ConfirmMailChangesDao;
 import org.support.project.web.dao.GroupsDao;
 import org.support.project.web.dao.RolesDao;
+import org.support.project.web.dao.UserConfigsDao;
 import org.support.project.web.dao.UsersDao;
 import org.support.project.web.entity.ConfirmMailChangesEntity;
 import org.support.project.web.entity.GroupsEntity;
 import org.support.project.web.entity.RolesEntity;
+import org.support.project.web.entity.UserConfigsEntity;
 import org.support.project.web.entity.UsersEntity;
 
 @DI(instance = Instance.Singleton)
@@ -237,4 +241,22 @@ public LoginedUser createLoginUser(String userKey) {
         return loginedUser;
     }
     
+    /**
+     * ユーザのポイント取得
+     * @param user ユーザ
+     * @return
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public int getPoint(int user) {
+        UserConfigsEntity config = UserConfigsDao.get().selectOnKey(UserConfig.POINT, AppConfig.get().getSystemName(), user);
+        if (config == null) {
+            config = new UserConfigsEntity(UserConfig.POINT, AppConfig.get().getSystemName(), user);
+            config.setConfigValue("0");
+        }
+        if (!StringUtils.isInteger(config.getConfigValue())) {
+            config.setConfigValue("0");
+        }
+        int now = Integer.parseInt(config.getConfigValue());
+        return now;
+    }
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
index 33f361902..671c1c0a0 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
@@ -9,6 +9,8 @@
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.StringUtils;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.UserConfig;
 import org.support.project.knowledge.dao.ActivitiesDao;
@@ -27,6 +29,7 @@
  * 
  * @author koda
  */
+@DI(instance = Instance.Prototype)
 public abstract class AbstractActivityProcessor implements ActivityProcessor {
     private static final Log LOG = LogFactory.getLog(AbstractActivityProcessor.class);
     private static Object lockUser = new Object();
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
index 78e8c289d..3a5fc0ce1 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
@@ -3,11 +3,14 @@
 import org.support.project.aop.Aspect;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
 import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.entity.ActivitiesEntity;
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 
+@DI(instance = Instance.Prototype)
 public abstract class AbstractAddPointForCommentProcessor extends AbstractActivityProcessor {
     private static final Log LOG = LogFactory.getLog(AbstractAddPointForCommentProcessor.class);
     private CommentsEntity comment;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
index 51334644a..a8323cbb4 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
@@ -3,9 +3,12 @@
 import org.support.project.aop.Aspect;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
 import org.support.project.knowledge.entity.ActivitiesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 
+@DI(instance = Instance.Prototype)
 public abstract class AbstractAddPointForKnowledgeProcessor extends AbstractActivityProcessor {
     private static final Log LOG = LogFactory.getLog(AbstractAddPointForKnowledgeProcessor.class);
     private KnowledgesEntity knowledge;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java
index e7bc061a5..6f2546a38 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java
@@ -2,7 +2,11 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.RandomUtil;
 import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.CommentsDao;
 
 /**
  * 
@@ -11,12 +15,38 @@
  * 
  * @author koda
  */
+@DI(instance = Instance.Prototype)
 public class CommentInsertActivity extends AbstractAddPointForCommentProcessor {
     private static final Log LOG = LogFactory.getLog(CommentInsertActivity.class);
     public static CommentInsertActivity get() {
         return Container.getComp(CommentInsertActivity.class);
     }
     
+    private int point = 0;
+    
+    private int getPoint() {
+        if (point != 0) {
+            return point;
+        }
+        // 指定の記事に登録した、ユニークなユーザ数によりポイントを変える
+        int point = 20;
+        long count = CommentsDao.get().selectUniqueUserCountOnKnowledgeId(getComment().getKnowledgeId());
+        int add = 0;
+        if (count > 100) {
+            add = 1000;
+        } else if (count > 100){
+            add = ((int) count - 100 ) / 2; // 100人を超えると、2人毎に1ポイント増えるようになる
+        } else if (count > 10){
+            add = (int) count / 5; // 5人を超えると、ポイントが増える(5人毎に１ポイント）
+            int[] points = {1,1,1,1,1,2,2,2,2,3};
+            add += points[RandomUtil.randamNum(0, 10)]; // ランダムで値が増減するボーナスポイント
+        }
+        point += add;
+        this.point = point;
+        return point;
+    }
+    
+    
     @Override
     protected Activity getActivity() {
         LOG.debug("Start add point process on add comment knowledge.");
@@ -32,7 +62,7 @@ protected TypeAndPoint getTypeAndPointForCommentOwner() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_COMMENT_INSERTED, 20);
+        return new TypeAndPoint(TYPE_COMMENT_INSERTED, getPoint());
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
index 64c0d8783..d86647964 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
@@ -2,7 +2,11 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.RandomUtil;
 import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.LikeCommentsDao;
 
 /**
  * 
@@ -12,12 +16,38 @@
  * 
  * @author koda
  */
+@DI(instance = Instance.Prototype)
 public class CommentLikeActivity extends AbstractAddPointForCommentProcessor {
     private static final Log LOG = LogFactory.getLog(CommentLikeActivity.class);
     public static CommentLikeActivity get() {
         return Container.getComp(CommentLikeActivity.class);
     }
     
+    private int point = 0;
+    
+    private int getPoint() {
+        if (point != 0) {
+            return point;
+        }
+        // 指定のコメントについたイイネの件数（ユニーク件数）でポイントを増やす
+        int point = 10;
+        long count = LikeCommentsDao.get().selectUniqueUserCountOnCommentNo(getComment().getCommentNo());
+        int add = 0;
+        if (count > 100) {
+            add = 1000;
+        } else if (count > 100){
+            add = ((int) count - 100 ) / 2; // 100人を超えると、2人毎に1ポイント増えるようになる
+        } else if (count > 10){
+            add = (int) count / 5; // 5人を超えると、ポイントが増える(5人毎に１ポイント）
+            int[] points = {1,1,1,1,1,2,2,2,2,3};
+            add += points[RandomUtil.randamNum(0, 10)]; // ランダムで値が増減するボーナスポイント
+        }
+        point += add;
+        this.point = point;
+        return point;
+    }
+    
+    
     @Override
     protected Activity getActivity() {
         LOG.debug("Start add point process on add comment knowledge.");
@@ -29,11 +59,11 @@ protected TypeAndPoint getTypeAndPointForActivityExecuter() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForCommentOwner() {
-        return new TypeAndPoint(TYPE_COMMENT_LIKED_BY_OHER, 10);
+        return new TypeAndPoint(TYPE_COMMENT_LIKED_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_COMMENT_LIKED, 10);
+        return new TypeAndPoint(TYPE_COMMENT_LIKED, getPoint());
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
index cce7d92f7..edad428e1 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
@@ -2,7 +2,10 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.RandomUtil;
 import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
 
 /**
  * 
@@ -12,12 +15,23 @@
  * 
  * @author koda
  */
+@DI(instance = Instance.Prototype)
 public class KnowledgeAnswerActivity extends AbstractAddPointForKnowledgeProcessor {
     private static final Log LOG = LogFactory.getLog(KnowledgeAnswerActivity.class);
     public static KnowledgeAnswerActivity get() {
         return Container.getComp(KnowledgeAnswerActivity.class);
     }
     
+    private int point = 0;
+    private int getPoint() {
+        if (point != 0) {
+            return point;
+        }
+        int[] points = {1,1,2,2,2,2,3,3,3,4};
+        this.point = points[RandomUtil.randamNum(0, 10)]; // ランダムで値を増減してみた
+        return point;
+    }
+    
     @Override
     protected Activity getActivity() {
         LOG.debug("Start add point process on answer knowledge.");
@@ -29,11 +43,11 @@ protected TypeAndPoint getTypeAndPointForActivityExecuter() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_ANSWERD_BY_OHER, 3);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_ANSWERD_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_ANSWERD, 3);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_ANSWERD, getPoint());
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
index b75a76fe5..1e1935f72 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
@@ -2,7 +2,11 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.RandomUtil;
 import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.ParticipantsDao;
 
 /**
  * 
@@ -12,12 +16,38 @@
  * 
  * @author koda
  */
+@DI(instance = Instance.Prototype)
 public class KnowledgeEventActivity extends AbstractAddPointForKnowledgeProcessor {
     private static final Log LOG = LogFactory.getLog(KnowledgeEventActivity.class);
     public static KnowledgeEventActivity get() {
         return Container.getComp(KnowledgeEventActivity.class);
     }
     
+    private int point = 0;
+    
+    private int getPoint() {
+        if (point != 0) {
+            return point;
+        }
+        // 参加者人数により増減
+        int point = 10;
+        long count = ParticipantsDao.get().selectUniqueUserCountOnKnowledgeId(getKnowledge().getKnowledgeId());
+        int add = 0;
+        if (count > 100) {
+            add = 1000;
+        } else if (count > 100){
+            add = ((int) count - 100 ) / 2; // 100人を超えると、2人毎に1ポイント増えるようになる
+        } else if (count > 10){
+            add = (int) count / 5; // 5人を超えると、ポイントが増える(5人毎に１ポイント）
+            int[] points = {1,1,1,1,1,2,2,2,2,3};
+            add += points[RandomUtil.randamNum(0, 10)]; // ランダムで値が増減するボーナスポイント
+        }
+        point += add;
+        this.point = point;
+        return point;
+    }
+
+
     @Override
     protected Activity getActivity() {
         LOG.debug("Start add point process on answer knowledge.");
@@ -25,15 +55,15 @@ protected Activity getActivity() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForActivityExecuter() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_JOIN_EVENT, 5);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_JOIN_EVENT, 5); // 参加者には固定のポイント
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_JOINED_BY_OHER, 5);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_JOINED_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_JOINED, 5);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_JOINED, getPoint());
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
index 68d8a134b..f9b2dd8d7 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
@@ -2,7 +2,10 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.RandomUtil;
 import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
 import org.support.project.knowledge.dao.LikesDao;
 
 /**
@@ -13,13 +16,19 @@
  * 
  * @author koda
  */
+@DI(instance = Instance.Prototype)
 public class KnowledgeLikeActivity extends AbstractAddPointForKnowledgeProcessor {
     private static final Log LOG = LogFactory.getLog(KnowledgeLikeActivity.class);
     public static KnowledgeLikeActivity get() {
         return Container.getComp(KnowledgeLikeActivity.class);
     }
     
+    private int point = 0;
+    
     private int getPoint() {
+        if (point != 0) {
+            return point;
+        }
         // ユニークユーザのイイネ件数によりポイントを増やす
         int point = 10;
         long count = LikesDao.get().selectUniqueUserCountOnKnowledgeId(getKnowledge().getKnowledgeId());
@@ -30,8 +39,11 @@ private int getPoint() {
             add = ((int) count - 100 ) / 2; // 100人を超えると、2人毎に1ポイント増えるようになる
         } else if (count > 10){
             add = (int) count / 5; // 5人を超えると、ポイントが増える(5人毎に１ポイント）
+            int[] points = {1,1,1,1,1,2,2,2,2,3};
+            add += points[RandomUtil.randamNum(0, 10)]; // ランダムで値が増減するボーナスポイント
         }
         point += add;
+        this.point = point;
         return point;
     }
     
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
index 338e92b3e..ecd805968 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
@@ -2,7 +2,10 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.RandomUtil;
 import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
 
 /**
  * 
@@ -12,12 +15,25 @@
  * 
  * @author koda
  */
+@DI(instance = Instance.Prototype)
 public class KnowledgeStockActivity extends AbstractAddPointForKnowledgeProcessor {
     private static final Log LOG = LogFactory.getLog(KnowledgeStockActivity.class);
     public static KnowledgeStockActivity get() {
         return Container.getComp(KnowledgeStockActivity.class);
     }
     
+    private int point = 0;
+    
+    private int getPoint() {
+        if (point != 0) {
+            return point;
+        }
+        int[] points = {1,1,1,1,1,2,2,2,2,3};
+        this.point = points[RandomUtil.randamNum(0, 10)]; // ランダムで値を増減してみた
+        return point;
+    }
+    
+    
     @Override
     protected Activity getActivity() {
         LOG.debug("Start add point process on stock knowledge.");
@@ -29,11 +45,11 @@ protected TypeAndPoint getTypeAndPointForActivityExecuter() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_STOCKED_BY_OHER, 2);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_STOCKED_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_STOCKED, 2);
+        return new TypeAndPoint(TYPE_KNOWLEDGE_STOCKED, getPoint());
     }
 
 }
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index fe20e305c..c1b946d15 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -740,7 +740,10 @@ knowledge.analytics.msg.info=In this page, you will register the script for the
 knowledge.account.label.knowledge.count=Knowledge Count
 knowledge.account.label.like.count=Like Count
 knowledge.account.label.stock.count=Stock Count
+knowledge.account.label.cp=Contribution Point
 knowledge.account.label.knowledges=Knowledges
+knowledge.account.label.like=Likes
+knowledge.account.label.activity=Activities
 
 knowledge.admin.notice.title=Message from service administrator
 knowledge.admin.notice.msg=Manage messages from administrator.
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index 9591363ec..8778aff81 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -737,10 +737,13 @@ knowledge.analytics.title=アナリティクスの設定
 knowledge.analytics.label.script=アナリティクス用のスクリプト
 knowledge.analytics.msg.info=GoogleAnalyticsやPiwikといったアクセス解析用のスクリプトを登録します。<br/>ここで登録したスクリプトは、全ての画面に適用されます。
 
-knowledge.account.label.knowledge.count=ナレッジ登録件数
+knowledge.account.label.knowledge.count=ナレッジ投稿件数
 knowledge.account.label.like.count=いいね！獲得件数
 knowledge.account.label.stock.count=ストックされた件数
-knowledge.account.label.knowledges=このユーザが登録したナレッジ
+knowledge.account.label.cp=Contribution Point
+knowledge.account.label.knowledges=投稿
+knowledge.account.label.like=イイネした投稿
+knowledge.account.label.activity=活動状況
 
 knowledge.admin.notice.title=全体メッセージ
 knowledge.admin.notice.msg=アクセスユーザに対し、管理者からメッセージを登録します
diff --git a/src/main/webapp/WEB-INF/views/open/account/account.jsp b/src/main/webapp/WEB-INF/views/open/account/account.jsp
index 2c07fb4ad..7f8c20ffa 100644
--- a/src/main/webapp/WEB-INF/views/open/account/account.jsp
+++ b/src/main/webapp/WEB-INF/views/open/account/account.jsp
@@ -34,8 +34,15 @@
         width="64" height="64" />&nbsp;
         <%= jspUtil.out("userName") %>
         </h4>
-    </div>
-    <div class="col-sm-6 col-md-6">
+        
+        <div class="row">
+            <div class="col-xs-6">
+            <i class="fa fa-heart-o" ></i>&nbsp;<%= jspUtil.label("knowledge.account.label.cp") %>
+            </div>
+            <div class="col-xs-6">
+            <i class="fa fa-times"></i>&nbsp;<%= jspUtil.out("point") %>
+            </div>
+        </div>
         <div class="row">
             <div class="col-xs-6">
             <i class="fa fa-book"></i>&nbsp;<%= jspUtil.label("knowledge.account.label.knowledge.count") %>
@@ -60,12 +67,33 @@
             <i class="fa fa-times"></i>&nbsp;<%= jspUtil.out("stockCount") %>
             </div>
         </div>
+        
+    </div>
+    <div class="col-sm-6 col-md-6">
+        CPのグラフ
     </div>
 </div>
 
 <br/>
+
+<div class="row">
+    <ul class="nav nav-tabs">
+        <li role="presentation" class="active"><a href="<%=request.getContextPath()%>/open.account/info/<%= jspUtil.out("userId") %>">
+            <%= jspUtil.label("knowledge.account.label.knowledges") %>
+        </a></li>
+        <li role="presentation"><a href="<%=request.getContextPath()%>/open.account/like/<%= jspUtil.out("userId") %>">
+            <%=jspUtil.label("knowledge.account.label.like")%>
+        </a></li>
+        <li role="presentation"><a href="<%=request.getContextPath()%>/open.account/activity/<%= jspUtil.out("userId") %>">
+            <%=jspUtil.label("knowledge.account.label.activity")%>
+        </a></li>
+    </ul>
+</div>
+
+
+
 <div class="sub_title">
-<%= jspUtil.label("knowledge.account.label.knowledges") %>
+
 </div>
 
 <!-- リスト -->
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp
index ba0977df3..d39495ed7 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp
@@ -11,33 +11,50 @@
 
 <% JspUtil jspUtil = new JspUtil(request, pageContext); %>
 
-<a href="<%=request.getContextPath()%>/open.knowledge/likes/<%=jspUtil.out("knowledgeId")%><%=jspUtil.out("params")%>" class="text-primary btn-link">
-    <i class="fa fa-thumbs-o-up"></i>&nbsp;<%=jspUtil.label("knowledge.view.like")%> × <span id="like_count"><%=jspUtil.out("like_count")%></span>
-</a>
-<a href="#comments" id="commentsLink" class="text-primary btn-link inner-page-link">
-    <i class="fa fa-comments-o"></i>&nbsp;<%=jspUtil.label("knowledge.view.comment.label")%>
-    × <%=jspUtil.out("comments.size()")%>
-</a>
+<div class="row">
+    <div class="col-xs-4">
+        <a href="<%=request.getContextPath()%>/open.knowledge/activities/<%=jspUtil.out("knowledgeId")%><%=jspUtil.out("params")%>" class="text-primary btn-link">
+        <i class="fa fa-heart-o" aria-hidden="true"></i>&nbsp;CP × <%= jspUtil.out("point") %>
+        </a>
+    </div>
+    <div class="col-xs-4">
+        <a href="<%=request.getContextPath()%>/open.knowledge/likes/<%=jspUtil.out("knowledgeId")%><%=jspUtil.out("params")%>" class="text-primary btn-link">
+            <i class="fa fa-thumbs-o-up"></i>&nbsp;<%=jspUtil.label("knowledge.view.like")%> × <span id="like_count"><%=jspUtil.out("like_count")%></span>
+        </a>
+    </div>
+    <div class="col-xs-4">
+        <a href="#comments" id="commentsLink" class="text-primary btn-link inner-page-link">
+            <i class="fa fa-comments-o"></i>&nbsp;<%=jspUtil.label("knowledge.view.comment.label")%>
+            × <%=jspUtil.out("comments.size()")%>
+        </a>
+    </div>
+</div>
+<div class="row">
+    <div class="col-xs-4">
+        <%
+            int num = 0;
+            List<UploadFile> attachs = jspUtil.getValue("files", List.class);
+            for (int i = 0; i < attachs.size(); i++) {
+                UploadFile attach = attachs.get(i);
+                if (attach.getCommentNo() == null || attach.getCommentNo() == 0) {
+                    num++;
+                }
+            }
+        %>
+        <a href="#attachFilesPanel" id="attachFilesLink" class="text-primary btn-link inner-page-link">
+            <i class="fa fa-download"></i>&nbsp;<%=jspUtil.label("knowledge.view.label.attach")%>
+            × <%= num %>
+        </a>
+    </div>
+    <div class="col-xs-4">
+        <% if (jspUtil.is(TemplateLogic.TYPE_ID_EVENT, "typeId")) { %>
+        <a id="eventInfoLink" class="text-primary btn-link">
+            <i class="fa fa-users"></i>&nbsp;<%= jspUtil.label("knowledge.view.label.participants") %>
+            <span id="eventStatus"></span>
+        </a>
+        <% } %>
+    </div>
+    <div class="col-xs-4">
+    </div>
+</div>
 
-<%
-    int num = 0;
-    List<UploadFile> attachs = jspUtil.getValue("files", List.class);
-    for (int i = 0; i < attachs.size(); i++) {
-        UploadFile attach = attachs.get(i);
-        if (attach.getCommentNo() == null || attach.getCommentNo() == 0) {
-            num++;
-        }
-    }
-%>
-
-<a href="#attachFilesPanel" id="attachFilesLink" class="text-primary btn-link inner-page-link">
-    <i class="fa fa-download"></i>&nbsp;<%=jspUtil.label("knowledge.view.label.attach")%>
-    × <%= num %>
-</a>
-
-<% if (jspUtil.is(TemplateLogic.TYPE_ID_EVENT, "typeId")) { %>
-<a id="eventInfoLink" class="text-primary btn-link">
-    <i class="fa fa-users"></i>&nbsp;<%= jspUtil.label("knowledge.view.label.participants") %>
-    <span id="eventStatus"></span>
-</a>
-<% } %>
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-editor.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-editor.jsp
index c6acf437d..ed1b0c96c 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-editor.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-editor.jsp
@@ -12,7 +12,7 @@
 <div class="insert_info">
     <img src="<%=request.getContextPath()%>/images/loader.gif"
         data-echo="<%=request.getContextPath()%>/open.account/icon/<%=jspUtil.out("insertUser")%>" alt="icon" width="24"
-        height="24" style="float: left" />
+        height="24" />
     <%
         String insertLink = "<a href=\"" + request.getContextPath() + "/open.account/info/" + jspUtil.out("insertUser") + "\" class=\"text-primary btn-link\" >"
                         + jspUtil.out("insertUserName", JspUtil.ESCAPE_CLEAR) + "</a>";
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp
index 246a5fb3c..a75ca4a76 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp
@@ -35,10 +35,6 @@
                 <%-- いいね、コメント、参加者 --%>
                 <jsp:include page="partials/partials-view-count.jsp"></jsp:include>
             </div>
-            <div class="meta-info">
-                <%-- 更新者情報 --%>
-                <jsp:include page="partials/partials-view-editor.jsp"></jsp:include>
-            </div>
             <div class="meta-info">
                 <%-- テンプレートの種類表示 --%>
                 <jsp:include page="partials/partials-view-template.jsp"></jsp:include>
@@ -49,6 +45,10 @@
                 <%-- 公開区分 --%>
                 <jsp:include page="partials/partials-view-public-flag.jsp"></jsp:include>
             </div>
+            <div class="meta-info">
+                <%-- 更新者情報 --%>
+                <jsp:include page="partials/partials-view-editor.jsp"></jsp:include>
+            </div>
         </div>
 
         <%-- 右上のボタン部分 --%>

From 042788137f479e1fe9cb089fa232617b494758ee Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 5 Sep 2017 23:02:36 +0900
Subject: [PATCH 051/138] #840 Add total point column to user and activity
 table

---
 document/database/A5M2_knowledge.pdf          | Bin 75518 -> 75584 bytes
 document/database/knowledge.a5er              |  16 +++---
 .../gen/GenPointKnowledgeHistoriesDao.java    |   3 ++
 .../dao/gen/GenPointUserHistoriesDao.java     |   3 ++
 .../gen/GenPointKnowledgeHistoriesEntity.java |  39 ++++++++++++++
 .../gen/GenPointUserHistoriesEntity.java      |  49 ++++++++++++++++++
 .../activity/AbstractActivityProcessor.java   |  42 ++++++++-------
 .../activity/KnowledgeInsertActivity.java     |   7 ++-
 .../PointKnowledgeHistoriesDao_insert.sql     |   2 +
 .../PointKnowledgeHistoriesDao_raw_insert.sql |   2 +
 .../PointKnowledgeHistoriesDao_update.sql     |   1 +
 .../PointUserHistoriesDao_insert.sql          |   2 +
 .../PointUserHistoriesDao_raw_insert.sql      |   2 +
 .../PointUserHistoriesDao_update.sql          |   1 +
 .../project/knowledge/database/ddl.sql        |   6 ++-
 .../deploy/v1_11_0/migrate_v1_11_2.sql        |   7 ++-
 16 files changed, 151 insertions(+), 31 deletions(-)

diff --git a/document/database/A5M2_knowledge.pdf b/document/database/A5M2_knowledge.pdf
index 8c0a55c7fed957289992cb0480665f3058551910..b87fb4d9a91b8ca300b5d9cfcb0fa3480b24962b 100755
GIT binary patch
delta 1475
zcmV;!1w8ux%>=;C1dzlDIWRRcGBhwUFp<p|2{|w|GBPwUGBC03y0HT^Ff_BPvOQ{l
zT#7qDiJLg`+SUs7K3hdW2^dzn&!$`b{g`&)&0p%@<F(KDJtru{AQbqGP$y)C)9TSY
z{}dp0Nffyqy4ryn7~fH^#!TtTv}2~%fBp0CEp}!|%{@qH#ol|{@0N@w+dLRfr;_uu
z4rGDxt)W|&mg#1*-xxmDYzA%g>08`?1A{=I;e=W4=#tPO-ms0MOERG+M;F+S!pPAj
zg&-kEmteGM3Ku%MoRCduhWBNsh%0kf?0IYMwRtNMaqeFsT>tX?>zCe^7zR78csmXn
z@_@B68rSF0SUJN5qSTUn{}6*ltxGAq0bWL{BSr?GQM;qyegy_#1P>&gU6*u!R*z)6
zCQtUaDz(}#>l?NBi1bXT3_rf^@Q%^ik#ERM;HVYoNeCWBPi;F{{-%^@W2<r5P;N+R
zWzLDgB}!R2td+~K7G|d&*6PceT8u+KqRMG%1~|;sl4$tdQ3+1^6s4l8#SK-?<x(ms
zH^QCGhI6=&Y60nYRWTITv#nHrG_tmKo@NTa$_3C^0N@?@ITOI9Nd{eDpJ;0547n=j
zj-4sq%AxsL7^=;U8LVCB0v<TE%_#LalOM^0m`F0rVCJ2Hn-i62uWK;+L0MC){klqD
zPWH8WFY$3Lr*~Gtpech&sg;xYTi_b5re!KPy0RzCW8KzDUG1s_!%tU#2?eE~Hnjji
zhpBFoH&+I9_7+N@ORHPjIZIWWu|x4hYJR5c{@j?s+I24Afm7RzQjaq`Nj-##q}wa6
zn_JCfbF`_CBRNUI#~>Gn^BEZ$ldI=XHg!H;{lDk@$d6}fB;-M;@Ebq<I13gOl{J$6
zw2E>h`;FbP$9BeB_?jnw!vmbEtrPE_2E*Gu0mH?~+(J=G4GV-Ro!0EHm?BJ4?$;b<
z;>eB>An{sr<hV85>3sMiV=VB4y#LPy%1q$n_xI_&fH13a1<1{Qz!m%0{J4E`>KDE-
z`rYE&+imna)w88CtA-i2y<1xNP(b)qNr`cKh9CG5pMLCX@?(5|I@WklkK4)w58{$}
zi{D<`gcR%YR!FH_TizO&k$@aJf@<x1;pD9*4#vluFc)a_!)4iJ^y85`F4}7MOH#%O
zqE;2e8tU)=c1Y?~$>!}wFC`n9i|AosOQ~coa)9V^a}kf*5p5qCaDDq<!SFEZxmBr$
zn$K`U9~uCOUhP+Z)`XZjB1H+8;b*wp0?3ba*S7!`3=g8Ha8*FRVbGDWqkXG|Y9x8*
zDOI54gV@06#i-iq{6wp%Fz9bfg-}dkGZm~UZcY5?i`&#!U`?H9(ZaSB)7dHudI@90
zU8D>SP}#Hlrqyi$_LY##Ih`{o@>2;eaE_c7xwT7<sik*+$9}5OBu~`xv#KqPYP%(f
z#^g4PP>(QqXTJ24_~4YpfBBc|!O%Q;&m}ZscHjr8vViGRZ3|Kob2Iqesx(Z<$<Vj}
zt-{%YsSFkf!xm1?x}8f(3&FuvxW`yxtK<Sj!C1Jt4rI?uy)%HdP2L^(XU$8Un-{qB
z&m{!`?xEmZ*Pu_9%m+20#0iok(QKjgOqG_<bG;CA5HASdu2o_=xoMG;E#|VHm~7`w
z?aH!n$IZgwdx!k9qz4bVaRGDJTu=tawgsggXXb&2Fp)>vf3#`;{Otb+mV;=&w|F4|
zQUn1wm&+vqI6`GKH8NvlHfA<5WnnTfGB{#kHDfkqH(@zrFgH0lIb}XPFkxmmF*spm
zHDfh6IX5+7Vq!L9IAmjEFf=t~VlXvkmqjK4E>znIfItjH(L1|7R)4I)D(t~d?8idH
zJ_Nh42$85E`8b3bNC3<P10={Gjd$#Fv)I>2dN;Y1TZE=)YqxP*(LCQZ${cMcw)0Px
d%fB4>n7x;h3^JF<CIKu8GBq~}B_%~qMhdy(*46+3

delta 1412
zcmV-~1$+9y&IJC=1dzlDI5ROZF*GwXGLg*~2{<z`F)=hVGcvL6y0HT@GdHuVvOQ{l
zoV1wi+thq4+bh)jY!wA1U|8ion{M^@W7>r`f2n_u*FNL-oS+bcP~bO0osbnyt4H(v
zQ-IhdQRH^$Y6ogyd`G<+Go>rjj+tKn_0PYz*qI?U_aLDad+%+(TQZ((^I$lgO3u?d
zkOjuKhHhP2rkl-vWB6FJ8MM)-Z*dQQ3<80M6K1)iOG1Zu!#0jC$%LL9U0^>7BS)7M
zf`lAhg3+caT<GX>LN=ip-j|&suFPGr=dHQd=B-4;xqpRl{mb*OUwT_&80@&>?Ko)2
z1J=rDT%SW@<qQ{yQcLpvLkt?VE~W4Wcp0sZ7#V;@?T&)`6&QdKJdAYOcCz1pO)1gF
zR%4{0T!PZdoI`<2l(KSIE0<wkF-44QEA>US4kOSHr*ck{0RnTiBw7h~RDxq6g*51D
zaYL08f0Rnf4KZgE(=_JeIzF`PJ6#F0<@!OT>U2<R^8})&+EfCqB>>)$Q!D{&$70Y?
zptsV{B{OO1*_rHs%<;ENg<!dV0e6t$(tj<X;Y$yUTaP?DA3UT9eLy}WrgM-1P<vft
zn70M__xAIm_D(jx_YTE_-%a;uVzP?wymqKcZsufh`rulw=I|lpT-gn#aBYA0<K1Fd
zg~pwz5(*-YtTS99F|vDV;yux=z&g8?<Pw)wwf5jFwa7RyBUp}ql7F^;j;nL?4A%il
z38RpE$S5{5$WAp6YfkCn!|UckESalp^7uKDe+_&Sa&aV>k&P;O3I1eL=i}9Nc+Lg+
zct$Eh9^?zygr?v10QpePC$T}RC`V$$*pqi`qPm5fa?)Ahh;98p_p~+L?)4BZPUe<m
zM>2-Rz?6w;_E*d<B`IxxXpT^D<U4f`maI8)$P?~#KJtwLJ$0kx{r5C4Gl7ra-zQgd
zVOHe|t5fFEmMiu#7jgUK4=#LTFS^CIx7%KHsuwS1Rt+<3d-Af-$6WYTNr@p|h9CG5
zUk&VQEn<8+)_73wqRIph;*xn|(O%mGdVZ|QTOnluZFy^8fdF!U=m=W2?}d}Mnh**f
zZz3e1y$F|Om%WHb?zm{H$tXz~CkS{{5NoKv_p_6O>Ei81FQp5ahUn2)ONwL~a-gLw
zHx2Q)9aZ)b^47Nv6$}p{j})%TYc~u!(tO)jANU4<{Ct!uQ1WJKVDyJlZFPR^(Nq}p
zx1~ZTc9NM2))WVS34T7pZR&fHrcSh&gJUbEvsD)K62?}YNU`9dvS&vytJ?zXD<PS)
z!)8!qr)w^7j@+NPwM#B;rFX|3Z_y;5w(_&8EsbisC5Xo4HjGe@F!_1C^pp7Dl*E7e
zm+QgMJo(`yG-7rIhK-l%#Tuq$P=>WYN$RR7tI}X0Cs*Qs0wYy1b}54e!mvGzv-swc
z(n4^s2JSJISPi*AQE&%tj+V((-&6o=o4iNz&zcuJH!pDMpGyh?+(W^yL7yyL4{Ab*
zAEb*zei%}Erb<ibxn4revJRqbyH+XBw%jzx$<Sb)fI2Y-Y2Mr}FH7#YE}Znb`Ps#G
z%?nt%rh+mVFt#ly^*9p`Jcx-r(*C1O`{!r>Kc*+H@wdAn0a65)4<Z2-mm($sBtki4
zIWuKAV`MgCI5asqHe)z3F*sr{H90t8Ffw9dF*80qI5RUfW;teKVl_B5H90b7W;J0p
zFfwIkV>LEqG-5Ghmxv|-E>%knfItj{;eU2{EL_ll3OwKhE1VHRI3WWUs2~NJ_VA^d
zNm>9i!2k&|NaGp1+$@eQlHN^j<rbkS+S+a0Ry5CdjWS2uiT(PM<@PTtK4vd?DhsTa
S3MT<93Nbk_3MC~)PeuwxdzZWb

diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
index 729651da1..bef09eb83 100755
--- a/document/database/knowledge.a5er
+++ b/document/database/knowledge.a5er
@@ -99,11 +99,12 @@ Field="ユーザID","USER_ID","INTEGER","NOT NULL",0,"","",$FFFFFFFF,""
 Field="履歴番号","HISTORY_NO","BIGINT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="アクティビティ番号","ACTIVITY_NO","BIGINT","NOT NULL",,"","",$FFFFFFFF,""
 Field="獲得のタイプ","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
-Field="獲得ポイント","POINT","@INT",,,"","",$FFFFFFFF,""
+Field="獲得ポイント","POINT","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Field="トータルポイント","TOTAL","@INT","NOT NULL",,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20170831113951
+ModifiedDateTime=20170905223847
 Position="MAIN",3500,850
 
 [Relation]
@@ -115,15 +116,15 @@ Fields1=ACTIVITY_NO
 Fields2=ACTIVITY_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,5388,4612,4310,R,R
+Position="MAIN",0,6576,4612,4384,R,R
 Dependence=0
 Caption=
 PName=
 ModifiedDateTime=20170831112218
 LineMode=0
-Bar1=539
+Bar1=658
 Bar2=461
-Bar3=431
+Bar3=438
 TermPos1=R
 TermPos2=R
 
@@ -161,10 +162,11 @@ Field="履歴番号","HISTORY_NO","BIGINT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="アクティビティ番号","ACTIVITY_NO","BIGINT","NOT NULL",,"","",$FFFFFFFF,""
 Field="獲得のタイプ","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="獲得ポイント","POINT","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Field="トータルポイント","TOTAL","@INT","NOT NULL",,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20170831112825
+ModifiedDateTime=20170905223840
 Position="MAIN",2450,1100
 
 [Relation]
@@ -605,7 +607,7 @@ Fields1=KNOWLEDGE_ID,ITEM_NO
 Fields2=KNOWLEDGE_ID,ITEM_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4139,4896,5177,R,R
+Position="MAIN",0,4139,4896,5178,R,R
 Dependence=1
 Caption=
 PName=
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
index 7eb1dd082..56f1c0791 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
@@ -219,6 +219,7 @@ public PointKnowledgeHistoriesEntity rawPhysicalInsert(PointKnowledgeHistoriesEn
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -241,6 +242,7 @@ public PointKnowledgeHistoriesEntity physicalInsert(PointKnowledgeHistoriesEntit
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -288,6 +290,7 @@ public PointKnowledgeHistoriesEntity physicalUpdate(PointKnowledgeHistoriesEntit
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
index 120b27492..32b700285 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
@@ -219,6 +219,7 @@ public PointUserHistoriesEntity rawPhysicalInsert(PointUserHistoriesEntity entit
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -241,6 +242,7 @@ public PointUserHistoriesEntity physicalInsert(PointUserHistoriesEntity entity)
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -288,6 +290,7 @@ public PointUserHistoriesEntity physicalUpdate(PointUserHistoriesEntity entity)
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java
index 4edb02c74..2b68f5814 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java
@@ -61,6 +61,8 @@ public GenPointKnowledgeHistoriesEntity(Long historyNo, Long knowledgeId) {
     private Integer type;
     /** 獲得ポイント */
     private Integer point;
+    /** トータルポイント */
+    private Integer total;
     /** 登録ユーザ */
     private Integer insertUser;
     /** 登録日時 */
@@ -152,6 +154,22 @@ public GenPointKnowledgeHistoriesEntity setPoint(Integer point) {
         return this;
     }
 
+    /**
+     * Get トータルポイント.
+     * @return トータルポイント
+     */
+    public Integer getTotal() {
+        return this.total;
+    }
+    /**
+     * Set トータルポイント.
+     * @param total トータルポイント
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setTotal(Integer total) {
+        this.total = total;
+        return this;
+    }
+
     /**
      * Get 登録ユーザ.
      * @return 登録ユーザ
@@ -288,6 +306,7 @@ public String toString() {
         builder.append("activityNo = ").append(activityNo).append("\n");
         builder.append("type = ").append(type).append("\n");
         builder.append("point = ").append(point).append("\n");
+        builder.append("total = ").append(total).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
         builder.append("insertDatetime = ").append(insertDatetime).append("\n");
         builder.append("updateUser = ").append(updateUser).append("\n");
@@ -346,6 +365,16 @@ public List<ValidateError> validate() {
         if (error != null) {
             errors.add(error);
         }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.total, convLabelName("Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.total, convLabelName("Total"));
+        if (error != null) {
+            errors.add(error);
+        }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
         error = validator.validate(this.insertUser, convLabelName("Insert User"));
         if (error != null) {
@@ -407,6 +436,16 @@ public List<ValidateError> validate(Map<String, String> values) {
         if (error != null) {
             errors.add(error);
         }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("total"), convLabelName("Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("total"), convLabelName("Total"));
+        if (error != null) {
+            errors.add(error);
+        }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
         error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
         if (error != null) {
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java
index 66af41553..93268628d 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java
@@ -61,6 +61,8 @@ public GenPointUserHistoriesEntity(Long historyNo, Integer userId) {
     private Integer type;
     /** 獲得ポイント */
     private Integer point;
+    /** トータルポイント */
+    private Integer total;
     /** 登録ユーザ */
     private Integer insertUser;
     /** 登録日時 */
@@ -152,6 +154,22 @@ public GenPointUserHistoriesEntity setPoint(Integer point) {
         return this;
     }
 
+    /**
+     * Get トータルポイント.
+     * @return トータルポイント
+     */
+    public Integer getTotal() {
+        return this.total;
+    }
+    /**
+     * Set トータルポイント.
+     * @param total トータルポイント
+     * @return this object     */
+    public GenPointUserHistoriesEntity setTotal(Integer total) {
+        this.total = total;
+        return this;
+    }
+
     /**
      * Get 登録ユーザ.
      * @return 登録ユーザ
@@ -288,6 +306,7 @@ public String toString() {
         builder.append("activityNo = ").append(activityNo).append("\n");
         builder.append("type = ").append(type).append("\n");
         builder.append("point = ").append(point).append("\n");
+        builder.append("total = ").append(total).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
         builder.append("insertDatetime = ").append(insertDatetime).append("\n");
         builder.append("updateUser = ").append(updateUser).append("\n");
@@ -341,11 +360,26 @@ public List<ValidateError> validate() {
         if (error != null) {
             errors.add(error);
         }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.point, convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
         error = validator.validate(this.point, convLabelName("Point"));
         if (error != null) {
             errors.add(error);
         }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.total, convLabelName("Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.total, convLabelName("Total"));
+        if (error != null) {
+            errors.add(error);
+        }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
         error = validator.validate(this.insertUser, convLabelName("Insert User"));
         if (error != null) {
@@ -402,11 +436,26 @@ public List<ValidateError> validate(Map<String, String> values) {
         if (error != null) {
             errors.add(error);
         }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("point"), convLabelName("Point"));
+        if (error != null) {
+            errors.add(error);
+        }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
         error = validator.validate(values.get("point"), convLabelName("Point"));
         if (error != null) {
             errors.add(error);
         }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("total"), convLabelName("Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("total"), convLabelName("Total"));
+        if (error != null) {
+            errors.add(error);
+        }
         validator = ValidatorFactory.getInstance(Validator.INTEGER);
         error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
         if (error != null) {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
index 671c1c0a0..abc0f842e 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
@@ -109,19 +109,6 @@ protected ActivitiesEntity addActivity(Activity kind, String target) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     protected int addPointForUser(int targetUser, long activityNo, int type, int point) {
         synchronized(lockUser) {
-            long num = PointUserHistoriesDao.get().selectNumOnUser(targetUser);
-            num++;
-            PointUserHistoriesEntity history = new PointUserHistoriesEntity();
-            history.setUserId(targetUser);
-            history.setHistoryNo(num);
-            history.setActivityNo(activityNo);
-            history.setType(type);
-            history.setPoint(point);
-            history.setInsertUser(eventUser.getUserId());
-            history.setInsertDatetime(new Timestamp(eventDateTime.getTime()));
-            history.setDeleteFlag(INT_FLAG.OFF.getValue());
-            PointUserHistoriesDao.get().physicalInsert(history);
-            
             UserConfigsEntity config = UserConfigsDao.get().selectOnKey(UserConfig.POINT, AppConfig.get().getSystemName(), targetUser);
             if (config == null) {
                 config = new UserConfigsEntity(UserConfig.POINT, AppConfig.get().getSystemName(), targetUser);
@@ -135,6 +122,21 @@ protected int addPointForUser(int targetUser, long activityNo, int type, int poi
             now = now + point;
             config.setConfigValue(String.valueOf(now));
             UserConfigsDao.get().save(config);
+            
+            long num = PointUserHistoriesDao.get().selectNumOnUser(targetUser);
+            num++;
+            PointUserHistoriesEntity history = new PointUserHistoriesEntity();
+            history.setUserId(targetUser);
+            history.setHistoryNo(num);
+            history.setActivityNo(activityNo);
+            history.setType(type);
+            history.setPoint(point);
+            history.setTotal(now);
+            history.setInsertUser(eventUser.getUserId());
+            history.setInsertDatetime(new Timestamp(eventDateTime.getTime()));
+            history.setDeleteFlag(INT_FLAG.OFF.getValue());
+            PointUserHistoriesDao.get().physicalInsert(history);
+            
             return now;
         }
     }
@@ -151,6 +153,13 @@ protected int addPointForUser(int targetUser, long activityNo, int type, int poi
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     protected int addPointForKnowledge(long knowledgeId, long activityNo, int type, int point) {
         synchronized (lockKnowledge) {
+            // Daoのupdateメソッドなどを使うと、「更新者」が更新されるので、ポイントのみを更新するメソッドを呼ぶ
+            // なお、記事の存在チェックは行わない
+            int now = KnowledgesDao.get().selectPoint(knowledgeId);
+            LOG.info("Add point [knowledge]" + knowledgeId + " [point]" + point + " [now]" + now);
+            now = now + point;
+            KnowledgesDao.get().updatePoint(knowledgeId, now);
+            
             long num = PointKnowledgeHistoriesDao.get().selectNumOnKnowledge(knowledgeId);
             num++;
             PointKnowledgeHistoriesEntity history = new PointKnowledgeHistoriesEntity();
@@ -159,17 +168,12 @@ protected int addPointForKnowledge(long knowledgeId, long activityNo, int type,
             history.setActivityNo(activityNo);
             history.setType(type);
             history.setPoint(point);
+            history.setTotal(now);
             history.setInsertUser(eventUser.getUserId());
             history.setInsertDatetime(new Timestamp(eventDateTime.getTime()));
             history.setDeleteFlag(INT_FLAG.OFF.getValue());
             PointKnowledgeHistoriesDao.get().physicalInsert(history);
             
-            // Daoのupdateメソッドなどを使うと、「更新者」が更新されるので、ポイントのみを更新するメソッドを呼ぶ
-            // なお、記事の存在チェックは行わない
-            int now = KnowledgesDao.get().selectPoint(knowledgeId);
-            LOG.info("Add point [knowledge]" + knowledgeId + " [point]" + point + " [now]" + now);
-            now = now + point;
-            KnowledgesDao.get().updatePoint(knowledgeId, now);
             return now;
         }
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
index b1aa66db0..973fdd701 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
@@ -30,8 +30,11 @@ protected Activity getActivity() {
     private int getPoint() {
         // 文章が多い力先はポイントが高いように調整
         int point = 50;
-        if (StringUtils.isNotEmpty(getKnowledge().getContent()) && getKnowledge().getContent().length() > 700) {
-            int add = (getKnowledge().getContent().length() - 700) / 50;
+        if (StringUtils.isNotEmpty(getKnowledge().getContent()) && getKnowledge().getContent().length() > 1000) {
+            int add = (getKnowledge().getContent().length() - 1000) / 100;
+            if (add > 100) {
+                add = 100;
+            }
             point += add;
         }
         return point;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql
index 4ada9a3f2..6e8c5fdb3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql
@@ -5,6 +5,7 @@ HISTORY_NO
  , ACTIVITY_NO
  , TYPE
  , POINT
+ , TOTAL
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -21,4 +22,5 @@ HISTORY_NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql
index 4ada9a3f2..6e8c5fdb3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql
@@ -5,6 +5,7 @@ HISTORY_NO
  , ACTIVITY_NO
  , TYPE
  , POINT
+ , TOTAL
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -21,4 +22,5 @@ HISTORY_NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql
index dfe5bc637..d412e7545 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql
@@ -3,6 +3,7 @@ SET
    ACTIVITY_NO = ?
  , TYPE = ?
  , POINT = ?
+ , TOTAL = ?
  , INSERT_USER = ?
  , INSERT_DATETIME = ?
  , UPDATE_USER = ?
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql
index fba9e04af..3063beabb 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql
@@ -5,6 +5,7 @@ HISTORY_NO
  , ACTIVITY_NO
  , TYPE
  , POINT
+ , TOTAL
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -21,4 +22,5 @@ HISTORY_NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql
index fba9e04af..3063beabb 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql
@@ -5,6 +5,7 @@ HISTORY_NO
  , ACTIVITY_NO
  , TYPE
  , POINT
+ , TOTAL
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -21,4 +22,5 @@ HISTORY_NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql
index e67e9d91a..ec002a027 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql
@@ -3,6 +3,7 @@ SET
    ACTIVITY_NO = ?
  , TYPE = ?
  , POINT = ?
+ , TOTAL = ?
  , INSERT_USER = ?
  , INSERT_DATETIME = ?
  , UPDATE_USER = ?
diff --git a/src/main/resources/org/support/project/knowledge/database/ddl.sql b/src/main/resources/org/support/project/knowledge/database/ddl.sql
index 1fe60dc25..2dba85486 100644
--- a/src/main/resources/org/support/project/knowledge/database/ddl.sql
+++ b/src/main/resources/org/support/project/knowledge/database/ddl.sql
@@ -6,7 +6,8 @@ create table POINT_USER_HISTORIES (
   , HISTORY_NO BIGINT not null
   , ACTIVITY_NO BIGINT not null
   , TYPE integer not null
-  , POINT integer
+  , POINT integer not null
+  , TOTAL integer not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
@@ -24,6 +25,7 @@ create table POINT_KNOWLEDGE_HISTORIES (
   , ACTIVITY_NO BIGINT not null
   , TYPE integer not null
   , POINT integer not null
+  , TOTAL integer not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
@@ -854,6 +856,7 @@ comment on column POINT_USER_HISTORIES.HISTORY_NO is '履歴番号';
 comment on column POINT_USER_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
 comment on column POINT_USER_HISTORIES.TYPE is '獲得のタイプ';
 comment on column POINT_USER_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_USER_HISTORIES.TOTAL is 'トータルポイント';
 comment on column POINT_USER_HISTORIES.INSERT_USER is '登録ユーザ';
 comment on column POINT_USER_HISTORIES.INSERT_DATETIME is '登録日時';
 comment on column POINT_USER_HISTORIES.UPDATE_USER is '更新ユーザ';
@@ -866,6 +869,7 @@ comment on column POINT_KNOWLEDGE_HISTORIES.HISTORY_NO is '履歴番号';
 comment on column POINT_KNOWLEDGE_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
 comment on column POINT_KNOWLEDGE_HISTORIES.TYPE is '獲得のタイプ';
 comment on column POINT_KNOWLEDGE_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_KNOWLEDGE_HISTORIES.TOTAL is 'トータルポイント';
 comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_USER is '登録ユーザ';
 comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_DATETIME is '登録日時';
 comment on column POINT_KNOWLEDGE_HISTORIES.UPDATE_USER is '更新ユーザ';
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
index 85d8ed223..e7d784738 100644
--- a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
@@ -6,7 +6,8 @@ create table POINT_USER_HISTORIES (
   , HISTORY_NO BIGINT not null
   , ACTIVITY_NO BIGINT not null
   , TYPE integer not null
-  , POINT integer
+  , POINT integer not null
+  , TOTAL integer not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
@@ -24,6 +25,7 @@ create table POINT_KNOWLEDGE_HISTORIES (
   , ACTIVITY_NO BIGINT not null
   , TYPE integer not null
   , POINT integer not null
+  , TOTAL integer not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
@@ -86,13 +88,13 @@ create table BADGES (
   , constraint BADGES_PKC primary key (NO)
 ) ;
 
-
 comment on table POINT_USER_HISTORIES is 'ユーザのポイント獲得履歴';
 comment on column POINT_USER_HISTORIES.USER_ID is 'ユーザID';
 comment on column POINT_USER_HISTORIES.HISTORY_NO is '履歴番号';
 comment on column POINT_USER_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
 comment on column POINT_USER_HISTORIES.TYPE is '獲得のタイプ';
 comment on column POINT_USER_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_USER_HISTORIES.TOTAL is 'トータルポイント';
 comment on column POINT_USER_HISTORIES.INSERT_USER is '登録ユーザ';
 comment on column POINT_USER_HISTORIES.INSERT_DATETIME is '登録日時';
 comment on column POINT_USER_HISTORIES.UPDATE_USER is '更新ユーザ';
@@ -105,6 +107,7 @@ comment on column POINT_KNOWLEDGE_HISTORIES.HISTORY_NO is '履歴番号';
 comment on column POINT_KNOWLEDGE_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
 comment on column POINT_KNOWLEDGE_HISTORIES.TYPE is '獲得のタイプ';
 comment on column POINT_KNOWLEDGE_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_KNOWLEDGE_HISTORIES.TOTAL is 'トータルポイント';
 comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_USER is '登録ユーザ';
 comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_DATETIME is '登録日時';
 comment on column POINT_KNOWLEDGE_HISTORIES.UPDATE_USER is '更新ユーザ';

From 026a7d6d33b3c51cd52a4fd663e50a4694586d8b Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 5 Sep 2017 23:48:22 +0900
Subject: [PATCH 052/138] #840 Add chart.js

---
 Third_party_license.txt                       |  3 ++
 bower.json                                    |  3 +-
 .../WEB-INF/views/open/account/account.jsp    |  8 +++--
 .../WEB-INF/views/open/license/index.jsp      |  3 ++
 src/main/webapp/js/account-page.js            | 29 +++++++++++++++++++
 5 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 src/main/webapp/js/account-page.js

diff --git a/Third_party_license.txt b/Third_party_license.txt
index de0235b13..cf50d436c 100644
--- a/Third_party_license.txt
+++ b/Third_party_license.txt
@@ -202,5 +202,8 @@
    - License: [BSD License] https://github.com/kpdecker/jsdiff/blob/master/LICENSE
    - project-url: https://github.com/kpdecker/jsdiff
    
+- Chart.js
+   - License: [MIT License] https://github.com/chartjs/Chart.js/blob/master/LICENSE.md
+   - project-url: https://github.com/chartjs/Chart.js
    
    
\ No newline at end of file
diff --git a/bower.json b/bower.json
index b223fe2b6..dbe3860f6 100644
--- a/bower.json
+++ b/bower.json
@@ -35,7 +35,8 @@
     "bootstrap-table": "1.11.1",
     "tableExport.jquery.plugin": "1.8.1",
     "diff2html": "2.3.0",
-    "jsdiff": "3.2.0"
+    "jsdiff": "3.2.0",
+    "chart.js": "2.6.0"
   },
   "devDependencies": {},
   "resolutions": {
diff --git a/src/main/webapp/WEB-INF/views/open/account/account.jsp b/src/main/webapp/WEB-INF/views/open/account/account.jsp
index 7f8c20ffa..625a715ec 100644
--- a/src/main/webapp/WEB-INF/views/open/account/account.jsp
+++ b/src/main/webapp/WEB-INF/views/open/account/account.jsp
@@ -21,7 +21,11 @@
 <c:param name="PARAM_SCRIPTS">
 <!-- build:js(src/main/webapp) js/page-open-account.js -->
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/echojs/dist/echo.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/moment/min/moment.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/moment/locale/ja.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/chart.js/dist/Chart.min.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/js/knowledge-list.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/js/account-page.js"></script>
 <!-- endbuild -->
 </c:param>
 
@@ -70,12 +74,10 @@
         
     </div>
     <div class="col-sm-6 col-md-6">
-        CPのグラフ
+        <canvas id="cpChart"></canvas>
     </div>
 </div>
 
-<br/>
-
 <div class="row">
     <ul class="nav nav-tabs">
         <li role="presentation" class="active"><a href="<%=request.getContextPath()%>/open.account/info/<%= jspUtil.out("userId") %>">
diff --git a/src/main/webapp/WEB-INF/views/open/license/index.jsp b/src/main/webapp/WEB-INF/views/open/license/index.jsp
index 6bea4f2a1..b7cfc6527 100644
--- a/src/main/webapp/WEB-INF/views/open/license/index.jsp
+++ b/src/main/webapp/WEB-INF/views/open/license/index.jsp
@@ -247,6 +247,9 @@ $(document).ready(function(){
    - License: [BSD License] https://github.com/kpdecker/jsdiff/blob/master/LICENSE
    - project-url: https://github.com/kpdecker/jsdiff
    
+- Chart.js
+   - License: [MIT License] https://github.com/chartjs/Chart.js/blob/master/LICENSE.md
+   - project-url: https://github.com/chartjs/Chart.js
    
    
 
diff --git a/src/main/webapp/js/account-page.js b/src/main/webapp/js/account-page.js
new file mode 100644
index 000000000..6719ed338
--- /dev/null
+++ b/src/main/webapp/js/account-page.js
@@ -0,0 +1,29 @@
+$(document).ready(function() {
+    var ctx = document.getElementById('cpChart').getContext('2d');
+    
+    moment.locale(_LANG);
+    var m = moment();
+    var labels = [];
+    var data = [];
+    for (var i = 0; i < 30; i++) {
+        labels.push(m.format('L'));
+        m.subtract(1, 'days');
+        data.push(i);
+    }
+    labels.reverse();
+    
+    var myChart = new Chart(ctx, {
+      type: 'line',
+      data: {
+        labels: labels,
+        datasets: [{
+          label: 'Contribution Point',
+          data: data,
+          backgroundColor: "rgba(0,0,255,0.5)",
+          steppedLine: 'before'
+        }]
+      }
+    });
+    
+    
+});

From b072a43096cd2d39a534e816cb4e59c1d5c271aa Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 7 Sep 2017 01:44:12 +0900
Subject: [PATCH 053/138] #840 Add a function to get contribution point history
 of user

---
 document/database/knowledge.a5er              | 10 ++-
 .../project/knowledge/config/UserConfig.java  |  6 ++
 .../project/knowledge/control/Control.java    | 10 +++
 .../control/open/AccountControl.java          | 17 ++++
 .../control/open/KnowledgeControl.java        |  2 +-
 .../knowledge/control/open/SignupControl.java | 10 +--
 .../control/protect/AccountControl.java       |  4 +-
 .../knowledge/dao/PointUserHistoriesDao.java  | 46 +++++++++++
 .../project/knowledge/filter/ApiFilter.java   |  6 +-
 .../CloseAbleAuthenticationFilter.java        | 22 +++++-
 .../project/knowledge/logic/AccountLogic.java | 78 ++++++++++++++++++-
 .../logic/KnowledgeAuthenticationLogic.java   | 70 +++++++++++++++++
 .../logic/activity/ActivityLogic.java         |  7 ++
 .../vo/ContributionPointHistory.java          | 35 +++++++++
 .../project/knowledge/vo/UserConfigs.java     | 67 ++++++++++++++++
 .../select_point_history_by_date_h2.sql       | 26 +++++++
 ...elect_point_history_by_date_postgresql.sql | 18 +++++
 .../project/knowledge/database/ddl.sql        |  6 ++
 .../deploy/v1_11_0/migrate_v1_11_2.sql        |  7 ++
 src/main/webapp/WEB-INF/web.xml               |  4 +-
 20 files changed, 430 insertions(+), 21 deletions(-)
 rename src/main/java/org/support/project/knowledge/{listener => filter}/CloseAbleAuthenticationFilter.java (80%)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/KnowledgeAuthenticationLogic.java
 create mode 100644 src/main/java/org/support/project/knowledge/vo/ContributionPointHistory.java
 create mode 100644 src/main/java/org/support/project/knowledge/vo/UserConfigs.java
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_h2.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_postgresql.sql

diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
index bef09eb83..69e6b9f8a 100755
--- a/document/database/knowledge.a5er
+++ b/document/database/knowledge.a5er
@@ -101,10 +101,11 @@ Field="アクティビティ番号","ACTIVITY_NO","BIGINT","NOT NULL",,"","",$FF
 Field="獲得のタイプ","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="獲得ポイント","POINT","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="トータルポイント","TOTAL","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Index=IDX_POINT_USER_HISTORIES_INSERT_DATETIME=0,INSERT_DATETIME
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20170905223847
+ModifiedDateTime=20170906092459
 Position="MAIN",3500,850
 
 [Relation]
@@ -163,10 +164,11 @@ Field="アクティビティ番号","ACTIVITY_NO","BIGINT","NOT NULL",,"","",$FF
 Field="獲得のタイプ","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="獲得ポイント","POINT","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="トータルポイント","TOTAL","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Index=IDX_POINT_KNOWLEDGE_HISTORIES_INSERT_DATETIME=0,INSERT_DATETIME
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20170905223840
+ModifiedDateTime=20170906092323
 Position="MAIN",2450,1100
 
 [Relation]
@@ -1412,7 +1414,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,5026,7091,6143,R,R
+Position="MAIN",0,5026,7091,6103,R,R
 Dependence=1
 Caption=
 PName=
@@ -1420,7 +1422,7 @@ ModifiedDateTime=20150910041644
 LineMode=0
 Bar1=503
 Bar2=709
-Bar3=614
+Bar3=610
 TermPos1=R
 TermPos2=R
 
diff --git a/src/main/java/org/support/project/knowledge/config/UserConfig.java b/src/main/java/org/support/project/knowledge/config/UserConfig.java
index 708eda64f..6c50a7b75 100644
--- a/src/main/java/org/support/project/knowledge/config/UserConfig.java
+++ b/src/main/java/org/support/project/knowledge/config/UserConfig.java
@@ -2,10 +2,16 @@
 
 /** ユーザー設定（USER_CONFIGSテーブル）の設定キーを管理 */
 public class UserConfig {
+    public static final String REQUEST_USER_CONFIG_KEY = "REQUEST_USER_CONFIG_KEY";
     
     public static final String DEFAULT_PUBLIC_FLAG = "DEFAULT_PUBLIC_FLAG";
     public static final String DEFAULT_TARGET = "DEFAULT_TARGET";
     public static final String POINT = "POINT";
     
+    public static final String TIMEZONE = "TIMEZONE";
+    public static final String TIME_ZONE_OFFSET = "TIME_ZONE_OFFSET";
+    public static final String THEMA = "THEMA";
+    public static final String HIGHLIGHT = "HIGHLIGHT";
+    
     
 }
diff --git a/src/main/java/org/support/project/knowledge/control/Control.java b/src/main/java/org/support/project/knowledge/control/Control.java
index d40b1f81f..5410a42d3 100644
--- a/src/main/java/org/support/project/knowledge/control/Control.java
+++ b/src/main/java/org/support/project/knowledge/control/Control.java
@@ -15,8 +15,10 @@
 import org.support.project.common.util.HtmlUtils;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
+import org.support.project.knowledge.config.UserConfig;
 import org.support.project.knowledge.dao.NotifyConfigsDao;
 import org.support.project.knowledge.entity.NotifyConfigsEntity;
+import org.support.project.knowledge.vo.UserConfigs;
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.common.HttpUtil;
 import org.support.project.web.logic.NotificationLogic;
@@ -176,5 +178,13 @@ private boolean flagCheck(Integer check) {
         }
         return false;
     }
+    
+    protected UserConfigs getUserConfigs() {
+        UserConfigs userConfigs =  (UserConfigs) getRequest().getAttribute(UserConfig.REQUEST_USER_CONFIG_KEY);
+        if (userConfigs == null) {
+            userConfigs = new UserConfigs();
+        }
+        return userConfigs;
+    }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/control/open/AccountControl.java b/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
index 775c8bfc3..14083dfa0 100644
--- a/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
@@ -24,10 +24,14 @@
 import org.support.project.knowledge.logic.AccountLogic;
 import org.support.project.knowledge.logic.IdenticonLogic;
 import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.knowledge.vo.AccountInfo;
+import org.support.project.knowledge.vo.ContributionPointHistory;
 import org.support.project.knowledge.vo.StockKnowledge;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.control.service.Get;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.UsersEntity;
 import org.support.project.web.exception.InvalidParamException;
 
 @DI(instance = Instance.Prototype)
@@ -118,5 +122,18 @@ public Boundary info() throws Exception {
         
         return forward("account.jsp");
     }
+    
+    @Get
+    public Boundary cp() throws Exception {
+        Integer userId = getPathInteger(-1);
+        UsersEntity account = UsersDao.get().selectOnKey(userId);
+        if (account == null) {
+            return send(HttpStatus.SC_NOT_FOUND, "NOT FOUND");
+        }
+        List<ContributionPointHistory> list = ActivityLogic.get().getUserPointHistoriesByDate(userId, getUserConfigs());
+        return send(list);
+    }
+
+    
 
 }
diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 6f9ae8f89..b87dc3c28 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -322,7 +322,7 @@ public Boundary list() throws Exception {
         // ログインユーザ情報を最新化
         // TODO 毎回最新化するのは、パフォーマンスが悪い？グループ情報が更新になった場合に、影響があるユーザの一覧を保持しておき、
         // そのユーザのみを更新した方が良いかも。いったんは、ナレッジの一覧を表示する際に、毎回更新してみる（それほど負荷が高くなさそうなので）
-        super.updateLoginInfo();
+        updateLoginInfo();
 
         // 共通処理呼の表示条件の保持の呼び出し
         setViewParam();
diff --git a/src/main/java/org/support/project/knowledge/control/open/SignupControl.java b/src/main/java/org/support/project/knowledge/control/open/SignupControl.java
index 2e49c9ddc..0a34efdef 100644
--- a/src/main/java/org/support/project/knowledge/control/open/SignupControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/SignupControl.java
@@ -15,6 +15,7 @@
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.SystemConfig;
 import org.support.project.knowledge.control.Control;
+import org.support.project.knowledge.logic.KnowledgeAuthenticationLogic;
 import org.support.project.knowledge.logic.MailLogic;
 import org.support.project.knowledge.logic.notification.AcceptCheckUserNotification;
 import org.support.project.knowledge.logic.notification.AddUserNotification;
@@ -34,7 +35,6 @@
 import org.support.project.web.entity.UsersEntity;
 import org.support.project.web.logic.AuthenticationLogic;
 import org.support.project.web.logic.UserLogic;
-import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
 
 @DI(instance = Instance.Prototype)
 public class SignupControl extends Control {
@@ -159,8 +159,8 @@ private void addUser() {
         AddUserNotification.get().sendNotifyAddUser(user);
 
         // ログイン処理
-        AuthenticationLogic<LoginedUser> logic = Container.getComp(DefaultAuthenticationLogicImpl.class);
-        logic.setSession(user.getUserKey(), getRequest());
+        AuthenticationLogic<LoginedUser> logic = Container.getComp(KnowledgeAuthenticationLogic.class);
+        logic.setSession(user.getUserKey(), getRequest(), getResponse());
     }
 
     /**
@@ -225,8 +225,8 @@ public Boundary activate() {
             AddUserNotification.get().sendNotifyAddUser(user);
         }
         // ログイン処理
-        AuthenticationLogic<LoginedUser> logic = Container.getComp(DefaultAuthenticationLogicImpl.class);
-        logic.setSession(entity.getUserKey(), getRequest());
+        AuthenticationLogic<LoginedUser> logic = Container.getComp(KnowledgeAuthenticationLogic.class);
+        logic.setSession(entity.getUserKey(), getRequest(), getResponse());
 
         addMsgInfo("knowledge.signup.done");
         return devolution(HttpMethod.get, "Index/index");
diff --git a/src/main/java/org/support/project/knowledge/control/protect/AccountControl.java b/src/main/java/org/support/project/knowledge/control/protect/AccountControl.java
index cc5d4734b..c58f74e8d 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/AccountControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/AccountControl.java
@@ -19,6 +19,7 @@
 import org.support.project.knowledge.config.UserConfig;
 import org.support.project.knowledge.control.Control;
 import org.support.project.knowledge.logic.AccountLogic;
+import org.support.project.knowledge.logic.KnowledgeAuthenticationLogic;
 import org.support.project.knowledge.logic.TargetLogic;
 import org.support.project.knowledge.logic.UserLogicEx;
 import org.support.project.knowledge.vo.UploadFile;
@@ -39,7 +40,6 @@
 import org.support.project.web.entity.UsersEntity;
 import org.support.project.web.exception.InvalidParamException;
 import org.support.project.web.logic.AuthenticationLogic;
-import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
 
 @DI(instance = Instance.Prototype)
 public class AccountControl extends Control {
@@ -185,7 +185,7 @@ public Boundary delete() throws Exception {
         UserLogicEx.get().withdrawal(getLoginUserId(), knowledgeRemove, HttpUtil.getLocale(getRequest()));
 
         // セッションを破棄
-        AuthenticationLogic<LoginedUser> authenticationLogic = Container.getComp(DefaultAuthenticationLogicImpl.class);
+        AuthenticationLogic<LoginedUser> authenticationLogic = Container.getComp(KnowledgeAuthenticationLogic.class);
         authenticationLogic.clearSession(getRequest());
 
         addMsgInfo("knowledge.account.delete");
diff --git a/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
index fc74bc844..60893261f 100644
--- a/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
@@ -1,16 +1,29 @@
 package org.support.project.knowledge.dao;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
 import org.support.project.aop.Aspect;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.dao.gen.GenPointUserHistoriesDao;
+import org.support.project.knowledge.vo.ContributionPointHistory;
+import org.support.project.knowledge.vo.UserConfigs;
+import org.support.project.ormapping.common.SQLManager;
+import org.support.project.ormapping.connection.ConnectionManager;
 
 /**
  * ユーザのポイント獲得履歴
  */
 @DI(instance = Instance.Singleton)
 public class PointUserHistoriesDao extends GenPointUserHistoriesDao {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(PointUserHistoriesDao.class);
 
     /** SerialVersion */
     private static final long serialVersionUID = 1L;
@@ -27,6 +40,39 @@ public long selectNumOnUser(int user) {
         String sql = "SELECT MAX(HISTORY_NO) FROM POINT_USER_HISTORIES WHERE USER_ID = ?";
         return executeQuerySingle(sql, Long.class, user);
     }
+    
+    private String convTimeToString(int min) throws ParseException {
+        boolean minus = false;
+        if (min < 0) {
+            minus = true;
+            min = min * -1;
+        }
+        SimpleDateFormat time = new SimpleDateFormat("HH:mm");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        Date d = format.parse("2000/01/01 00:00:00");
+        d.setTime(d.getTime() + (min * 60 * 1000));
+        StringBuilder builder = new StringBuilder();
+        if (minus) {
+            builder.append("-");
+        }
+        builder.append(time.format(d));
+        return builder.toString();
+    }
+
+    public List<ContributionPointHistory> selectPointHistoriesByDate(Integer userId, UserConfigs userConfigs) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date.sql");
+        if (ConnectionManager.getInstance().getDriverClass().indexOf("postgresql") != -1) {
+            String min;
+            try {
+                min = convTimeToString(userConfigs.getTimezoneOffset());
+            } catch (ParseException e) {
+                min = "00:00";
+            }
+            return executeQueryList(sql, ContributionPointHistory.class, min, userId);
+        } else {
+            return executeQueryList(sql, ContributionPointHistory.class, userConfigs.getTimezoneOffset(), userId);
+        }
+    }
 
 
 
diff --git a/src/main/java/org/support/project/knowledge/filter/ApiFilter.java b/src/main/java/org/support/project/knowledge/filter/ApiFilter.java
index 542886f6f..5f4b84351 100644
--- a/src/main/java/org/support/project/knowledge/filter/ApiFilter.java
+++ b/src/main/java/org/support/project/knowledge/filter/ApiFilter.java
@@ -18,12 +18,12 @@
 import org.support.project.di.Container;
 import org.support.project.knowledge.dao.TokensDao;
 import org.support.project.knowledge.entity.TokensEntity;
+import org.support.project.knowledge.logic.KnowledgeAuthenticationLogic;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.common.HttpStatus;
 import org.support.project.web.dao.UsersDao;
 import org.support.project.web.entity.UsersEntity;
 import org.support.project.web.logic.AuthenticationLogic;
-import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
 import org.support.project.web.wrapper.HttpServletRequestWrapper;
 
 public class ApiFilter implements Filter {
@@ -54,7 +54,7 @@ public void destroy() {
     @Override
     public void doFilter(ServletRequest servletrequest, ServletResponse servletresponse, FilterChain filterchain)
             throws IOException, ServletException {
-        AuthenticationLogic<LoginedUser> authenticationLogic = (AuthenticationLogic) Container.getComp(DefaultAuthenticationLogicImpl.class);
+        AuthenticationLogic<LoginedUser> authenticationLogic = (AuthenticationLogic) Container.getComp(KnowledgeAuthenticationLogic.class);
         HttpServletRequest req_origin = (HttpServletRequest) servletrequest;
         HttpServletRequestWrapper req = new HttpServletRequestWrapper((HttpServletRequest) req_origin, authenticationLogic);
         HttpServletResponse res = (HttpServletResponse) servletresponse;
@@ -104,7 +104,7 @@ public void doFilter(ServletRequest servletrequest, ServletResponse servletrespo
             return;
         }
         // 毎回セッションを生成して登録する（毎回なので少し重いかも）
-        authenticationLogic.setSession(user.getUserKey(), req);
+        authenticationLogic.setSession(user.getUserKey(), req, res);
         
         // APIの実際の処理を実施
         filterchain.doFilter(req, res);
diff --git a/src/main/java/org/support/project/knowledge/listener/CloseAbleAuthenticationFilter.java b/src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java
similarity index 80%
rename from src/main/java/org/support/project/knowledge/listener/CloseAbleAuthenticationFilter.java
rename to src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java
index 3db92d97a..93eea4d81 100644
--- a/src/main/java/org/support/project/knowledge/listener/CloseAbleAuthenticationFilter.java
+++ b/src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package org.support.project.knowledge.listener;
+package org.support.project.knowledge.filter;
 
 import java.io.IOException;
 import java.util.regex.Matcher;
@@ -16,14 +16,17 @@
 import org.support.project.di.Container;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.SystemConfig;
+import org.support.project.knowledge.config.UserConfig;
+import org.support.project.knowledge.logic.AccountLogic;
+import org.support.project.knowledge.logic.KnowledgeAuthenticationLogic;
 import org.support.project.knowledge.logic.SystemConfigLogic;
+import org.support.project.knowledge.vo.UserConfigs;
 import org.support.project.web.common.HttpStatus;
 import org.support.project.web.common.HttpUtil;
 import org.support.project.web.dao.SystemConfigsDao;
 import org.support.project.web.entity.SystemConfigsEntity;
 import org.support.project.web.filter.AuthenticationFilter;
 import org.support.project.web.logic.AuthenticationLogic;
-import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
 
 public class CloseAbleAuthenticationFilter extends AuthenticationFilter {
 
@@ -62,9 +65,22 @@ public void doFilter(ServletRequest servletrequest, ServletResponse servletrespo
         if (SystemConfigLogic.get().isClose()) {
             HttpServletRequest req = (HttpServletRequest) servletrequest;
             HttpServletResponse res = (HttpServletResponse) servletresponse;
+            
+            // ブラウザから必ず送られてくるCookie値でユーザ設定情報を作成
+            UserConfigs userConfig = new UserConfigs();
+            String timezone = HttpUtil.getCookie(req, AccountLogic.get().getCookieKeyTimezone());
+            if (StringUtils.isNotEmpty(timezone)) {
+                userConfig.setTimezone(timezone);
+            }
+            String offset = HttpUtil.getCookie(req, AccountLogic.get().getCookieKeyTimezoneOffset());
+            if (StringUtils.isInteger(offset)) {
+                userConfig.setTimezoneOffset(Integer.parseInt(offset));
+            }
+            req.setAttribute(UserConfig.REQUEST_USER_CONFIG_KEY, userConfig);
+            
             try {
                 if (!isLogin(req)) {
-                    AuthenticationLogic logic = Container.getComp(DefaultAuthenticationLogicImpl.class);
+                    AuthenticationLogic logic = Container.getComp(KnowledgeAuthenticationLogic.class);
                     logic.cookieLogin(req, res);
                 }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/AccountLogic.java b/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
index 1be5ac7d8..541f893b5 100644
--- a/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
@@ -40,10 +40,50 @@
 public class AccountLogic {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(AccountLogic.class);
-
     public static AccountLogic get() {
         return Container.getComp(AccountLogic.class);
     }
+    
+    private String cookieKeyTimezone = "";
+    private String cookieKeyTimezoneOffset = "";
+    private String cookieKeyThema = "";
+    private String cookieKeyHighlight = "";
+    /**
+     * @return the cookie_key_timezone
+     */
+    public String getCookieKeyTimezone() {
+        if (StringUtils.isEmpty(cookieKeyTimezone)) {
+            cookieKeyTimezone = AppConfig.get().getSystemName() + "_" + UserConfig.TIMEZONE;
+        }
+        return cookieKeyTimezone;
+    }
+    /**
+     * @return the cookie_key_timezone_offset
+     */
+    public String getCookieKeyTimezoneOffset() {
+        if (StringUtils.isEmpty(cookieKeyTimezoneOffset)) {
+            cookieKeyTimezoneOffset = AppConfig.get().getSystemName() + "_" + UserConfig.TIME_ZONE_OFFSET;
+        }
+        return cookieKeyTimezoneOffset;
+    }
+    /**
+     * @return the cookie_key_thema
+     */
+    public String getCookieKeyThema() {
+        if (StringUtils.isEmpty(cookieKeyThema)) {
+            cookieKeyThema = AppConfig.get().getSystemName() + "_" + UserConfig.THEMA;
+        }
+        return cookieKeyThema;
+    }
+    /**
+     * @return the cookie_key_highlight
+     */
+    public String getCookieKeyHighlight() {
+        if (StringUtils.isEmpty(cookieKeyHighlight)) {
+            cookieKeyHighlight = AppConfig.get().getSystemName() + "_" + UserConfig.HIGHLIGHT;
+        }
+        return cookieKeyHighlight;
+    }
 
     /**
      * アイコンの保存
@@ -259,4 +299,40 @@ public int getPoint(int user) {
         int now = Integer.parseInt(config.getConfigValue());
         return now;
     }
+    
+    /**
+     * ユーザの設定を取得
+     * @param user ユーザ
+     * @param configKey 設定キー
+     * @return 設定値
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public String getConfig(int user, String configKey) {
+        UserConfigsEntity config = UserConfigsDao.get().selectOnKey(configKey, AppConfig.get().getSystemName(), user);
+        if (config == null) {
+            return "";
+        }
+        return config.getConfigValue();
+    }
+    /**
+     * ユーザの設定を取得
+     * @param user ユーザ
+     * @param configKey 設定キー
+     * @return 設定値
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void setConfig(int user, String configKey, String configValue) {
+        UserConfigsEntity config = UserConfigsDao.get().selectOnKey(configKey, AppConfig.get().getSystemName(), user);
+        if (config == null) {
+            config = new UserConfigsEntity(configKey, AppConfig.get().getSystemName(), user);
+        }
+        config.setConfigValue(configValue);
+        UserConfigsDao.get().save(config);
+    }
+
+
+
+
+
+
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeAuthenticationLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeAuthenticationLogic.java
new file mode 100644
index 000000000..f37e1b1d2
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeAuthenticationLogic.java
@@ -0,0 +1,70 @@
+package org.support.project.knowledge.logic;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.web.exception.AuthenticateException;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+
+@DI(instance = Instance.Singleton)
+public class KnowledgeAuthenticationLogic extends DefaultAuthenticationLogicImpl {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(DefaultAuthenticationLogicImpl.class);
+    
+    
+    @Override
+    public void setSession(String userId, HttpServletRequest request, HttpServletResponse response) throws AuthenticateException {
+        super.setSession(userId, request, response);
+        
+        /* TODO タイムゾーンなどのユーザ設定をDBに保持する。保持されていた場合は、そちらを有効にする。
+         * UIでタイムゾーンを指定可能にする（現状はブラウザで自動判定している）
+        
+        LoginedUser loginedUser = getSession(request);
+        if (loginedUser == null) {
+            return;
+        }
+
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null) {
+            LOG.trace("Cookies");
+            for (Cookie cookie : cookies) {
+                LOG.trace(cookie.getName());
+                LOG.trace(cookie.getValue());
+                if (AccountLogic.get().getCookieKeyTimezone().equals(cookie.getName())) {
+                    String value = AccountLogic.get().getConfig(loginedUser.getUserId(), UserConfig.TIMEZONE);
+                    if (StringUtils.isEmpty(value)) {
+                        AccountLogic.get().setConfig(loginedUser.getUserId(), UserConfig.TIMEZONE, cookie.getValue());
+                    } else {
+                        HttpUtil.setCookie(request, response, AccountLogic.get().getCookieKeyTimezone(), value);
+                    }
+                } else if (AccountLogic.get().getCookieKeyTimezoneOffset().equals(cookie.getName())) {
+                    String value = AccountLogic.get().getConfig(loginedUser.getUserId(), UserConfig.TIME_ZONE_OFFSET);
+                    if (StringUtils.isEmpty(value)) {
+                        AccountLogic.get().setConfig(loginedUser.getUserId(), UserConfig.TIME_ZONE_OFFSET, cookie.getValue());
+                    } else {
+                        HttpUtil.setCookie(request, response, AccountLogic.get().getCookieKeyTimezoneOffset(), value);
+                    }
+                } else if (AccountLogic.get().getCookieKeyThema().equals(cookie.getName())) {
+                    String value = AccountLogic.get().getConfig(loginedUser.getUserId(), UserConfig.THEMA);
+                    if (StringUtils.isEmpty(value)) {
+                        AccountLogic.get().setConfig(loginedUser.getUserId(), UserConfig.THEMA, cookie.getValue());
+                    } else {
+                        HttpUtil.setCookie(request, response, AccountLogic.get().getCookieKeyThema(), value);
+                    }
+                } else if (AccountLogic.get().getCookieKeyHighlight().equals(cookie.getName())) {
+                    String value = AccountLogic.get().getConfig(loginedUser.getUserId(), UserConfig.HIGHLIGHT);
+                    if (StringUtils.isEmpty(value)) {
+                        AccountLogic.get().setConfig(loginedUser.getUserId(), UserConfig.HIGHLIGHT, cookie.getValue());
+                    } else {
+                        HttpUtil.setCookie(request, response, AccountLogic.get().getCookieKeyHighlight(), value);
+                    }
+                }
+            }
+        }
+    */
+    }
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index d5ea5dd0d..46e745b7b 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -10,8 +10,11 @@
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.PointUserHistoriesDao;
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.vo.ContributionPointHistory;
+import org.support.project.knowledge.vo.UserConfigs;
 import org.support.project.web.bean.LoginedUser;
 
 @DI(instance = Instance.Singleton)
@@ -91,4 +94,8 @@ public void processActivity(Activity activity, LoginedUser eventUser, Date event
     public void processActivity(Activity activity, LoginedUser eventUser, Date eventDateTime, CommentsEntity comment) {
         execute(activity, eventUser, eventDateTime, null, comment);
     }
+
+    public List<ContributionPointHistory> getUserPointHistoriesByDate(Integer userId, UserConfigs userConfigs) {
+        return PointUserHistoriesDao.get().selectPointHistoriesByDate(userId, userConfigs);
+    }
 }
diff --git a/src/main/java/org/support/project/knowledge/vo/ContributionPointHistory.java b/src/main/java/org/support/project/knowledge/vo/ContributionPointHistory.java
new file mode 100644
index 000000000..fc9c15a74
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/vo/ContributionPointHistory.java
@@ -0,0 +1,35 @@
+package org.support.project.knowledge.vo;
+
+/**
+ * ContributionPoint の獲得履歴を日付毎に保持するクラス
+ * @author koda
+ */
+public class ContributionPointHistory {
+    private String ymd;
+    private int total;
+    /**
+     * @return the ymd
+     */
+    public String getYmd() {
+        return ymd;
+    }
+    /**
+     * @param ymd the ymd to set
+     */
+    public void setYmd(String ymd) {
+        this.ymd = ymd;
+    }
+    /**
+     * @return the total
+     */
+    public int getTotal() {
+        return total;
+    }
+    /**
+     * @param total the total to set
+     */
+    public void setTotal(int total) {
+        this.total = total;
+    }
+    
+}
diff --git a/src/main/java/org/support/project/knowledge/vo/UserConfigs.java b/src/main/java/org/support/project/knowledge/vo/UserConfigs.java
new file mode 100644
index 000000000..4407c34ba
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/vo/UserConfigs.java
@@ -0,0 +1,67 @@
+package org.support.project.knowledge.vo;
+
+import java.io.Serializable;
+
+public class UserConfigs implements Serializable {
+    /** serialVersion */
+    private static final long serialVersionUID = 1L;
+    /** タイムゾーン */
+    private String timezone = "UTC";
+    /** タイムゾーンオフセット（分） */
+    private int timezoneOffset = 0;
+    /** テーマ */
+    private String thema;
+    /** ハイライター */
+    private int highlight;
+    /**
+     * @return the timezone
+     */
+    public String getTimezone() {
+        return timezone;
+    }
+    /**
+     * @param timezone the timezone to set
+     */
+    public void setTimezone(String timezone) {
+        this.timezone = timezone;
+    }
+    /**
+     * @return the timezoneOffset
+     */
+    public int getTimezoneOffset() {
+        return timezoneOffset;
+    }
+    /**
+     * @param timezoneOffset the timezoneOffset to set
+     */
+    public void setTimezoneOffset(int timezoneOffset) {
+        this.timezoneOffset = timezoneOffset;
+    }
+    /**
+     * @return the thema
+     */
+    public String getThema() {
+        return thema;
+    }
+    /**
+     * @param thema the thema to set
+     */
+    public void setThema(String thema) {
+        this.thema = thema;
+    }
+    /**
+     * @return the highlight
+     */
+    public int getHighlight() {
+        return highlight;
+    }
+    /**
+     * @param highlight the highlight to set
+     */
+    public void setHighlight(int highlight) {
+        this.highlight = highlight;
+    }
+    
+    
+    
+}
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_h2.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_h2.sql
new file mode 100644
index 000000000..c8532631e
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_h2.sql
@@ -0,0 +1,26 @@
+SELECT
+        YMD
+        ,MAX(TOTAL) AS TOTAL
+    FROM
+        (
+            SELECT
+                    TO_CHAR(TIMESTAMPADD(
+                        'MINUTE'
+                        ,?
+                        ,INSERT_DATETIME
+                    ), 'YYYYMMDD') AS YMD
+                    ,TOTAL
+                FROM
+                    POINT_USER_HISTORIES
+                WHERE
+                    USER_ID = ?
+                    AND INSERT_DATETIME > DATEADD(
+                        'DAY'
+                        ,-32
+                        ,NOW()
+                    )
+        ) AS SUBQ
+    GROUP BY
+        YMD
+    ORDER BY
+        YMD;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_postgresql.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_postgresql.sql
new file mode 100644
index 000000000..da8105348
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_postgresql.sql
@@ -0,0 +1,18 @@
+SELECT
+        YMD
+        ,MAX(TOTAL) AS TOTAL
+    FROM
+        (
+            SELECT
+                    TO_CHAR(INSERT_DATETIME + CAST (? AS INTERVAL), 'YYYYMMDD') AS YMD
+                    ,TOTAL
+                FROM
+                    POINT_USER_HISTORIES
+                WHERE
+                    USER_ID = ?
+                    AND INSERT_DATETIME > NOW() + '-32 DAYS'
+        ) AS SUBQ
+    GROUP BY
+        YMD
+    ORDER BY
+        YMD;
diff --git a/src/main/resources/org/support/project/knowledge/database/ddl.sql b/src/main/resources/org/support/project/knowledge/database/ddl.sql
index 2dba85486..cb8533ed4 100644
--- a/src/main/resources/org/support/project/knowledge/database/ddl.sql
+++ b/src/main/resources/org/support/project/knowledge/database/ddl.sql
@@ -16,6 +16,9 @@ create table POINT_USER_HISTORIES (
   , constraint POINT_USER_HISTORIES_PKC primary key (USER_ID,HISTORY_NO)
 ) ;
 
+create index IDX_POINT_USER_HISTORIES_INSERT_DATETIME
+  on POINT_USER_HISTORIES(INSERT_DATETIME);
+
 -- ナレッジのポイント獲得履歴
 drop table if exists POINT_KNOWLEDGE_HISTORIES cascade;
 
@@ -34,6 +37,9 @@ create table POINT_KNOWLEDGE_HISTORIES (
   , constraint POINT_KNOWLEDGE_HISTORIES_PKC primary key (KNOWLEDGE_ID,HISTORY_NO)
 ) ;
 
+create index IDX_POINT_KNOWLEDGE_HISTORIES_INSERT_DATETIME
+  on POINT_KNOWLEDGE_HISTORIES(INSERT_DATETIME);
+
 -- ユーザの称号
 drop table if exists USER_BADGES cascade;
 
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
index e7d784738..4d7e5bdc2 100644
--- a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
@@ -16,6 +16,9 @@ create table POINT_USER_HISTORIES (
   , constraint POINT_USER_HISTORIES_PKC primary key (USER_ID,HISTORY_NO)
 ) ;
 
+create index IDX_POINT_USER_HISTORIES_INSERT_DATETIME
+  on POINT_USER_HISTORIES(INSERT_DATETIME);
+
 -- ナレッジのポイント獲得履歴
 drop table if exists POINT_KNOWLEDGE_HISTORIES cascade;
 
@@ -34,6 +37,9 @@ create table POINT_KNOWLEDGE_HISTORIES (
   , constraint POINT_KNOWLEDGE_HISTORIES_PKC primary key (KNOWLEDGE_ID,HISTORY_NO)
 ) ;
 
+create index IDX_POINT_KNOWLEDGE_HISTORIES_INSERT_DATETIME
+  on POINT_KNOWLEDGE_HISTORIES(INSERT_DATETIME);
+
 -- ユーザの称号
 drop table if exists USER_BADGES cascade;
 
@@ -88,6 +94,7 @@ create table BADGES (
   , constraint BADGES_PKC primary key (NO)
 ) ;
 
+
 comment on table POINT_USER_HISTORIES is 'ユーザのポイント獲得履歴';
 comment on column POINT_USER_HISTORIES.USER_ID is 'ユーザID';
 comment on column POINT_USER_HISTORIES.HISTORY_NO is '履歴番号';
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 2b095dd62..8dd10c6fe 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -56,7 +56,7 @@
 
     <filter>
         <filter-name>AuthenticationFilter</filter-name>
-        <filter-class>org.support.project.knowledge.listener.CloseAbleAuthenticationFilter</filter-class>
+        <filter-class>org.support.project.knowledge.filter.CloseAbleAuthenticationFilter</filter-class>
         <init-param>
             <param-name>ignore-regular-expression</param-name>
             <param-value>^/index|^/open|^/api|^/template|^/bower|^/images|^/css|^/js|^/favicon.ico|^/lang|css$|js$|jpg$|jpeg$|gif$|png$|ico$|html$</param-value>
@@ -83,7 +83,7 @@
         </init-param>
         <init-param>
             <param-name>auth-class-name</param-name>
-            <param-value>org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl</param-value>
+            <param-value>org.support.project.knowledge.logic.KnowledgeAuthenticationLogic</param-value>
         </init-param>
         <init-param>
             <param-name>cookie-max-age</param-name>

From 8758cf092fdb830ca6267c4d8e9d8860449d4638 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 7 Sep 2017 20:14:39 +0900
Subject: [PATCH 054/138] #840 Add graph of contribute point

---
 document/database/A5M2_knowledge.pdf          | Bin 75584 -> 75858 bytes
 document/database/knowledge.a5er              |  42 ++++----
 .../knowledge/dao/PointUserHistoriesDao.java  |  10 ++
 .../gen/GenPointKnowledgeHistoriesDao.java    |   3 +
 .../dao/gen/GenPointUserHistoriesDao.java     |   3 +
 .../deploy/v1_11_0/Migrate_1_11_2.java        |  90 ++++++++++++++----
 .../gen/GenPointKnowledgeHistoriesEntity.java |  39 ++++++++
 .../gen/GenPointUserHistoriesEntity.java      |  39 ++++++++
 .../activity/AbstractActivityProcessor.java   |  17 +++-
 .../vo/ContributionPointHistory.java          |  13 +++
 .../PointKnowledgeHistoriesDao_insert.sql     |   2 +
 .../PointKnowledgeHistoriesDao_raw_insert.sql |   2 +
 .../PointKnowledgeHistoriesDao_update.sql     |   1 +
 .../PointUserHistoriesDao_insert.sql          |   2 +
 .../PointUserHistoriesDao_raw_insert.sql      |   2 +
 .../PointUserHistoriesDao_update.sql          |   1 +
 .../select_point_history_by_date_h2.sql       |   2 +
 ...elect_point_history_by_date_postgresql.sql |   2 +
 .../project/knowledge/database/ddl.sql        |   4 +
 .../deploy/v1_11_0/migrate_v1_11_2.sql        |   4 +
 .../WEB-INF/views/open/account/account.jsp    |   2 +
 src/main/webapp/js/account-page.js            |  73 ++++++++++----
 22 files changed, 291 insertions(+), 62 deletions(-)

diff --git a/document/database/A5M2_knowledge.pdf b/document/database/A5M2_knowledge.pdf
index b87fb4d9a91b8ca300b5d9cfcb0fa3480b24962b..6b165d63912930f7d4c9f57d076cebbc1b60c744 100755
GIT binary patch
delta 52724
zcmV(^K-Is%&IHoX1dzrCH!(9cI5m;X8wNKqGc`Chk?nE<F*mbe0T2OyNYVx=aMeVr
zk|RiApoC{gLLdcp$I^A98!5&CDNCV2iYq`WkP4&?6Bpq@iU-BHjk=NI)lrxcq~w-L
zz8hH*tKKILtfagTBwF1_`C?QU99T)sOWHmz_N}Bz4$^krNYX4UCC6n^(riPe)Qv1n
zNM2?HX`(njk;DRNUieCXO=bjXWm!j`;U1(LRjOhYq+3;LVgjVw;Hx%XdSwm`qbhO)
zS;CBU`)<qu?d$6a-I${@DR(1F2tSD1NSUdiI3r7VFjLi0RbqjerjBa68#8Sk1z%vM
z1FK`<MPbekR>zSNf;lJY96!B`0&~t6QWmQqD@mo+jVx72(rn6qTpX5TR!9|+*I4y-
zV=iGqnwU|TOGa_#mW04u8b%$G1_1LcFmamr0`pu*=pLC7%==241h&+T#b+r_2%8sG
zSz?j2LkzsA%95~=LzL;2g+hfSl~NXp2%n@<%0hWS;!lsU<bqNBap=a9&w(_3H<p4G
z3R$+WvNY`Nkn8Aw#?mrO<Rh`b(ylZ>DDt&dmJyChw;Rid7t*3`ER&>!LAIr_Z0yI-
zWD_XMKA3Sp0;_YdIu4`*X`qDTN^!u-pK6h&7ZYH0_$Y)qWE5EaL5{bH1lF4H;+1Yt
z){3-wkMPnfYa0cUbiA?-96FItl5VUcY)GqhV;xb#N6#yNY^<YVl$RA$)`5-854#)d
z82aLt@L*l&)ff-Ak+NRo7$bL{u{kd}#+0~H%H|3Z%3fXsTZ{qHksQHBRXQgYKD3N2
z%L?&v{Nvay?Wbcnatn52;~k9vO)P^gFX`-9vq)g8SkG9;=|*09NuOMkQw@v`M*%;y
zZe(dg8lxM3qf1GpWoNQT8Pdd=EM#e@<hzljsZ!`hmUPA$yOAZG5yvzb9Uq{OW;e1#
zD&ej$(IGfi2wg$eA=DtrW>B(pRVv*W9hR6MkmEv*S##8@$U^w6;n%f$he#S8ry9tT
zroEB&M%r1^-pFwy$E-Q-)Qv3Za%@=Lu$tBC!HfrgGgh7PBK$@8s^KrHdQsJ?RlQi+
zi=}PSdgPsi2csKaC0u^6S9Fi_L+M7AqDr+JSxPF6Ze%H|bi0uy`0`$?f-G&7VmGpM
zRZ86$9gaJGfK?BxQ>}Vf^{_hCs)tn%t5dCdT<|<PXOc>=>S1-NRoo~*ma0m-8>7Qj
zgCB5z4HU98R6>qkzd)K}klKSR9hHz{i1wX=1gim7ms$<*72s>BuYgNzK$EYc608PT
zU1~MJYS{M8g9NJqR+n0hsC`83m)0IPRxnD(LPDV<3ca<^5mqCtZnYZG01*wawE-du
z9Z~45g^q9^;eM<82&)lRw_1&`8ew&-)dZ`530AjSO{i)@Rkv0ZmuoQc6<sB`$A{M)
zb)VoX!Pik=358B5^wB~m_)73~)K`M91YgH|VYL%h`{-)p;t8^}RDyeg`=jo0=?9}b
z+5m*A5~_N&su{5|V)2>!|L?y1B9otYKYq<UuJ7;f=j8*x0r4A8e%n32od13%zP-K+
z$y<;7@8MrAVtC$@>jpXjHj^d?E`J&ZHH!sBEdzrBg2@Pk3@j`R2S{)>LNCa@!~qt<
zN`UTa08<iha~t3?#JdUsV4=%`JxoafOc3`wFes6xuK}b_0UW|mPk?=<fH2qr7z2!O
zF`|NrcmRtYCcLVU0Y-|Xs!pVM!0sd#^zgxDMFWPU18yxy#)0%T;BYGOfo6~DctZME
zP}v*|*aC~_oJ14Afjf(V9R~6OBP@uS7!+`Mnf&Af1p-Kkg#65aJHMj@a|1jcal0EP
zLwpt*1*2fNfddR0A3|AG?*Q{dLIeB4_<Tb<-)lMP7qOJXLjnK*FX$6}lQ;-D1T`=?
zIFoe<G=EDg0}CqzLWpHR%fgD~w1j5S3U-AMMg}B-4$FJz@s@oLkOK*U;Oy=>@0@<$
zy%AYm-O|24UUWxfWOP>6HQ)F9exJFwDVm}vnR+wDQr1JSd%i&Z74?_!<mcf0=#8fz
zea$D1f8`2A(Q6dNJn`tO-*AH>2Y*0O@BZpzkAGZ$_<#J*b9IV&%OAnR(PQv{`s+(y
zqbT;*;C=bA*F67v@^N~yOVQhJfAv!jU5|eL#|jkn>($p>fBn<f-pnT8^IwIBg{Pl=
z<moRyJNP!d{~r9%0~AgD|2q)n!qufbxcXE8*MNfGLRpjzSDSL+s!=*z4a$V8NJ(TA
zlz+qPk#D$li+raFKM~&_z22l+#lrT@!UH!7H>vZNi#J!(H|gtF9@%Q&q+6e&nC)=q
zf!+2^2JYGI`Swi~Zlw4j2lq05$iodEKNR3zzz;>ZQR9aa+-vxu3^zgiP=WgdeyGBY
z8$Z<G-op=dxJkti4Y*I^hbG(@@k0ylO@I8*h8sJ6=)k>$AEMSx+P8=8n{JD?ey4rY
zYf<>cZ_x!iEI2#i&V|bh>Ef04&7eiy{V35Y?BF4}S-1}0nT*~&8of)k3O5roHw*AP
z(r}xc`P8ld2KSj(fm)y!+BdVUV*6&U^>I40z4dV>3l}yA7cLJMz5o}Y2p6#g7k?>)
zi(H0_Qh|$Fg^N~$i(ZF|(SVEDgo`x;7rO-)rwtd>fs5OPi#H1we-17|4=#y5T#^I0
zq=s-wkG5eJ^U#zrZpu7v$^vf6B5ukOZps8VWf?bR1vh0CH)RbsWgRzV12<(8H)RVq
zWg9nT2RG#yZptoh%5mJ3J=~Oi+-Z~(xG5)bQ%>QgoW@N#z)d*=O`(WB{Kc)mz&E#q
zTYp2{x?4leT*pr?IrKNFlac0;D`*=xmE-+SQEO)|!__`>`BU_*cig1jpC+&L`>&*L
zQt!C3|0$X}cljoLlm4+QpBN6PnNReSjSCtKsT`H1GTY(y16!Y_ld}si0-rdO<O^Sa
z|Bd=BKva>+-^|U>YYM}&JO^(%zDcbq6vuJ`Ez%s_9DDs?t?z}ypZ?fqKJzOd`Vjg|
zG;1z(nfeCxBz%XCzkzy%hA(DV_<T70#@C+oeRzv*{R8!F>NhDKkSv8i^@^a08YALg
zA<B}h%9_l<kNAODt%<{M2*1bsiFVe1$~F>L|NO>VlUXO5dh<=+zlnb*{H9yqq5gsT
z0$^f^s#Ei%<p$3Rtcfg?M+GF{)*HSVn5j%UQ!tCBKsVQPQIK-kJmV)5DLQC2N1`u6
zD+RGO8V9}@4EyjN|7tf3YyI938WNBuozWD@RaI+7_c-xhB#DiNmE+Ug)q-t*xQ6wM
zNk;g<i<as%)+CN;Ezo=)y=WoswW#f-^elolGn97g+tfc&e+-h>p_WOD9Y$aUORxo3
z@PtCXn3r&?9hp{WT{To&bySb`X$e}cl!_tk2Yw=IcK@)Y_zdxY4Z~?S#M?a*M7aDY
zpNAID&24YHdwUhdu(ND}6IWb+QMIa~C&HL;EdQ(CnC9nD51l!KdTGn5%nBU+2QTWn
z)7s=1wiwVXOA-5{KtKK-`eA@=N<nW*pe0ReCF&8LNYiy(WchC3rYzE<6rPp9PT1*8
zE|V{m3YD-LHfqh9MmImHYX<E%$8mGx`3Rt6MAo2lV-SWKKH>csPNgb92As%Cs_cr|
zZ(O<Znzy)DT;Z8#o_Y7nF9**&b6<Ny;FxSc3qSXgVN|oTCuHpbghGUdXpAU<Qg8h&
z%)?iqlYb6M0b!HM4lW4iJ-?Qxg%7`y4;T<%p!t`OOhLb;Ti>F-M}3)-C=bvVkGwrl
z_Q}7@iX3gT1wt`lY`;zYcj{}C4-mHoBR;^!2VaxS5IX~o`XZAG5o`gtlXnpw1*5)C
z{b!S!5mx~NlkyQn0V9()5-bCzJ`a;-5<oAe^ciD*CAjD-@>P`JTyBf4Wz6G2BjXk~
zUjAgr2<e}9eeNBmnacSQH_<>w{{fTL5^(|IlSdOU9Gm)Q>Pz5%rh!2hiQKL!*eAta
zD;|6xl00<llarGZPXRlV;}cyle*olL%P}rj0Mqm)!BI3nv8tf*CPIAjjdjm2YSuF}
z|DR37y-f3Oe@~1He@lHAlW-Jc0V|W#6e9<7H2((%`dE|x6c>N?r)d7iF@K5p^H+(l
z;!#PeLXD|&5r3gf+T={plugCd8H4eIWRT8h@*1%Sw80o07->aN1z@HwKz})ApKF%n
z$*D@3@nOcnC@^@&p>LRfx=}~tZe!-@-yWNORU|Bq$Zel=|G^eM-1C;pI|J7pAw{-)
z4h8awuWt#GqpE)u6%*I%u8X`ywmkXy_uA;~&sprd8Q~o^`jml?p(tvA5Ex24|0-bJ
zH$lI$(9;HW5ckv;!5>g*jn3M+u$V99D`7p~h<fT!3av<rtdweDt(t4(K(b%KG!<iu
zF7P729^-qiPl(tQD2`y?R6|F@@sxZ6d_R$!vpbav#%O;~28*#2maANLXI*#pz4rN`
zIXGsaHqF=WubZ|nE1B1POtXIO4R64_NCnRMx71f)wz@D|>)@V7o{vF^tjLK;acOn3
z8u@BK4;hC+%>3fQBF03`&<)&f1z?-@Rj}Wr(bL9?u`o`%A&w$Ld6ek@I7XsbJMwen
zQ@<Ku>Fj?nL5@u+OzMns?B~nArt6v}NiHpjvL)JrmI`x8Giy7vu=nN>e12qUNi$)*
zgs`jh&YZ75>0D`gg-g%+Nli6nMRN_Fu?$nS6g}_0*0$Wh0&0UQG@n1P0~5K}56ptS
z{}$MLnaan$FrL!L7p5c{97vwQzVMU*_l4Lsin@PPi#z&%{rgv534U)?cV$KP5(PVx
zPRtoC-z(|)^sjutH@-ZdR$0zXnHewXB|-gs3xSYR1Se(U3w#wc3D3(aRg2Ku@Q{zv
zD1(Zqgs@j*fX4~^6Yv4x5DbwYt9mVFB{fW#KrwLB!YM|M0O<id@aO#SHnGC5KXE^Q
zW6pozl_yUanvqZ1+L-5`+3<V(Y9^oBktXi(3j(_$FkC&0BrT^@JJNj8EGRSc{J3Vg
zEaI08o_>*4CB^kMjZ-9)P+hZLbzLKYWQmm(yCw3>lO@fua$26Qsz|D96vmGP^!dA>
zPcE^{b!whkriPJyXf|dVqrrH9?ZYeMnfZSi%*+*<W!MFFndN|utCUMGE-X!!mH{P4
zHR$EtlM;<cjXao&ok&I_qLq=01M+!Ux1JUpK@JjN{I|-jF~69$CC%03vxewO`n}hg
z=NlHM{(}22Ow9-Ks14kIH;_HoY^5zh=INq~xBx5&0KD}oTUQj60{&oXh;=v_Ny2~Q
zy+jh|gk|;eWn`HyV2OR}@2T%lzfI``Id@`Toz+;=uz+m4wr?a2iHM+;uoIX)b9nk0
z_*p>`B^-ekurh*eq%nsg%6LblB#3Q-2y$!xMcyfKS?-tL9*l!Wg7Nsb{f{D_`^ej6
z^aSb=Y{OXoc`89=zz1K8Fd-dg!fbyCsFo}x2`2aqjy{14<;lLBEM-c$R6eEPc7g2z
zvjsp3@(E%&j%_mxvmgpxCh+kSK^y{lc`=IjY-#Nq|B~ZgkPOLB(|Ltw#D~ESJ>mYV
zVlIi0CQp#Uus%zxd|uH$Tr4h$^1-P{Uvj{a|BCty;m9T+@*Zii&&aII$vA%`ugaE(
z$1&?E1kEs`vs~K+?MY!p0?lRt*LfNXlL9z=7|g*48|k?hk`TucqthEcG(Yb?;NJU|
zxBSFM+}}4coX=foG#1Ru2S0+^pZU|zg1sbM0Riv%GvEq5iD*PpZ77l|;dWG{x)fn7
zooDiDO{-PJsz_P|Jd^e*o+f`$CE#TspJI&s!$XF7heHXo`%~_Q>D$%zz3w$Pmz26K
zIpHSsu@6*}+hjaW6s}!+f6CJgy7ZW=ow4OW4;2gPR%RL8J()8(`o=;uu4&*ne@*>v
zJgxyXj;tK5Fbb#eiUc63`-X4%wvYKtWaaRv^Ptd%XL`2gXt56x#1nrl9=U&bejX3t
zTV964{lfO}tfJm{B=bw3k&Qq9Q~djrAcx<eelPZYD%5H;uN01f(jqVMDxCykl0`X0
z<~0YrmXjEnaWW`FB3zj?#>PUa5EcxYfc9bBia<dG<HN(41twBo`{iH$^q1XVcHaRc
zR55C^%kQ7G+oQM6&wfGt-+ubP$of-?uIs8%L#PJ78D$CA{x0|wUj*#Jtac_stz?i2
z@<AaWs8!b+Iz}x$oyw4~L9JDf<1Kg3A@M1pldT#i0iTo98Yh1?6YSkTP@e@aVG^|)
ziLMxk39$drZi-IRxZRPoTBhYno`j)BcWgxax@Lg=iD+3L`{8%TXTiH1jhjEoA)%ak
z_+cx{2i&8NBG395Vi8-g0{;|{ur0sM>K52u3)=Es>dSzEHR^bTf*9IxvMrm=r7@oZ
zKlha|RZbCu3}};k8zBMTlbstEe@h)LT8QhT6oU|FGvi*qI7l-B<_q?%Z-RgR6+p^n
z>`fYyAsdBUF;^~CN}$=VRI{~g)Lt2AGl?CWj)^0A#cU}{+Dk%_ao9T;;kX&h_f#O^
zJaj9^cQo0aqXU-b&BWGEukP%a<_5R2STWO&-vi=%4I0kpHaM0oJNk8me=2B}L(QW7
z#bK#D&O+m{5Az-H5&sm1cY#`?&PUpn?5FzaTBe4>hs8>%GS}!eh<5otIJ22Tw$SRd
zJH1ptwFp0iTb~3DNc>{pu5dfkY%MKLR#(=DgXZ3eQ-T;w!!`XoJo_Uv6oqwak!$y+
zYjV?e49V210@755`Jl%#e`wP=^)dH85c%tlp5z>^F3u|ShgiX|Wco*Mv^+0qN~&%b
z#w^RJ?1O@5`Y&eky&TOadZ%>64IY-{dsPr=FThX*+~c2N4gqn%SFTVqFdk9F+}9Lc
zu?*WNDWTFDciXe=g)xlAD|5r%kj$x}myA-#mf6;9dlpdplSDB{f9#?k(T$^kjVBgg
z!TMnk91#o}-!Tq9lXeTwkLH$zyy4#Kx{iD*4WRv+Y{nFnLh@brK3$c=tk(Q@AeoYQ
zpL@EH^*4G(Aj>BNW#8bv+yV}LDtQC!<fSlt(RB5sX=Z1WG><w_Y`}qe{~q9#2U@>C
zEkshA$<O3ldEBpse>|~A4o1yty;g4(+J(++ca~&2fQ-?^9mh85PR=`>VDe`CgUOoP
zo$Nn@EL-(UMn169S`v(eD*{1Zl#msO7EEg<W97IMH+iOy9fA3A+Dgh{#`S8BYudJ#
zRX8RUfd8x}gAd?z&YM9!-(aE{ny=tAJekvPQvXDK0od~~f9eEvK%J*9Q?H8<F3gs*
z7b}-491i_z9ldjE_Vn!8*>kgk+<XPo1O~^^ef6Yva_(gB<Zk~&|MZ!IGv~VJyNcRe
zb21mQ7pfO(7uqwOnM>u%WeG?_($Gy1e{k7Z&^r}i{`l_R{@w{39`cW<0Fi^+@!`?<
zc0gzvVvo)ve+0JXPt_-gV!|Z04(EqjT+Nmw<nU$96$HVyaojf$1NEwJIlq5a<wWMf
zz4Ey^sm^Jfpc{UXZ~E&TILS)Fnuwas%uV39_ah&%B%4<R#o#T?8wi4!c<4YB9kU|%
ziEFcEJ2`lBmjmN!X-g`66|E~GYxCNV3AC?ShWC0&e^P`{)wFGsBKgF>0e$)d;5uv6
zg$Tz5Lo^gaHTvVhcwxLaCh^K9!R{Cjv2&A@Q*u?V$&F@b(wz*{p}N>x>a8_hkUTu5
zAa{T(!11xIsny1jNZpy00MWzTK5}|IaTtZPYU9|x4`FNpfPRzRVi>`6oEv9%;kdre
z%4w4pe^Mx;t!c*Nu1fPEjg;1C&rR_oiSZ4`61jjmjvhleUuGdg4@{nMT-`4(?F2{}
z%iOsT9f<XFZWQbK7WI9wWg-}`Icg=25cpwG4r)O?m@!)>j*8EZ7Df?wajZBimq;f_
zR47qN)ZK>Lvf7q`sRPIs_&AIY?p{O)Bfl+Df49-mNYI_u?l7Ar;?GY-Z_cqLB`BzG
zRFN4-o;Von&y>qn0A9-F%h#4V9kh>Q6|SMGVd7Uypl}rzz25{%s=vY~!3oWvEl|2;
za+hCW!J&D}qo(L5`cWQIhyMQ~^j{+$-7GZ#k8VOe7-0>L3S(cQ8_tFT*21}k!NPE1
ze|}-9H|dcqmVcYLRWr3rvo+J2%@F5eZrmFW7e)(<{iVKuQ&?c@JMAvxH|kCLFc>Qw
z&B5U86j7wxB=5)=VGamb+{bZoy_zyPQ5Rg*<nzel#2|Y=P#x1u-FW2ZE9J5ga5kr7
ziLoC)pX_KX<4JFSO4Y8o1<;DJb43mee^0lOjo|NsiMY8NPR}ZwJxlns4P)|8;0FZ2
z66dJX)T`pCk&HtOrfu1QyxHICAMfw=PxepswTRP7w1nApSSeT9mAT4@88a(ut807A
zK7-`~D252&<9orz`X=Wi$Aw#v6&MpR%FB}#;b=IiPmJqu7<eQeeKcxu=rz|cf6i1R
zfdWN49H=8I_la6rO`jHZ&h?T`x+XP}xu(=e_?me?XNs~Kv~}B-pBM9aS4>+jYjQp?
z^Dqq2D{jMf^jvvK;#}T!>=#s5w*%ExEI*Gpou>;yKd|lK&3qLNBu6~~Lbf7<>ZyyU
zML5ehU<|(koW+ANycmz5ikYCTf4a0s7yXi7@vDBrZ~9S$kwZLEkcu4m5n$grY}01z
zb9EeH1P|OU<cka@i?XBu#;~#PJdEQe(ZFFpP#k+l24gxDk(qn)wQiPPSB}%Ux?Xfo
z{)=4BLaf2%`Enko_j9?=Jt9sTL2oa;mAA9~$L8lR%ShRW&aKM6G(ZEIfA63uKk+T#
z<6nlR_Nh&3H$n~Er<z~)XZ)7GI9M9sSaRga)|-uHui0-7mNu7gTn_h-#1o-Y3-gPN
z4?T*C5=PUYkU-`!;v)Zx>5cj{p2|%8;MWbcLOUo>0<KnP!TGQSUl3kMa#<TO2ItY7
zSj=QdZ<j(nGlaXza*r0&f1226N{%S;TtH7&IF`%Gj(W=Wxm6J+R_dc!nr|Zc^nB=~
zdiRrTT%5zewE$nCLK2&Nl#E4=O>=26Eu~eY5hSh+>%;c2GsMirAXbGFcmZP<j#2tX
zVBl;M&gqoki!hIwpIw+;gRjI^#bRi-TB$L9u}}ijf?b*52Y}Q6f8pTz0|PeImWbB<
zqQ#v(dub7n6sOO&>tSfQ?}lOGSTQ6*k<BLgoaH>OTZ&;a+yY92Ls_Ev47{Y#8Wwy}
zk&(Pa;<soh+uFXhY@51nM0sr!#^?LgSAn&TsU?t>=@^wf%BOOze5>55wCb%!YksmY
z0VJ5LFK#SuO^!`Se;&fYnb=giQmfXwwb|M@jrpCiu(7zYva`CgHNQQN;T5^a1B*jK
z@Nf&7z)nFHB<ZdUER2Kr|2Z^K^!|1z>Rq{x#w-1TxGmAF%X8?Q4FmHCYvEy%rn-~k
zL+htEF1j1;<L<`Bzvn>k7?m?6(d1pr*`xXY6AY24D6YJSe>yZ@M*|fZd)8hib4<}*
zJIP{uWX8C`QF-t#JHQDarXHv6ix}a_gKG!(96Wr$Vbi0~83tFvWN?hlpBc0Uy+MDl
zJXjf=J9GZb^)nBi!36-Nd+)iA_9>2L8II2jK#SY0&fIJdgy_Qgix1p?U5<h_*fbwS
z*(0fJFRV`Ae*`2Tb{L^OQX6oDVaG!`bt<L--AJuJ&z4vt^sTI3(1TfJVA~83!kpj<
zGRtq-4@s6JI-J;3B|gjXhNURgmcSxT6c$V#ltotMR7<RRs;a{$`%N_fR%TlnJ@0k~
zp=xP@b#^>XyHyuV4N4)`^NU4O(p&31$2bluDza|Ne;oZ2yzIzwQU=x3WuBuo%QZLw
zxKm1SIEUvxPV+OCuGxx{K(1w3f#rY!*VTwOeuw&d;Oq%18|ArQk#$9n+$<dD1d=MH
zq_jk0-#jOPtCh^AGU@Cz_Dzh~ROI5(BXe+OC=Z*VHv0gO^Xpxy6fVmB*{pa<2w5v(
zma9Efe`SOm>NfIbLT_x9OVudH_bnnbF0~BWb^dl#5$7hs%6fUP;MKf(6jdw{Us16Y
zjKPIcu~e>Bs-0@L+AH--que-$^Ljc>F(lI+<8lD_8WGlMtr&oAczbfO4vmj=>aYff
z^evkD#~R+qWaQP;IXBzOxfU`rsM+rCsCzhjf8WxL!d$CmBmoXvA_B9^`NQWp+Z8x%
z2K~s7RF|@ol<BxR;NRt_KB)}1GJL|29@D{V5HQw6cIm6s9(9U3OI@U{Qtyg%2Tw?@
zlrLd#D#Prv`^(+q`+NH*yQjJb-80<_-HYAJ-78(4)MbfTDXW`?na*aicosVpjbvBG
ze-%wVx=-UMKUTDz!Lh*}y?^@D=`-igo<B!lq_4EDwtP@K3kOMjP1Wbe3)@>eY!rGT
zSxy+2I72r4A=$IrN_X2)AOXO@KTM4PE5b#T@Kf>Y^N0ruQmAvZ<1>!Hx_Kv?%p*lE
z1R7Qy{=sYz6gzfW&U$K9WhEys7o1Mcf3C&Hn=DteQR&G5$yfCCh7m5Tq8iN?O{W67
zVTqP&UAA-yN9zpElpV>kE^oQ6Wrqk^E|$UGt^W=Z_$fdz9D|*St3N<la8;PZ%B;rf
ztQ4t;CTcRHFuG)56$xU0hhQ$8$AgaqPvJxU?0+&IT39$(UdEaDTi>R>PJNEDe?ZC;
zalPQR$kI|Ou649jCyTOvHpr&!jGd=TbeXQu#M0)lrB#Y*5y#$wOd^xCb9O!~gcbM_
zgXC{T*)%N12atq0V<KvG=$w%94ly>g9tjCYA=+X1j_Y=k_1Oh>OIf}YWo{o{z{lr4
zXCrnr%=p$w>!F#q+5h%~r|U~Kf5NYWm@n|a42RSL^>{Q|QeCcVb-kV_BnvoxMd}7|
zP{(yVr*905u`zFuy1^z1&;>?dkDO65ol28LK6cmCmf96&g@HHp=6ef0_b_M&G@I}%
zqKUzjIZT6e-v63G)QHnD4BrNzraLw6{Q3LslD)M&GXqN7@9&g>LVDbff0W=T%9`xz
z2DgM#_e;*FCWkB`g*Gho+WwmtBcChM(JuivPLit64%Gv%>(!B-DvZjcOBtf4DaxWP
zoP5aD^0h{xS(qtw3SFybX}I`}2R*?YvP{o0bLyNnmuY9)xpuK#YFAR#R4w1k&(vFW
z?7rGKUjn?D_BocP<MjN|e?o-5C&VTX_xI5Giqk5D14It&r&^W=W`EB9SC5FPid^^X
zOHY&vA6&cfH;d0d|2*@|GqqM=rYc#XY5811Tv~J)SNBZYepK7r)2xfSp4Io<UEMQW
z3FDOw_Wpa+9{}a6Q8QE**z`kW912DrM;lPmP2!kxHCanG(=+LIf4Y;NP0l4vQdf=Z
zl5lkfW&kOpWwr>Ja%xW9nQ=OmF1TU6iiVv}QXdN!>_cEUzcU_oScVbxdPr<i4Hs2n
zcLM%JghBew>2`8WTtd3;fa1~v_xL0K+x>g)m{v;%zdm$FaJa*SnDjJHF;!bsu!X+i
zA>=)-xyTj&WdO$tf4<<jmrgk0p8#?+Vl7yvo+3T(Ff;57r;4hiX4RZpR7+|FK&zoP
zDICd~qXsj>nUOx$C;GDP<8c^KO_s1}tSn9$l@H?+Zl2U>RE?U^>391*dPt9jd1295
zHd1C(i+&{9hYj0Q_K)yt%mI%SGJxo0nf`F+xy_v&T(nm#e{LT?{;IFP>iF?v#~yiP
z>%;DIuKOG_H&<4a_gW6kYiTQ^S(;^O<j>Q`c|NZwKdS;)(Wtma=iAhG!DdC3#HS)O
zNLWcLlgg$-Tn%hh;~Hq3O~y!ykt|tCm5ShPSIwG9e8j*{kfaS&puy7y*1<;H?hdMU
zX8{gK0rY8^e*xIFH+NYk#fkjuU*!0Qtblj9OKu{qox61Dkpa>YU<gvkklz7(KRtXh
z2}<w#$aN{1#4x`>{V`~E;;@n%>+~M=mKfPALpJ4vmA6V(81-c>RU0;kGvE+)!690z
zPwK1nwfgpOXQ&YiEEVNqzEY@!W*HaVzk)lAl|5B!f7jbHl~$$OpY0D|>gJ6FW71#l
zV=)K9hHDKN9NL8L6G@*IKt?EjJ0}{Ia7=?LV*DBhSne*aCRaPaflJH#c*x8et$oX5
zOzwWoG9C4F2*<0Va^Pk%^UgvlWhrtUP8MZUo=$mZh6Ov_e(UD}6c}*#bnT()1GT<4
zkA_akf4XYHUksJ_q-av3^nDo5e4OhtaIR2ebjD+RCW?7ut17b!iz|^bZq~&<5qzyl
zWB&&W0me9>-?t0<56QzJJ^$u%snKw2wd}gOmA!O7$npbMO6zuYX%&q|XmzdXRgOh2
z-Ey6p^33m3e@X>_QuA@<L7_BBleIvLR(fDee>O#+(J*C$#C(D=qZ%;+ywJ4aU^E`h
zbBD#UcQlCj3*#TGQ;B^MlfhW^T(z%F%4aS@b1xs1mZbTLyT}`?kn}36;(lqqrSxWW
z)y?Ql&jVqmRm(AJ72CHeC`I!wDw%;@-}*1S0pe^RIw2+Vva1BTm9lKND{wRjEAd=;
zf08r%d+PJR@{6Q;s!cr**UxFJhARqiwlUBWT0tvnWv!xBrH0g$+EP?MN6~Da%d2@U
zZ_*Z>rE_61EQvU4UK5+)Oh|Y(;fXLXxTtDM61|ua{eTyRA(_B(3{&W#zWcJ<yM9k~
zQC`iunH6<C-|2%<?!mE)eEEr2i9V`We?g+Sv0g>KRXcFqy61U_#D4Mmm+w=*Pa&#B
zZ2@0?ZCq8w;@UvOZttGj#ZgZmrvS61f>-pqgWjk=S|4qU6r!cmK{&R(yG_<FWb?Uv
zEnm-f^RxMd{9+#G95T>H=pHbT&5f;-Cr<Hx^loW!5(TktvyQ1W+~GJL(h|&Ee}0(A
z;7<~|f;IfTAQ%e^=YOXJuO-d0rKFNJizT3V=`^@{ETC!@-hfDC<%9|L;@K~M+OzB}
z0BT%3*roZ#HMLUIJ;zB~KFwQ}#3>GKC#--52~O%r_v>Xxe<OOsOwr8c!IoKI%l;nt
zT$-!{iDJlWQ7u%HGO=OO1w$aoe}lje(k5QG(v)Z9j?fkQ!ax|y^D;>t0R424SF6@>
z>R{?+*ZPOqmTBqh5!YN016;TZXCEA}F`QexFAKG%K);VJSC~qTW>AUANHqP6O)G%;
z;@|%>PU13K=SqBoUjb{&H0iqHak(aHivw_~R2K=t>+*Q%jw0c>d9gSyf0xUsNKq2_
zzF!BK`9o48(gKXf$<-6!X%VD)Wqs?!7DE8)Xbsr0<GaU6dF=k)2~x3gSPZtaeT+Y3
zrPXQuJP!T+U_lrLg<6zeI#R$M`If;QMYQ<ee?_-##SiIZmRXr7j2xsG{-A5rl{R=R
zvua)MFRp4f0D^0Mz_onS9eT=EEcm@n2(FN4Pe6Jslh?Q_o@oLLLsF2F{*99?Ff{_+
z){|o}aRFMB)i5LszC0W+udnCbWA4X0lLav!3`6bq<Lz!PXBa>8lanwpL;*&Vbum5+
zNJAm2U>w|;jm8VslfN;h15y73lV~zE1@&iKjE|F|GB$rOuJC@SR$^H(Os8`PxpZ3c
z&dkqm{Oc2=QQ3acuD~$@>@3#|S>gk6jD~mxVUHGbS(HccH><zt1-X+uRVWm!TpTO^
zE9$c(%8?-+!ToWRL&Lcvg;#l33+M!$rZaRNm`4cA!-&=_`M|P#-uF@fuxdulrV6Q|
zT2{d~cm;oB1r~n`oM7a*B##8Jz(hH>aCkR6o-&Ofe*Mb2J7Ka``afD3KFR&WWHNEr
z*Vk80oEYRmgWvoa;I)reD)ZC7QEh`o;-sIYOkfxRSV!#P-Wziaj^?H)hdD;d@@&t|
z2l+%knJ+peC-ll*-D`M}H-L*HGu3Prhbjr&*$ICq;U>I9GMCB~tfJM(HFKb(<LNTM
zcyS<h^9jX|U#F9a{n@YJ6@D+{^?tkg(*RPBJvRHy?2W&CLtcL`&3{zWe~sqfS%qmS
z%x1Iux!1fVhwjT}NxxL!g*blEKJ;9-sfQyhn)WFbro#@`<$7G78-)wuVz?A;gqtB@
zhKhgX*iOr7J0x-spxNuL%&zo1gU+Zk?kufLRxsXJnyPPYZi745rg3m;TF7#=PUkSJ
z-XBhjg}pv`!F3ujQq-mc5Oby98i}stKI<y3+OM7+$$~9QM*WQN>;l-yP2@SeWKB+I
z=jP^Iz>+tnb8aF7{-7Y-tLXO%0y0ZT7e#+b7mAF<C^paXVW{x5ht9ih*>%aKtY%83
zlpf`Ov|HaJ@vb@<v1MvKuFzC)esHC?+KbjRp@!SQD{02F^RuL`w6oG(S?#U$IJ5al
zAPac)Ph2%|q;}$VjcF9hh_b^Zz!8K2cIKir7J#UDFy1SuS(_E}a%gc<=oh4N_Dp}K
zqLzHaGHuh;m$o@ukipZ_g2ld6>bvU3AFavgnR|a*)p9z|q-A_fAUV)8hL$$LcBwJ~
z90Wm9IeOJfC(r}gtIN3La=DEKhNF6*(_f-~H;#=Wsvkw@52K?%38wXfN>rN)$SDho
zfFq=FZR%k*DxOq)e#w2t{gC?%K5T!@`t!wFZK+;gZMCqkhHDhR4nAa&_$|>oN0+f#
zyJ+Kjzk0P%ZI;?4IYJKL2%JGejW{z+S6bCpvoup8Yg_Qh<6>>!3*h!>B>T=-wR_uV
z8;)Zk#rS9sblEa<nk&ehxLWP?7%yvNbhT~_UUr-AO0#(xH5|iC&Iv55ffRorT{jCT
zG{TgVT)y~83;iZ~iNsCaTmJ}n@>?KL7*F!lEa9A*qdO$`;*c^O(=aj9cD=xp*uxS_
z6qQ&;ExcWH0xidj!lz{NQ*LM%gQSfsq#ykA`!4^?f6REUq}s(x#Ux5sulU@3zJKFo
z-+!OmP<f`Dq6nX};yQF(Lz90#jN@UO7DaY*p5Yr|uiUFNs*O6XUn_QtvyHjNAV17U
z5o(MGc#RE-T4nMXTuf5WG%|P{3pQX*sS|c^f!kc6R~QyX1?*TU!0Kopup#POL@FZg
zCb~yESvz9Mu<sbe=Bpp2Ir|qmF;P%+$)ED2bi-^~4rg$W{MSdG`|5x8_>-fp7xMXW
z7(QOQkbmf-A9Z=!b&!$B@V;0y>p*O)2>k*=<1z4R9NY_fq&~omb5bK}0=^}wD*8AQ
zW&rs+I&bhkAMm42RG&}H&@-IJdpN{HB7FT`pVVtY&m0>ig5+>8;(Q>o@NTv{M?^5n
zq}-ij9NzXI?#!i3*ZF@Cl$fS7e<dL~TG~dMrnv@E^J=B$IKm{UaI&dqp*<Y@^x3ZA
zfp&~QGA;cEJk*dV{iF#)AlR-Z-MEo=z0wRSfNQ`@j>NM}sJmnEoh%dmw1GIUmzJ_~
zepxNfiX21ihYa=u*IYHo`uQ`|1?md*!KgwcDW=4%m=jB4NaBA4d*Vs)lz2we_~ysw
zoS8MhuwUGtX||e!=CFBIzo1{%ujs@VS5BQced6qib0;_;v9qKO`oKImtk$y9R_-8w
zP&f#svV=z%dlP%wzIIW&q6L`V)@zM+s{`W;>dX1?N*_(2-_2xWPBgs{4)=@rfmw)W
zDPD=xCz%tFyvKi!g&He4-u!&0)9bB%aI@D7g3jWipKRNzZRC|=$<&1zm<&l%^Lf|M
z6z!fY9CP^c8CEj|hGQ+uJZ)J%`Fq;542J&0M^b@PZCE9iwgm-$h^bmhMNgP&)zNI*
z?m7-eViL>xW6;?4A^$v1y){}7oV9ayXjko;y|J^oBa(kighp#PH8I<n>kNCN-onb_
z%4B|dKH?`h?1i&5p;LAu(>3T1MswpiJQ)sNXt%h$v^<$#onKo&zK(U*2O^fo>DLf1
z&c)F&yo?eDEQd!UwADMt@CPM5Af&Vw7g~x#vdKm4fV}E$n!_91bx%=L;L$QjgsWRh
zUMiI=lbe4_NQ?GnuUOO<7wvnVUjQDo;XZz!j<~I>f5<UR83mT+tLDQGq>*0(@1LO^
zPBcCtjXIjY?Uo0Fbt_Hto;9sw{Wj?PpMrhEs|%t!kJAy?i@UzOw!AryHU1S9+%;US
zpTe09oVseHo9S+PHa$OCnyf9XFW^|N9gR+<Tm^q|2iJ=a;*z=BBXP%?gxleQ@!|dS
zAE$fHfJrhY-GCD_`(inGI8pe3=NqZx2?I1;T&W0x#|x@vzx7mC;yqrnW!sQkPQ3E!
zH-Er=wR_&~aU5MhzN{O%trXRSW6yd`P<6vnO~Ek|=Gano$u=#;&%ooK3q$LaYLM|!
zNKAhhua%4BZ58x>Dbjho+sR-uoGgx(MtHxB?X{h?<7<0sq$<oGE{&Gv2djgPwavAi
z-DA54yJvO*9ml?i!(D*%*q6sE<p>2jEN;GY-GAiH2RL&PIWe`n0^DBM5=C&F=#vSz
zLUUXoiMFFiNJX5axQ3<Kf@Bn{yl9)6D|3I6qjL96+=pGi^JHr<0NEK1*BGvplC!xK
z`_!vhTrVXX;KOACU`1|H4Sa>8lNCmhMI$e-=RE-x#cmfF4?Up%D0YO(G@nC}J(bDc
zFnFvmLgJk;E>YL0`>BVhHxY}E7cJoZFsdE!=q7{Z!P?6D%GSpA#_rDXowI{;gNuJF
zmsYNBT-&&B_WoH1d;bqSc>O^van-qdd-slq^TXvcD`(cvY@FFXvvcO4f3APNf2n`D
zf31H{_x`Sf$#?TOE|kF`N+0l$q)vxXz$qT%n1dcJVVq6_Jn*NL(m!OiGd^p+hbQEA
z#(}t4SgTVmC(yFZ%fR|LDQl)|PHumd7}3^whjrZ|I8A|Ldrv2g;?ws(rfICmnzm-^
zc15vh`7LHkYwD>}$+x~WUuGD-97sRMCzCo$H`Thy(Gx~d1Sc)1%&Q-V8S(=|`O%bC
zo;^Nv9<(gB)PZAg(l8wX8CsSc$2_lyF!zeq+I@v;#@r^_>n25(_JPlX(r$k`NGH;B
zR1aLD5f!bm!mI}8C~-ov<+puOxy25+K@YxTG&`Qfm0LLZPFPH%-kj;Sh;={e<KXPo
zow9l~`iYa5eK8)%KXR|SshpSz4bObl<&_nX%UMk`L>Zy&tFBfxJ7{nfj_c1W`ZYsx
zL`T##lt2lZcWm8~c{;F>Ee?Oo#KrVpKCWH+7Rgf<0o8D2@LIfvUYYh7M=6~4xHBGh
zN8P3IWQ-$kBuihKc0cFm{gP94a1kW-X%<G4(emQjB2EDKt(o?qKV<L#grzdTU2VQj
z@*{`QpWAh>cP8nhEd_3`Mv0}a7ViP{XEvv2QU$S=D&*ySDiGW`qN$U_Ju?mcU;NE_
zeW_NvUEB9PlLS6s0{2*xW<DVY>9;-g)K3+Yjy@z264$6ysTJyC9KA{5JU-s-1e3!)
zMi2|A@g2~EV<ET4>2@LH=m(P-KN~l%xS-JDvQQUk*5g=X$wBMlf>0Om&NYm^fCsm)
zecDT^nk;gO5tzaz>+ach*|x_oS%}RJe!P=wKOcV%^=I*Z4JwtK`p%RCYy|XIa%2Y+
zuLP51BHx+T7!B{!fc<Ar@+G{kGmg~ZMZDuFTOh;o*_ZIqloOn&UT|M>-%u=~(tM@z
za>#?V`cJa<J5int*Xw){S`f`^v{M|eCy^@IYBt&r1lQRmQ#fOfYwD^gl92`Hvm90!
zAGm)^RNZ{IqWd;Q#$YE7j~47MrL;`O<VC|(Tzw{I@qki4`D*pOO*_pcxSuo~tD+0^
zA3v_@ZmJ7+mU$kba|nTV!aYpZO8(zqKfg>Z#&y|_CE8-LlB#4Yxe8t@7u6CFe=}Zr
zS}!yTtxP*Jo0v;rsf*T4damD_>mNp*0B(Oh9IYk_cC_;EhZPSUZldtHmU7Ay6m@|e
z4OkY#k<tqfuJ7(%xBzl;;ll3j^$UW5$Tm>Ow*1t2L!DP`U6F+ZKjWybQAQ5@!5~d;
zkY^#2XDpqf6bg~`8-Eh}-3uhTv>p3ZACCCvN@umR(b{b7w2rj|8E7Y87wUnWkQ;wu
zQ^ciwd*VJgS*Jx(RWw~n+T%{~r=(Nzsl=(|sirU^w8kV#H#eAD7_YY1+MDC8@v)WN
zmHqmO`suxcy#!Ew5<kK5l|^8(7`}WE3mTV|Me7|>$#k_+!+IOwXnz!exNCPPAw1lt
z2iMx-(Es7M;vc{cdkstSkw_3eJ;s0S(UqU73JsBE9hSF-PDNP1$5m}0x4WlhedoF7
zoNBdo#eVdmQ>UKa#)+99d+xdC0+c>~-V-D+!<LimeA3H<?1L+%FR0gzlA#IrXzP})
zD86CL8pe*MC3Sro-~A@_U9#ts7_Yoe$NFhZ{mumVoq`z0m}s68IIK0gW@vvX<)(0r
zi-z?RdWEA!N6u;VXz@MG|N6=Iyyrb12%ZVv{me7}0WVlVW%4&XrJ83^HsXvXSsVEU
z(9q^#K5c{Aq4ud~BW?A{7+ITTvYHNz?hN+iHfMHb$U2@9MZ0u9SxDlzGbt+>FN`Nk
z%S&sk>#Mu;aT?odrM=zR-kg8in#0TQlf^;_7z=|}vgERPcz0}ncklQ<KV4;fWCIam
zziaWDmOwbV!;%=s^)L#IkB$NKo#d9DyN3lRFg>FswERp?$t6sk-4jL01^skN;Du!D
zhP^M}cd&tvQKRvMJSUl_5UcWZIic#FY56LWV7y*GFCo5YcM}!Ik_&$~1?9{WWFU`4
z8ynV!e!_`r(6O)brNeo}do#^Z`w{XwNn*<^nAv2b-E8AbKSACmiD$wLPj?KkfLOV<
zXXAJlSs+!em1i?^8JBJz_B0mk;K=p`<2%C)QA#bmZ~N>$$~GKMspRgt)fbwLM*m$1
z5G1+qrC1^?R4SE*+WCJoe*#_FN9aYGf8D>qJs|t)eF3ZouBq?FG5ZK7u0@giSFWD8
zc7p7&H*M)|;dr!BVTo*AVd#b<AqlU8n=Ar(i#?7@r!Su-q7fb|AKQT+!J=VZxqOvu
zHgoa9CAf_jB7oy?B;h*5S$n+5B`PbNM)eQ<wm9z>MX!$z)7XE%+hRXdQPN_9X}+GJ
z-GK1~rp6{@S8u%_*^V!K*e=;8M8;(}TIv`E674rkCi=yTI$lw!mrhHf;Dh0IIo7P&
z4=7pHmJ{e=5(%3H-BBz0LC%-biP1?>J+qc9Ff>;PZpglBI4=N2aNsOetBB^iqG0i!
z=_~^#<F!vX9?E}`eL}Kv3_2S1M<RUa47!8fY=4$G0c6<gVI2?qOu1Di!%kcayaiJ#
zolWQR#e9D>7>&F0U2L9m9FO-^AZs#ZNA~zyv)*il?QkM5%Z5o7MqyOJizta0jpGw9
zv^+fVkPk_2JGv*?BKVkb>Cyu~vch+m+<QYQTi}0m86SV^J9fETKJzM^__9ML_fb@~
ztW4jsLMwyNF43Wf&Yl#tOm*$rRYlD;oA-wlMaBcm-&f-ODWY81h~U#M^+IH!GqbtX
z{A#DvEsbW^3mc^N_prLgmja25NgZ!*L{tkbCEgSyvzA@UtrgcwYcpQU>#ohNt>!oK
z2n!_VsUCmcA%O@axU$2+i1DN4A56RllIYzI2H-IeV=puaj~J#q;cB{Sk%Ux;j9y(`
z?b*le^~;y_)m}|qUG3}Ib9qsgfD3vl2ldoORaQJ!(1qpw<C=mr`DyfH>cPJ7aSS}A
zO67g%rPHTZq?AyzcN4t;*^Q^oB#ss+extFixvGDsQt`fQ-vo^RlUQ?4O?P}THqFhA
zW7|aiqD7hdma$dbDs64#H}gCBWBI-0eiEnDbh1;4rs^m5PZCxWZ+Ln4wwJ=~eJ`VJ
zFWtj!FY)$P0F<D>B#A$sMl^9{#nl<U*_Y-+vD}sBiwlaabQ1vw)_9(CI1w%H*_xEf
zSb~2a6lT?KmJ1YDl{IE&ReoqRIyspPmn3Q8G~|+u)QspUj_MU;*-bX^l4h1yIoj_l
zlBPN~&uD5ofbTJs2G8&wms0qe<G&9fG>}PMaTJgH8fC}zn6vRt6+YQpSF}W&Jq`IX
zUz6)H!S9q1ilJ81Yq+KaN9M|0g{w;q2`hgbP8!ow8ao{uZ%U*4;D(b-!|nYarnyIg
zZa)j7ppUOT;+}ECmjb&qvMbNCZweg`eeBqoGZV))J?m@WC7^A0UzC6O6Qa6~&N|3-
zr4QxvmvgzteBIXlc)f09o2<jA?Iy^=^Ktf75fxm0hU+@;9tflSIKS9fYD^ldjWvIe
zg~;c`X(H^F<H}%MT8fJXNNH((rLodlX|D`&<J^31DK{A|57&n4LsD7_mW?dHqbxe!
z;w?_N-0nE3Cynxtpm;xIr@Lw`hyy-{k#Hha=TllzQiFWoExgFRXe32+&$GNKs5M<{
z8$PXbRk!T!HKjrIK7gRbYW0`Wifw;6PQoyfthtWPIsWeotU*kEO3<D)5Ql2DnYY*s
zU=jf)^j5qs&WL!MMDz&nd%X)<gxAPC5Y^JWf{U)P6)ffF3-jT8c^+5EU@O1qEqTk^
zE8DA^YnxZRtDY6DKm&`9S1{r{cGERI6BnZs7sxOAWwT=9_0XMqx4za|Z*70ox9gYu
zt3KY(7r{^hyJBKy4DX1M#Ih4FScMTCN8odJ$|2g4<0wF3FsdGX8tG~^-cEFUh*kg0
zzoUc-Mwp#5>h}tGqqtPD*m=1Hzr>ye^c0c;W3y&O>kYPh0+UFI+0>GwvZ9?;<}2?)
zhOHwSC31ngfzEpG(b(iP_h5e)bgQijDwCisi_uHu-6cyvBBBjbV06U>U*HMdwH%Yg
zP4rt|r~W7SXm~I49(6zUNW3O8W!9}as=M{I`StnT`Q!5^&YwJgaQ@8sDABOAJXyx2
zOqcdA@8ft$io}>IUWJr1IW6ZTUW|0^>^Us6Xmw?6V}0}3&Mu4n5WIgXKPn3*3-ROF
zcwG2$7)XyP>y(6%9SkBiawyNl0~{Sz%#dLx10RJ%$@k|O!4{bjZ?imN`Ad~@*#Z`o
zHC;}m6Rx7AdA*w`mow}>!`$>!TG7=UR^!}&=9E%maIm?#b1AzZXAMrekJl}W^OC-R
zGRWtQBEzy<(rGI#ODKPXD|Q*xcT7+7z}MIpZCB*>vbOElCZGm+)6yjH7Z<>3bgknk
z!I<!sbio2bY~tFo1mMZvf-YzTCtHU*0KA9HMvLm>wMAOr%v#yBm+?y35Fo7yG^Ooz
zyg9l@kLWSISX-)jIJ1FkJ+bpRP=@MI8|ns`9vq)Al19eJf<J#1Qe_IS1@1Uq2Zuq&
zmHEn2Wl~Av2?HMtg9}!R$fscMT8e~IJV&aO@ak`DmTOT`7u)Wb$6%bnzT^Avvl1-g
zDwT8f;!7#u&S|Ergj}!Z?zmU;>FcA>=(WAx7yigX+_Sqt>f!HX((;gAe6KV2zQ25L
zBJnE6DcZJ8)-8YGwW)ajs3-=!e0#t1R6E_C&Ga*a%s3-OyRHeWkR9bltx<b4o1RPK
zEzT9X`I}%vW|}Pq?|&DqI{^thtbeP;`(+%BAH>Vs$I}GjY2Pim6WV1HDTWDr9_jQ0
z2P`XQUejmggz0dK9T-(@({P(<>@ZwQFMt03;B<C9%#?pUXT=t|1ozoz@P_+_z?iz{
zc=^*OrC-XTbhI|>+hmWOGT6*Dz{lO&{_M=`WOjLWZI)!MNy!;r*A0ZKjcpAM42&1%
z7nbK%=Ey!6ON$e-w-b;iCW`%t{&XS-hkcJX+KKfp-v8kTH-8A@Z81RY-rdy%H?V;L
zctPG>W(<E`M4ccBdX=74=TcoWY5Ay7y;hu`w{6a3mzP~p))Qt*{qY<!lZ6IK1cj9^
z{7iiXP#!VYZqXNqqQ%|a9g4fVySqD!yA*eKr?^wx-Mu)4;_iRHU+&zQoyp85n@O@c
z@+41Apx%hK9(?Fd6cC?<Ug-t$y^SymAlDndc1Bh5CEdv}%C)6^z0BfiZdVYuEi4YB
z(RXbrXQ-e(t?VeUuk_q0nD+I^wN)tk{mqeoPSOxpNgc3E8GduaA^4SL?Xl@)GnQ#t
zwT{y*wV$G`&RzW@-GL&fM(u3wWJ`a**@NK)q+GO{pck`u04Fdb<w64gM2eri5wd@}
z1X958-t(QBa)^At`n}7P?AB~el5Z{I`_^Jg?a62Y{}gDZO#$afXKnTKHwk~_q)C+V
z0qqyT6<L5aI?e4*dfqp()=y9|CYhHed;@lD>XvIJ*Nzq^?sX51AFFnf&HdkPS9Xoc
zOo~u@#3HMv({mmq)qr^H%S>#CVr5=en}DKWCVZ`FL!9%FTQ_WS4P~!G+iljaN%zY!
z3f|A@(1juJ)|o41YLAOKd}qx>+V;}#lm+3bHwnN$ln-X?s3#69_E3UrxlNqVI-2&(
za{}6a1UqI<D>u2;zt<=~yZ(ewL}Bj=M%vb>MGxtl-u~IWRkN={*(z_Bv&PeDhFYPi
zucxJFu%$Vqtkho_vc>hK%eZKj&Ytiu9$wyGIr;P4?I8?A%rNoUVpkdwI4m$6FyU3w
zvsECjmhT~$u*3TcBS8e`3fZtd`*;ZIBU1zzTHaTc^p{<Q^cLM^Yh9P&#6kJ+2fdk=
zspLfGN;_R=oqN0YSZW22V0v*`ij?XZ*qSn4>EqmYG2gCy*tl|A>O}hS!bvUbWv5^L
zNhOdCC;A%TD<Ji+nzw8_jbx_$l-ywqk=X!!N8)oWx^RU@SJCM}bsfcajb<g1=xQR@
z`Yd%OjUx9c>{YnuIO*Tmw>0WO1ZKX0*(pgL=!*}oM_iasLRzA%M-@VWH$J4Kq?vs+
zGg<VMKggFmguoN$EaNW^a{Jw!3IVAxqOrNSn<B%GT%8E;zNPgq_I!d*ZgM6N>PvvE
ztGWxB9&<DsVMNpQzTx1YF0*TMo*fRho=KaG3xCUo4#g)jjK~8wAo#mR((LjLpGjqK
zt$%?F{1=%RZ_$S^i`mT@aj%7C3vbbq?d_-C<z~^}%2Qtd>GtDXpY6*Lzn%8S=}lgj
zV}1_;sq~Ps;52Y((MfO`dZ<_`=>lLL-6pHWQm2|;auCLPXg<IROq>N$w<|~#Rt-zh
zaLM|;?0sPA5F9d6FWKy6<2BpoSf0g;(#3+J*Y_6ICd_BX|MGp~_3!&eASY6LI$Lf$
zeD%Pei{ugunz8CXeGc$B%nVZF3AqLh4`>d?2ifZ|i<_1u4YXQ;+ZCyJ3i1G%)eHk#
zFYTZuxtj_;u7%!7T&f&h_?k-%xqYPgCdF`73FN&up81I9z!ut;I35fdshTmf*QfC}
z*e#igYOBUttz?<Ze&>N)>ZnrUz}SLkKfjC72n^lIKh?y;y%o3(DQ=TX9k~pe+MBy-
zW3>&wTPp18srWN)$zRLVUA%$)ze~226j_<5M-}1|v0Zg1u{W+HG#mx;H%*YR`5zg?
z8WSZ<*n{UEkXz9oDTTXmmBy|zp$rR2Y;sW}&zi!Lv{0-ytI&03#?>P?k8TRm8M5P1
zjlnC8VMS*1PzKV2(}E({Jn{R6(wWE3U}!yp#M>eL9$e6OIPR_zig&<8x@V(h*R>p;
zh$vt?mg<?D;1`(fe92w;tudzclfL}k^fD87TTGM#9Tn@&6cul=AODptSFzfj>#!y!
zA(0T)oKV|lZI^KK{F*^_6+x!{tv2`iNpYLamNtjQv_e194QX(nUy4ER$SdubRen-_
zICKWqpAU02b#zFp_6Kl>!H#i4lcgv}edLr_2wy!h?B-brWe|OxDLt{X{mI}$*ce>f
zTS6ND;#zqm%|KWsM`<`c?A6r%iqcA>s=FSw^((I&I6Sg(vHfwLX^Md>aO`$|^<H-i
zHq&5;F`ij*>y)}(aBXv>-%-YC-8>~rO@5Mes_1Qs#G(IakppmibP+a2$xp-31kzz|
zJNwJ68*6RcHI~}n9k$uBgUQkUjP>yB$#lb$Pf(Rm^~0LC&#eA^h*~`|q^BU6AW&oT
zDR3lo^csVay2O?dmncx<WP_9;oaip)uBH^;qvL6yvrte`O)I5kfKNS+)mS>`byh>I
zWvmr`K&ZvI4G-Km!<guj-w^bfwee~E?pKK;V`Y_14V>JRLcU7qy7N`Abk%6GA=4At
zibo3b1V5*?WJh|ajqa<irz*qH<1kw~$fvVY>o}$HP-W#xwWZkC+!X-6|CIJuZZsXZ
z!bnX~-BD&c(Rk0zjYZL*Pk@Q>^bFGs<9Oh*GeH{cWCU&ow=@$er>{np!;fDWv`!UK
z2XB9%K1n&#Q2E|7?R(-%vs_8$l%69*-6SAC)G*(;%b#5wYUM@yIX8o@4^&0W+b7HL
zELPhMm2m|(uKBi|dQK-QO){fuPw(i?bS6bm>fn-Mt&R8Dxm@cy4b`<7+!DvWuNI_M
zftnt~eSyMmg4PV^EUBds{gq^N+CNmOIr0cg+(;yD%U(g4rh;%<OJI$Hdd+T9bD}!9
zm0apkk93q8P2Ap}(ct^rNs}$hN{GVn5Os0tR-H%^S-dp?`!{RezM&QkQMR2>MG`n1
z&KDd5=M_SKlgzh+I|gZj5Z|M|rG|pLIWykEoCB8)yE&MRKAl#3F_6%kIR&&!;>Vmq
zG_$fB*d<66kHU;;xFKU@8>9%O5bCV+gzrA{SxdScDRdb0XtKjmd6VB<cWNMw6jTfb
zVe65O;IdY?i&;st!Y%rdMs7nC>%z$mz&c@}JFQ^4s|++%t~A{}?@ybV>qS)PMkW+A
zegiYo^c7I4TZi!v#f=uO-{MfGF!Vw2Pf#ak{NDnHg&l|%{AY0;cikN6GE{Nt6z~F+
zBy!-Kg3Lrgh8A#LUYPXdK64!*vnMuZq_Yh&v+s#GCJ)2L`gF?+b%!}IA3brxg^Klh
z3#w+Jtg15$Y<f;|GOa9Ha;Uv0yaWy#AApxdWzq3z&;_=zyR@?5!#Q;#U1uB(Z050a
z;oOzT3&$;bV|ZIan0a2*DYH|8j9#{ge&Plcc)j>Yp}%Vo$5TGJ;BDm*mGqy}cpLGc
zeV60xgcSsJ>~A^gC?JV5ejPs`SZ-SBb(ThokW7f6XYh@dbx@W?FX4E>l|fH74VWKn
zhuV^m!eo+?n#X@>4*M*v-xYqC4HG?ccHLw=jVzx6A5Qt+f{+*n?e!`vo2sg>%**qf
zUhrpj5^~RN-f=6a7SqRDcY>)V8#;-N(x{>V#o{?7jEGyfFx}mao%l@b3CX5>?Tq1+
zwYe`y(Elgn#4J<yw#!;fwq$^u46w2N;Xy=67@VQhc+OtKXZcW!ln9N2c&%hi#I2K*
zYwnhnq&wLN=d}|26j@p**(0o5M$M57)IQG1R&IVh$S1_9T7$+d=1Iy_9<AABV1zQS
z)E;*icmFLgy4J0jsyFHAs*)gGn??LF>YdJ2Q+#0Rw?3ta{19cOxwS-44pcJtIz{BK
z4a7sTKIjkG)bh#4$cjP>Um+68a!~5a+ptVTRaTwZtaPM|=QTuux;u{IsHNmpFqjiG
zOFdgE++FU-<Ew8icn1dJIGETd9vIJb$mJVLxZnqZ$%drxrTV`43a)w`(AihzNZ`~8
zn&iwAXUG#sVe#k_)~F3F0;?E?k^y#neetU}d@Ak*I<uReoBN(>ty{-lQ%MIdvQt&s
z=9|%f5-%lbVits|_xW`zCDIN@{ec{>fHg$-Uy=jbB(DaN%?LY~Kc<)BV@xuQ`l^ux
z?%I*RR>6Z!F^~3bAmo_&)hX5!`IwGfsQGFI>dW8W+j7(yICtwT!DZX4q(U(cQ3#kN
z8E9YwG@HMiF&Ho<g*`v9taLu1+4DIwAy%DR=eM}(WiR~5Xf@@qLOaODD+@zMQoZv2
zLXckuNOCU9O1jh;H--v*^%Sn(2+PPLlj38<VIpZiSk9CMdTq+%(gJm{K%t4HKbhX&
zBQUXC*&ij+iuD%Gq+V#JAIWm|I|K{s*`|+xkCk)@qiz22n5J!5kO?2NyhvFVgx=tx
zS6d#c?2__NJ}xHomoKn|Twwz;tCUL7&D^U~1Xjc^I?j<KlT~D5=-Cw&O-TD*p$qsq
zoH^gCkYMmMjj(h{#!CrdR>lL#klbhst2KQm)5s_*bV|{pt$d|tQv4>!^!@mm^xK31
zE{TMP-my1Q7hY14M%o4RglL+v#5uNhkBFyOm`e<z3Ro<mA{srU!kV~w3oSX96qe7C
z<2Wk6R$8f*q=I<I*O8<SgENQ8P=CbzT?XeACG@zWHn^PodB@RC`i_+fY<Ux7i2>Mn
zG3&?1jue&`R1aPAZ}{tj477(9ZlvD;dHR_WmeL$-J^67eq}z$9$(0DkwG5UZ^z&l!
zd1bh(J6c2?8SVBi-N`pI^@kwAXGd+$8dFul9mAe6KF(L}>-M}`s}0s$`x2F^l-86c
zS@(&f#6xfVJMKY?5BH<+1NorQco=Rg3LBQ|AB;_=LZ)=#acq>sMN^5239X+%0m}(A
zXNS#J=PMw1X*uR<;JxNE2Fn_@?*95K${XorPHj%_tD*KBZqZ^g&UDEb`Fybk`Nwyh
zk4)F}^Nu?|<Aaz;XgvBa5{#J^=5rgS+$k|-E`LvWy31`g4~l&rM+~p-csVr*%eCw|
zmdv={-;Hp+An5Xr`@rM82Lfz?pOUJSRA^w&&sHD&9sek2jEU;k7E%7jQF*9!*NgXW
z-ct)<rV1DF_kF!0yPEerF32(J{;DpLH<nYx6@~2K9mym;DM3_UW8b2on>w=EDDwz7
z&MFo|jhF9G!Ot2WvC=#|*5bC5@aDoBO0!^TOc`}z!X6=SrA<3S%Qi-VQnVX!`xeCG
zh+0Wf!wim%uIP%N;ieZ6d|;*7UW%sr#HFU6o6IC$`9j$d=Sc_-j~Nv9mTgC5k|v{4
z+c@78nDVUgM2m8{3LSMwuNLd=RAb?Mt(E0*1YiYPmZ*`<l}k&!^c~uHnYz0Sq}mtD
zPS0EsgAc?&tkMJS1%^n#c(fxS#o8Y!(!I9ojV`p31j6tL6y_Qk7tvEM<BhmU{Kk5{
z?tx9jMw|+-4dzIN+ZGdNBYf`q$#7chUEGGwEx9ZXezqEJ;E?V19yH6rY6Sd~?CN3$
z;nAs|vYB58-sc9-k-p7ys9Nte6GD^BE1uCyMQt;NQ;cf9+wcSYrR@0+*27x%?SFF*
z{rkr5DHp=3c;r3ohu|!HeW9jyIMcC;*fX46O(Nx-6RJ0kf_xRxWePnN&Cg=rsS*Gg
zp6IJAtsE}dLH&@;RBQH$Q;kkU7yQUgp0wJDYNs0rur)V(-mPb<umgN6?@yg6H_}+x
z^vwi~xHm@}kq5waHg61PP7P}2u7PtbcYBRHC7ni3#c_&AOk~-0#OYpUWRg|dY-)w(
z7&rCI#%Sk(=a#Lp=x6OO*`(l-!AfFsltt~FlKD=)Zbnc^mzKOcy~<fhoQ=SHg|);`
zg^vmK3hv)?;?9i7nS+&+4sa<2>*;pvHE-sT&A<7-B&PrjbCBeMi&(RwQ{RUqhX~@?
zx`5@t%y--iq=6<>_kM_~nC)j_Xh?4{9DMsoWa^Hg;IP!I%}7hHXz#>YpM{1cBM<3b
z3j@sF(WFJ1owJW5!Q>?uv14iHS@j0S@L|tkQ4@l;aIcKgm7q-j^m(+*Lv<?#=F31)
z3a&gkGY!CsHt|f1{^-_FrkyeA$m?C}XQOv`!C965eu@}V8Tg)DteNTPex2~dxP%{v
z6P(nmE#;Xx@+phOYZtkVn^KxoM|el;lB(Fhy{v&@$x6d9dwIQ@gDC=z-wYicWRdo|
z7mf6-yrfx`Y4ns~jpB!VDhlCe%nnSSzc!`hC4T{5xF&e&rfUn2Pos)xEPf)LbquW6
z`xTh}n(=tSuJ|om`&&Jg*KdMGFW*fHinGZIVRU6gh}n68Mvi=KRzyYWCbcxtw0=y7
zFC#~}*RW|pl5LZ0ZdvR7t}F>To3+3U{dsRBhq$*5)z)`G67!FKRYr&O!&dx)BRHuQ
z9v=>nAP@*GZBB3cmojiZcBYXhY%MT}#&>~IU@qoMO|L#W{2a+oqC;-jhmF?!Jk@@m
zU6E)g<#o+Dim>sQpYn3B;3ICI{SUrMN~oOO(&L73<G;bm;mHu?U1f5~*Fo`Rpjv^X
zaDgw^XAS~SPN<z~saR~e1k3DuTYKSGe=Sph9|&<27R}YD;t&V&-f(`)v){P=?%nG+
zCkwX=tS*6GpXj7o3f7LAc6sXaYCU*lBD)hUsz|P6p+#>sAvADe>e*!(20!H6Ty*EQ
z?|L>D1UWy^iad;fw3&=QL2R~eZTMz2t(r`=I%oRkrPax|{(?E}NAtfNv(d@g#WyYi
zhb)s2sP{{w^*X^@<8ru#BAP#c_YF;<yR5h#K$^W5v*7ydTwFxRNU`Y2XSMrvf;*8H
zU*G6&QEzFQ&>KWN>dnl)!%%9w=F(3>3Yi<aqQoB=xGLYGr>7K_TNg@Fs5jVaUK81W
zKS>k*jr<Rq9ixFG1ABE*sJ^m66(ux4^j>D)oVHE!#jaPNf83kQ3VheQg9!h+$SrZi
zUlwCw!cElCBOYxWL?EliJ>vTgdd%E2@z38<h#UC^V+KmDuV>PS)%;|^xsDwdI+W|R
z1=VFnohT2FmfJtFVPDz2u_@0NM#-7TxaM=%Uz;Fq&jSpRCtF|5k2hjp)UIiP@e88C
zlWaj=*V=baid=*293#5!=$EX?;MivwQ$~@z?-%dzk`jx$RR8>}Rbiw4Z)5JhM?!#@
zLEfcS$%UDbpu~lrH>$OGW(70;fz(bjYNWpTy0fi?`5?(>$QVU50X<@jZCjCxuAr_8
z#RSoT$UTTG(2QK^Pe6b~<MRw)yJxt)E-934X3}+)nEfMSBKHu5bmg=%?$uW~L9~Ta
zmK+{47iGT!znM_`n6=3s9f`M}z0#r0cvdr~LJ+z+AM;Ynyp&ZcINphFqTNcN(JfXZ
zkC?qbjY0blmd(~0<cLc!L|hL1JZcRt$z7CS&@5tUG`5YG4-S3nY!fFCl!ITs(=aaY
zZ0eIv%0h-M?d4V2v8k;e1uHB&k2iG}Elfhti!z+ZCC67R(4!$g%A<-sDvoheQdmpy
zNTC52bnbBy$4Nb4L0t93^_&%Py_idS+t}U2;3Jz*!GebP%Dr##9<;L?{!XzadU710
zp`)Dk?uhZDc7$`&$V(2GP>!HWG55BFy$qrf5>{0%6H{7NPIY)0gJ*Euz4XeSG3)Yq
z@@#A~>90}-PXt@i4i@fd;VPxOEa&yu+(q!SV&hn^u?xjXAhP?8VyS$BXGnO<bZd9=
zihBvuCr;_cR~_d{-OHRU8fQfy&n3_DgP$}*-bTn>_UWxPSe61fgDTCCHb;<|LU?>K
zdi8=Izt70<vK^3&R2Pe^X(%y%W!}AE-LFht0q4{rT*^US0-1`j?twk_O*|v#4MeZW
zvMB&b&ldIOxHG(~rx`E;4t=^3hz)2*qNP97;H+}sKT1I_=o^HLTx-`&RvY#!-}&$!
zA6N}cK5&i%-J1Z+?Y7+{<kszQTon$tEhlc^BPGmA-!9CZ>a8<;jbr6;HTBZZ>SPXg
zPh<OlYucPr+r$@fuQ%GW*{ZfD$pOc3_eURllNRY~Dfa^Hu|r$mM?)ULQW$vJR@cNI
z=MG+)(lYdg!+OAJw>>X(F6HmIg4lN1F35Q3M`l~n^aWrsbvEYsqBZiDy|UCV_w_Gj
z)mYO7l|Id_)b%iKky}lx(R2eYPnYR_hN+KCJ~{i#<SZRd{G{GGwT2G(Q(Qq+g{pGs
z+B&qD)Suk)+$1-tP$v&R+Fie+J!=*--qIv^2Bb4$ug~Xi2bDN$5@bw!h!*NF9@wRN
zG{{y$78ih@o;`Wa(m5r8y0Q_$8=(v1q*-K&29kyoPB#{FbH7@4`e-zn1rDpWx3fjH
zZ(Zk{8>hXmW!c%qTmO`iZ=&K#3v2xMI85Z}xufrnj?;-2_6qCl-A9@$9r4u_9;Ui8
zlcgQ6+pnNq-t*Soig-mI?^O1!Y%bU2U-B1SV%NZ=vR6)9$6W-P=j>4$t;$g1MO6ut
zKgBKBHx&VK?~D4ac{x_*%vwsqw{!*fj5I|mbhuFAg8x6s)QFufpjAvD;KuxEwJ5bP
zbzAHgEw|Y{Qo9-^R$&n*!6(tY`(wSQ9({%|oP$7Ekh?2H2DvJ4vKLiE0w}qp7wYcR
zB;R(0d_OuNmm|ohcRB4nq(+BxQ*L@Lzh{AK{!tv0uShADrF}Q=D~Ye{L6Ftd<2Ap6
zm3v34NVP~k%eYRtFA_e-s6>TcsdiM;csE^<(EKdfFeSO6SYASJu|Rx(cRkMk>UrP<
zvOH*OzCV~y$QAYTbE1+|0sQu7rCB6q-$5swlp+=Jd8qGr|N18nD&b`OaxPMU*}$Ts
zM71ca<_;6e<9;|Ft-PUFChv7$zwUaY%A{mBZwIeGQ-o9(r?l8*bvvf0q%XSeZA_!*
z&XvNw*!3s+->2#pkBQ4!<qKMRd71|=TR+R4C&m=rzPQ2Y#S0gx{~Jl`u|Mra8jm!p
z8}}Du>NA;1`33~l>o4vV8hj!4Su%b_<t=Ak|Hh-E3V8c=e+jPu;ZdMi9$MaqT!7i;
z-^j*xw>xk$6<WGGQ-Im@(5yllUzAjDMh5)nS6N5v6Fe^^sLlj4MBZ(db9Xr1wPSX(
zzD%#u%!<#lvf``=;g)}-o`UuT(@`jE^Hv3Z`epRm4m6C!i}dO|bROcS0v_VD^Wlr3
zwDwv~pHYN?+jb{0Zu#-S7ySFpW9tW{W1ZhWe>Nbyo{!Vh8fca%=X9SgOU5g|E6rp;
zSmXjnc{$HSOLY;YJf*cD{x)shEzpb0?7od|W!B0jvbWLHXPEX`Eq-B#@%izxK>GvM
z8RV>Fu?+IO`2U+}ZY)DgbOY#LlM2jnlIqN%fmEgor9GliFv~I&3?WRS8&nY?d2W)1
zgZksI-J$!~WiF#e8FfGRHSLJ@A?FkV+~XT>#X3izO+TzW02dyT9HKFm5I4xU68*!q
zhncajkU}WMDU;Mhp+qo2c!?^{aR@>v2b$cA-ap$zh-^418$SGaSn@8LFj>zTDE}1(
zApeocyFXSL;yf-zJMCQmy@C|N<OtsoT(s}J)a1r^)m3mMqzxj1X?U_6$p(mH(@5=z
zx+P&Ssm=wG8Wt^^!{b+m?LByN71sGdT$pjL{^0+q0tHfwugOQxuVD6~yBa2lC_2Oa
z5<=u(#*ZP%&Xwn{klcQjkG!)BK%{$}1M%p!Gl|c@dN+j=)%tlJy3kRUdwifwp!?r@
z(NxTHf>)FSRmY~sm?_ZtbaaVy=S*gH1n}&>VF2SyWBJHK5=1m=T)O4KMlv!Jxy>6w
zG`d%^_3-#dzH<fgDB8U@Tnv*i_+K0T@1gUQU+M@5B$C{i+5Ap`c)sn@s`#)?Prly0
z^F;^~_uRhmze_gdsn|I*`CJYg3yJ=xM+fCrk8QC;(K%!d`Ie8}Q8F3sb-koXftI{U
z^_B<#(P&WE+NA533)owdq+;JtC5vkk6EK`xxcaQ?BU6yc%pP-T^o`1JdQx|c?6Ux0
zZ=b%n)s68WTFl@Z!h9Q6uGACbQ^wne1xneoAt<Tv$5TT6u`#C!0jtOSrPbuQEZ&V&
zAs_6sGf^kerd|_*>^PF-D?z3N4t)~-6}B)?<SRTs*?7lG^X?Z+C?aqXz~^8l13xo=
z{B4qr74|wKXl6oAKjf0*iTVm|FpUY(>=SY^2lU$`Wb3O@x-mT27WAPQ4ze5OPNC7{
zV9MKtyf&qjKtjiXvb)H;?ICqJnnX|tB4TJ{*~R*GPI!+;3G*{Y5^=9#I)5v0M{$F@
zlLm6=wd}3`6wG*^oY@^gADH``dK08c8@g^>vRaUYU}s`Vs%l^%weUWQSzmCGpV{O;
z`wSNnVzEAeDQ;hB9s9N!7HDF#zJ~{u*r<hc-+MaKduxzWvUiKz>yl*ANP+Y?ow2D2
zGV7f*d0Wa`Ps(Z}2Xjg4Ys3XZO4@4F1uvUP;%$<oqP=R}61CeOx}7nAu0b);<?Q^a
zayFbpi_M|!c>D>=kcK)Q68#A5HdZwefx&=rha%!c^?D^OG?N0i5fPyntym5uUO_*2
zPQofvjtsv1#c-_Xc_O(u6ZR6+sw;Tn{xIXiBQ>A_-YuWcYHn82K}e-PQ?q6lp5Bo^
z56|*?lNBwnzE;?gkhIpgIB*0jfIEDvE3z9~^JO@{{3YBrX@kmXwDt9okyu57G$26`
zx{Ydeb$=-BYu^bFym-|arck}%iKPF)rF*yI1iT%*8+abRN1MqIzJ>z08tMZ*_>4W^
zY%uEZS{}7W8x>jK=Ep+~jT_fmbQG*jN&fC3zV>*-Ch4Z|INj~;&dX5ZF19*P78ElR
zX~cQ(L*%g__+P)>%UpiXjda3_EGLXqHsY4bqd|A&%QFKO2jo@1+dFGfy$;Sq7-$a?
zExOkCfu~hj>PgIWB`#3f3ltl4HZ31&)rq}^+)9{iG<%cv-^)Irf0M}k&5-N+crK_d
z>vsB}u3ERFS_8`ZdI55**IAgDqx>Dlme#plmh&y@`^*RNRWX!#(EXo}4~Ts1QTpWo
zoLj=3C!1*CL~N@S_xV6wujH51SFfAJnvq|TGb?OmarT!6d&NzOzt%4UW?_<+lmpj!
z)n1OTHE#r-)JFe=&rjbf3`BwV;zDFDbWZK;fSU)uk3NxY2{dOJHf@GC`6oCo`Wd_I
z=uiqB&OC3=?;symE#&Q5)>v1(9q<~wP)1Xy$?8o3m@gDJ)VA!?Y$u$HUQp>8IyM9E
z?-T{`J}+YZeLTr6+frH9vIhFE82<=pHccFH4wSgz&GT*sr;UQuhX&7JRPngyhUUAi
zm`-5C=6k~()FKf{j;EGO{yz+c;<3V_hnsJn{OYZX$NoObValB|kq+%5poS+Vel$u?
zGJZY)hYM}6^8MGJZ*r!pC~IUliqE$jRD;@YsJv%GSwth3Y$~(A&nX0$JccaKXI+JC
zGB70rV@SZA!W`GZ3K7w|pi@c~6bq8(Z>%}DmSgwH3N<nxjC8mrZS?k4T}k&B6;!2L
zTPhrg`<EjkHiEJIvF0j{vCli!rm%9&Mko~k;j8aAmP>2(4$_fLvp-dQjS}tlNcyX1
z%mM)6j(}fiq4wl)E)Za#KhWk7uInMTULSj(dV+TfZw^!81Pc`?v20i~0L%w;q{xP8
zf+*C+x2Kp<gp9`}`l<{NQhna>VRlCjOxKJTIo&0=a5!vHYrLa!!#9WI9rL?kB#L+d
zw5}KEv+G+0nRDT~Rs#K_m6+&<PCwj>Hh8`C0f^h82$w7B?)6^-4?2>6@pu_$*pYwb
z;C0I#f#O;+9Axoy<DhEGrJ7Z@gYr|+vtEfe`27Qfm#mwXXkL0t?$vF%+K?Tg3SApE
zF(avg;*df>?OKL@3d=&W3Qt4g{S*R}aS6_AmGaqoBR%vC&wBjc1}WEb3IvUQoF?^l
zif)_XRWo^Z%W=`Ig%0~@v~u=4ZA1r42qLoXxsRpb8?ysu$1%tQw7g(=UsO20nz_2L
z{lq*Fek&k-J|M4E+n3SJNORq2xcag^AjDDf>*V*A_&OSab=i`aCm2u9s5K*?FGC5n
zVohnH?gJ_*eh5NYTgTU8`C{i;jW8FkymI?A{sX*E7qOiJxBkna@vr{g##382rRZ3d
z2~J3ystuIca<Ef+UtBayI-|LcZEz8I%yL2V^&q!X{@~+>d`}2@Zr0zi3cghY|DtAY
z+@p9s#4~y*<@wyUMD1@q7!^YTX0`7xPVlk$MVaRNWaOGQO?|ScAA>&NQ>Q|6dckmi
z!+iR4h5M5(FZMtLhg5q)+psiQ2=1{d-MpSO?i2h)@$#N4hMI@L9U!C&Y|uT9dbvlG
z0WH9<ckBL@?WuqdmJV#b3hk-@Tp~d6?Dyri{LPf9fYSGj<GdQ6g}n!;S1dD!jQd5e
zrdegj5s(cJUR=DS6?$w`CP(jfnbmZSyv1mlh(8QM<B2JeOqvX<-+#&V#3lP4f{&ki
z|2(6=9*~^OOPwLk1x`+BdQ(x8pG#uU-Q@VP>h=d$oP}i1$_}Nrb^W1M#>+deyNS8b
z!`eiXmDVZ}$2B0~$^s0)V%yk_J#78Mf}@JjWG^VTHsb{k+AI@zyu{S=n*D-bvoqXC
zZ%KN0K(X>iS;gQoCQwHlna;}t+CKNsqzC^{0UCwsD$!bxA{_^Z4vQ~y!Jc1Ro%vFh
zHfjjo(jH4WRL-5+deDuJN$%`+!n-=T3kb>dZz<*-^j1)60#pqEC*5>TQVx-2`fYJd
zyB~^3PVt^c{yg)ysg6@tOVCmbb?da_c~A1y)22{gt;h$>+6=*Rj6gZrV@57%A~LYj
z!TwEN-Kq3&ttX0X*jTn5(vU;MJLRuAR2UTLtu8&Y6}vPtQ^g_);`cA=oMBbRdE^?$
zM^Fq9|LCg17sN%t>SRFrZow4n8u6;D-w~O9IdxA+0?k#<Ix~ZjVSGO&114kl;Vh#Z
z<*`KXg5&p`d}KE-$^n|hqt|5Dpu<iVE&`I*Y$+Yzv(UYPAt}^^`zK}60NYfJfj-@$
zY8mEN+-j3Sg&A&NEK$(ioIUxRhRPmqW-J_t&hQix#s&_+5J<5vP-UZo2_F5bgs6e(
z*2&eH+?|!z*kLopP;NuL!4?}J{>~RGJ)dx{CN<TvQf|u{Y3f67DIC0H2@($6mgjXI
zzvJOHV_+#%%EOd{U2Y=CfR|*y8y)n9K>q2rL^#}2L}WA0@VXx~eS!N%Lm&Rp=J_e0
z7Jql}g@zq?-N(seH-9@jJFN3Zi)irQ;e>4<@?A>ve;;z|wZJip^LN_1%&;9B(W~yD
z`C~oifl2?YAmkRHFsIA+>i^OuWVL{m_biww>5!9(HS>XyT!c@Vu479Yk`5IqI{9~i
z*I=t}N2Trp+_#_z_siMgn+^lXZVO^BU+H?o?rjaATjJAGHA()=uyD=0fZ!vAE8a~y
zMSlN*))apL_p^JjWTeDP7kwqs1D-gw&sic9zP1d`@XjuOr|CVs@2Ow_1%yDFJz!bt
zLhjZ*U+>0!eP{aHy6r8-73z%sfi(0YN*G^A9I~o)^$f4T6>EdAVB(>FOF^aG<@{P)
zm_q|V)xu2V@mwwU<b~HiewQsTy0oCgDz&^JY9D5K_H_wV_jg{2l@IrIVWuj{g14~i
zY5&n8h<HQH=l(aQ=v}h|!z<##4jH|mA}LKjq}0k))q*!gsaDAJpbZz9gwcU}ieg$v
zW9{9Llo@=VmJKQ7-vP(ZVK+DDukHtf_3{RQ>Zz+qfdq{=t#r<~BNI8?s*G=phKicv
z9VA17c<C7A*M$fSc^$fo!V)sOf#Y@%A%APW6>|ilsIvn-M!;8V8*u4k$fKVXMng3s
zxwhEI*209UiA6aYGl{;sBO4Fj^D0dLMkuu>YIwZ|ys9YZf;0IBGF-Lid`aRNgkTQ@
zNHmJWIP$K|JoVvLS>~@wg5+?`&WQ$^KXntsj|ph(>2C&6{#81PGWT2Gj>|q89Zv3N
zJJDP{qxETo6TZ@^=-N^QlA91cWF2nb_)sCIc-jLt1_rC@owv&F$rvlkY_7)lfeAG@
zNDYNpA;W=d=N$xLyOj?rPC1b<>0Sijw!XHnT!QO*WI`~qNebp=yLHy3HmY$6g-L~c
z-TO;mb^7ccz38umw7$h`im%#=2baO{T@y<MHODoK_h+}mAR;lPN<nz-@y*oT(p%j`
ziDLpdXT-fGR=yt<eDj|PA8-(E`7z*G5blXV`q;o=z6Q~xgD6*8Utwqrdu%*VU_rMH
z7u@oqeT(-LJw-Zj<orHXr;glN=l^w)zF?OL{$p>gSBgP%-rD8*t?Z2T+E*s;!`~!u
zeL|CF(Z>Ow|7?^wV}0YL<~km;TQ0DoAcX`C2Vxcsk+pm^cE<;mnFdcw6F*fq4K+jE
zP9t*8Q!EV{is*fk%IxaYR?!jQS28?Vw#U44)f<8MwiK^#m?QB&<~vtM+OyenvmrA=
z{h#@knX%MB>1mKS-NbkEHjat74~pV*lYF&KY>qdN5n|5S9#T!qFB;0+|3`cEsiGz{
znWY=hCI-8F@e<DMy2UMkt{wI19VhG{*}17{VcCP(Y%&{n+6PSnqLh)LVr51Bk2BDt
zxG2+$1<y70l8UIY9-xQDTI_hr?K$sDtWLAba$Kja5?`kyr&RrGob$0qu|JafLb}2m
z;s(o$r!UfK-}5LvXu#Fn@MtJF|FMp2VvHoXutt5tWQwDM>RDLY2hh`pL0~^qfAGrw
z3FNQ5L4h=eAS@RGYJYDm_grqanjD8=w<38Z77;Fn2v}0rW>aX?Q%5N*vXER<7W%DD
z-a`mN5zwQf@W|DTVOZjIK#|MUp>s)$_*uj6_cgfgmxZcW;<d;@bp_JMp(*m1{|K8p
z|5gDutwHw27ZOPZ9e{71FJF*?RPIA&2Djhep+conSJs&i7+yd3b7sY@GcoP7-7Wt`
z6@)Qa6`SiedmQ*o678%J<otS8N`S>iOr1)tMG=+y@njXQeuMA_vlONj0h79iv27Zv
z=8ae5huO(2+^SMj*35rgHSbEuy6L59)Q!lSWmiqpdYBu(J~swSa~_>vHbbPTC8pWh
z+&u=bQ66=G6@TK%g(MrvXu4%vr1+ZTh=giWHcFPEx^h$7ZG35A3MEj7PG5zzS45vQ
zwBKS;)R!PEpO#Xu=Cao+FdeF82VdIrvq<GMfI&g%vxy8uW6+hinA84O3#~HEqnMeR
zcAgZOL6TR}K=mx<zV@av;yY#I1IKb_(5?rP*jPT0SQ!F2S4Gd}TUF{QHZFS67b>6O
zNGGFiN2+mUXS3sRvGLPoAVw$Lx6Xq<0@iPKw$ob1#9Lue$+<W)mS$IrO{=J!=INkX
z3Gxevnw23DEjnaFgAz^y#e9rhW)z04*KfFQ1Vfxr@_|(ps?wfMn<B&i6jgE^h`qqI
z40{!*5sx~Orwt|NiNg%T1aDdaPc04kcbJP>fdoqAO&b+ITS%-DgY-LZl4EI+##$qQ
z)M+A`Lif-1@UJ!ptDO{i(OHE!sm?FWX0l>w-}x_kPubf^tGdA;XTA)7QP8pJcA4UC
zoOfIGcUlQb2;HpDgNjY7ZvXN<k-4NKdJzGr+GFFRYG)w-l^K=mW=}7*0f7uZnQrR^
zTY;dP<M#U=CPtaft_&WpQNWE*P0%|OLon}u<@29={onE#q6uC1GQ=3M0?y||@W&<m
z4ja|<dp%Y~Ku5jJreuC3`htERW^IFQ+fHuMLz?*`PL*2txlvhX@$cp@YXF4$OYVsj
z%M<AjV8RJDDFxz%@G^UUdJcydTet(Lb1dKMzH9FvLubtW>^3eRz@{kWEW{u1?TDm#
zx4(VNbqa5HXqr!s@GGLa8U5;0hCpQJK9yF8{g}G^$nFu1V7qD~|86@xDPg{JRK(ca
z^%Y81Z5{j#U!?DjUC|&W9|&m3a|gHE&*7RqC}OPjsctz+tX>|rWutNAmUW3V(Kz1>
zHlgGv=*M6bST?YM+G%<4JMO{H!o}R=Ina^&2$ZGzV=s_SED{4Npi@!uVoQF6UU{I`
z8z8WD3LiHsmGcG6%o%nP?bzK*scomjdb`Sgi7)iN_8i;3V}{(z6}TwKUoMb;y9y}1
z9Yu`aWcm$Vc1Jb*YtH#rJj?b41oe%oUGX2xE*r*rnis49dOyzYFB!X9sr0`QhkXrQ
zbPWLO1yhHXieo(qnB45r!ZVvyQhFBG7E}5%xIQb;MrJmi{*YmE+teCQ#)4z+;R_~V
z|7U7K!eU`gaa#w%9H<cYkDGG5_4QM9){~yy4Y=Q=Cr^kcBG9lDDE!76RyQ3+zM?{|
zzrUYz4)qghPcB|G(CwLL62*zZs+3np8Iv9{QzKca(qR=OTCV942u&d6hAhcWHkt0;
z#?7<9hap%CCP6j1#9;JQc00&&=gZ$)iXYj+9v8Uz$X+QX0zlATtH!$Ww4caiSBph0
zMZyGQ7p+1Ggfz&-Y_nz2&kN~ax-^%557<!Z%J~Wl@dRH_C713s+D2}xCg~lY$n``Y
z!N~Yf@!HPKKt0RXq6P%<<{^Iv8-y(3je$_CMo~OoEP%NgZ`pMA0Hf;CP6#jF2mwRx
zzV7DyaE+84v;(f2n<lP%?8)DVK)>_}`NL&mg_?E7bzMu|eDF_-!3J*Tn`P$*t26~F
zhE?@rQ*}zgab6{HV1m&w<w<@3oO+{hG*`pOX9pyzav_Avf1;&x{ONKS1T*Uqm&sp;
zTo>WQYbxyQbZ`yf0uvzU(c1=%sL1h31AVBN@jT7hM}go_*zy+eocHEngcV|EDe)k0
z%OAEDLLJ)!*=wK_<m?!+Sp3_*Hl))i9h<gt?ZAebVmTx33|~>_$U$CI+hVUMZ1tX#
z{&vwr%*EiCYIrQZ21sf)*u|0{OKr-0_c%lB|Cy_6kXJt_lG}*A|Ai;^9m?8!BN*!>
zjX(!*Dw-jEk2o7=-i9^+i@C32Ipqgwz3hB8E{;yMGMwx6SXIl?5sDbFV4xORLcE&E
zR0D%w@u-C9)g{7^$j9&%C}<KKGn*>lNo+2x2|Je6WV15Vot79QL0i=KU$g@lMi;-{
z1vsIv=pzRVygOFfKdTq6JvE~TE<RQh{0d^=a;%@rKP#R&@9vHK<4Is>$fFC-`8$_)
z0Y3T4<|Y~Hn)re5K4ZuC^^(u)6D!GYj0R}k=Kc(2H4P9iRLD1L<Qo^AshVhx3hOow
zHCfT3k&62n+@M``9_#DFUeUgGrv1!y=2jDm!$s{P<s_ueJS#H|j{8toNgkvZUID_;
zedS8-8<uKU{XcErZq!#J(sSG4{|)UWzo0FadvOJQsLa}{w=qg6(7rO!1h6BCJ%WSz
zE-MWt)@nT4@A~g5NGP)NvKB4^4Tk*%w<Odty*Bj#zhVx#@8{os@l=y96%#G($|9{G
z8<R+3a)#xmyTMke-LwkK*JP`Wd2~u?bTgq9VUc%FwM?*|65=bno0bqf!!%1_^AZ-+
zNMXBB<eJ$}QMk58GE<RfLjvTjwNh!t<hKmL>`G1sj{kOteXP2R0_JIU9f_nBAJB&>
z1~e=N63;47Cj&~{Q$*FmfBqCH2uOUa==sfq#kP=5I|?5<kRoPkn~66RtXB8!F{79;
z(gkY}JHc3%VKY6k(_<Pj^<aUt1O%Z3(-fO@5H@8Zh9W_zZLgV|H3WQbD4U?9uhETW
z#Jl4@h&D0LoQ9Y*&xB4vjKCzYEw$1Qh%?cDscv|3_BZAfIyNWPb#j#ll8PD|osqA@
zUIjmpSbRG=!MkA}<F*lZ1)xU*1nL-iVqnAxi^KAoIrwo2r1QVfvXRYZjY@Lx-}#h%
zJfCMy-q(a#JLr2Ky8{W465M0rfJ39$Jc;YwwxAAKFQ|qE8$;EJ!iwIsyu6*n1$JBY
z5HBv6<*#&PkF<`Wze5Si*@kF>xLXA&==zRTnY^yB@4Fzk3-K_9v>o?PqfnRA0p<R{
znsROndAjbj#i&1imMTJ7rB>k9GmtmGHfw(`6-*V}5svB#lmns+75EaO1Ro5Ok~sM4
z1r`xW?4vBE7{~DkbfM|Iq;BI{2=KZ$c+3A5oi)9G%SN(&mnya-r@eT#$e83Uaf6n5
z)cr9sGX?LD;nx%AFNr2BU>L0FavqV5dUm*8AQ20>x%dn0c}?(uX?Xq~`0O)->D1?O
z3fJZcyZbX~It8#xHq)%wB>OQC@t1UsPM}}!$t;PjKio#MGA>y3&SQ`XPzJMh-5Q(P
z^tk_FnJZR|Z|LRJe$@Vvz;oZ6&ncn#hrSCz6w#=}N9f|MD5D^X5)fnnM>bEQQnq|b
zmFu~I*lkVyCedcsaWG-$acN>QuhwaAZ3pg4F;%A0%K;<@zGo(vz~Z}a9lN#mZXbZ(
zb<$`!o(OI{A1eiN8f#Kw2?_p%UtYvUPvLpj^iEfner-=y{)g(89<bB7w7sqgXdUGe
zlVzNd$Tutu_pH>gIP5^!>9SdYV|V|Oq`*jA_07LrC5yqCv!IlNWpm07*u?lV&-S9A
zf+p2{fJUIR#)}f}AV*#!n2j<__kn7ney@WBF$B$ixa9fuz*f_Ln69>6>!s5*Qjs8T
z-Bi_^4{gandvhVhK8l$xyJE#FEc+&o?10Am*M(wm-L6fv8Ty0ak5_uCX{;F~;UUKa
zqUx#4`P*pTrlhX>GWOc@SHh2{LXnW!NV(Y#VE3Mo3PHc^D94wdiJ}g&YOZ(!ldEL_
zfxi|bBFM3SInbUEDRPTFJw{p?eOq>bzBec{i4BLEuN?-D*^(sth5!OG%6fav0k#D<
zKhHY&qx7LXr`BPqR1GW?@@`&lg-GosZwivt7cb-%U*<EMa(}opD=wM)IS#DL<tFD2
zc*KRj<ZM$=4W}4r`-XzYaivBt83h5qd!M6}Ofj$IdigyalvRVMpK=EoWd({YN8<Y|
zXqtjXp<u`j&dewI4Vi@o{Sqe97jWfxebAZKS-ot9LZ67AOL)b`Ba&l9s9^Cnw3JdV
z>oX5x=Su<`Q%9&$7Ag0wdAoO&VM-YQ2z7SV#(xklLW?4tC*U*DRu3p%684Hx&-Rr@
zZYtWd3Fv&<+W79WNT&6c)i9<yzLC~TzaQCTA@+FO1kAw_=$BYc`mWz^yDH;RZFqBz
zAngVdGW>>;RxnGdb*T=i`B}6HokrL;-(M*3xh8X08KCvocQF70FE9p8VsnuKP~^O=
z)7PHNYNc_qavn%pUH`I2*h{+1z_q5Iz~1=!m%InHbsjG^mnt9m<T(R)t;q8}H=uV8
zl8@!pW*;eT3%SKs(L|t7xkMQOmmt+t`}jB@pR|ypwB${U*B`F&60mQ<iBwLq9-_K`
ziZEmyhu+;nr%-QE7vEpM!<<b6BqV6CE)W9UI32YA_)JO_EKJz5#5ggY=C~@47=k=}
zyK9PUWJZsc)3(rQl{MhehzeMV@bsP&InqSgodj#z;3wItGtd6&DrbSDTC1>2h3YcF
zo|bFw0@@4Es<pYyRFS7<Q0bMM|5sBe*ugvFzxXP=|2j&(sA_%$vT_FV>K14HdlIXr
z(Ro(oT0@d4Du`e$WX19VSh%6BPTTPrWiMLka9_fk;G<WY;SF}@{TRlIjtN+-@lS0V
z{J0jp4#FhtPuhuR|3zlpZIZ{_+5hHYbUaZ0R09$G!HVQj+CP*AbbiqLx57p~1j`&~
zo#HvbnHT1pS%mcgdY2~!2Hlb}9ns1{kxW=rmSk|dLrxfR66-U6_1<-<*w%bfES(6F
zJW!NOH)gJysXPAa{6RH1+hv_hG|EEjOX*EBU6tRm3hr6c(Z7|RWR2?A_a67DyNxY{
z?E|%3LzsMTug&>+i?6f~8vgd<WGlIKrUWv8K614Qt6Pc?AlFN_e51;O4CvLVftvXk
zDDi;*%Y&-Yv1l3+tSC#gBh8C%VZL{kBuu+8>)am@?{QO;V`RFnKX5{NnK_vchA{fJ
zglg45MgYtHN{VyujD))Hjg{q~D-e1S1JQw(@D(+zidoog5L+*FH&s#OMFI2)yv}R?
z<jDFBw@IG`tRASZH;id~D#7XmIUMKhsr4qm?5#Z}%^3uv`d_DgxS4@JYEM8eU|UO5
zp&K^T@mamRwMHUC$Ts#w^y{5$9bNjyM#ns{Yr+|I|HQy2@)iPhT+TgPH0N1-BEQAf
ztp;*_X=b@-1Psvro(Mvu>YGzF@}IeHOe07vN4JClhd4)nUsg#JHWwssQ$t6156ov7
z-nN_@hdn}xBnpr1)@?)oe0~In!S@;rd^!7Ue0UzO%MA#%s*oS-kG1P%5q3i13&fb&
zVK*5r(DhXwe)Cs$LwL}N_viQ9-tR2tI9}C$OH)4(eQQ-HCB$7;{W9NlnTpj-Nb_Yh
z`j`ALU}ZjBX#N=*7HOS-gR>?(bA?TJH>0NSyWeYnN_Rl%i$GbVH>to@HK>qk&Q8W2
znIv&gf<u!;3MJP1VV-*A)rx>Vso2bg1A*anRe}n#5|aPr!x&AKj(K38!8T4kbVMcl
z@;X&i`6<v%w)`vPd*aU6u(Z$a2iJAcfW*NJ;9sNe{m@H+t@Oq14Y)piOm)PXI)L0{
zKjh`gc&hHf%k(Aa!)l_)9R9|6IIawO>n}mGVKLPn;58p*it=97G>RhQ@Z4m}d%v$3
z8T>iN5nue*RlCb*I6)kT@19yNdRE#moYKhmdHSje&SN50c{QQrBX0G2#~2S)_NM+0
zm{iDp)84)=n4xV$X5_@VoDBX2qC=bY#vi_)clFTWY$p=eQ1MB@LKJ>bsB3o6#~}Qm
z8QN3l=xUn;7x!^`t}w7#y9VU*!X+71{oC4YpJxh~J8&ypVbKn1zYv84h>2(PY=)%3
z>WA;^+mAaJNlEaQ(mH5bH#i>0mM%F13xZej$Lxaq8SmFa8SK{0X*=}_lC0AP`;hiz
zD)Icip3mr_Vn2M1YpF^NLjAAjy*iK5#LGdN-{!jDh7`uk%Gd+@EyZf3T}8^8{ZX6s
zZ%;K+_^<@EKTfIb-V0pUZ-{XM36@)ZP-N|x`$eSSg!RMgotb^`;n4TA%9khsM{JAg
zu)B>*wK_B#2JW7J5fQq!;Y+*gU=n-bBWxBu$hP4G#8eUN(FGM#X!F$?1wVFcIm!5V
znm865o^wPc%-9cU>v4uqrSXUC-~08?PLYseTC8SxgKE_F_vL9;y7%QJatjbrCE%)Q
zjK|0PB|Ah^xf-@(;YPr?kzjEFLx|lLpT|jyYXN7;@a7wmJ-_>GRul#i%CA<kZ|Nc)
zRg%oS&eL3BS)x9{iD!-L6pj>&^yJf50}goTtxDji(g^xFh;X%(aMiIJ-z`S1B0*ok
zU5hMMk0$f}dCki6lP)dA)#?PCb>_lVrK@LY0!3RT!oJ1RIZ9=e!x5SQW4WcA0oNZ+
z^Ab;v#YYL&9sD}luq=9waEU1M0mi4tF^}**>19(AGmct|!WG~h{*oREl$}{t>=8_s
z&1hvUs~?~G<P$xt-05ZojdRBI10(z~nfT6u<{3IVcltv8rQ(bsa`$^u8JE7C(W747
z8$~9C0MYdMoxI|?$Df>U$6_0A^C8eL%P|bzTy7xue-YW<(&_;Jq>|+@FxDixl~w>+
zEff5sn{d=^ms+k#ZggZG;^=AGGsfoxc<gSsDhz|I3AI8o{c<)uYBl$znAVsfaGM%d
z%hfcNrhamc(M9TNGsp+VwwJ_Ic3QwT+tOc#JH$o>JgcXj2szFU-W+icPv^IhZ0OA!
zdCyfG+=5w1%AO?W*DE;(Hruj3jtgKvtv9g_<t_B{_5PBwSNrqh6f3K$0!VUavocbl
zs#8s=R3N&(B(GD&#to&eaM{eRh;h`ZBgy3BrG}LwM5^E%S>oeu{0d9C;YvWUf078_
zf1va$Q4EY+C{9+1o&|o>P|8~{S0-8YV$)<CQzKyX?{eS@q;x3sjMuECF9^t!09#e5
zm+mM1A0#w}df5_4%x#uREX?a)-nMI4Ai;ijn+bj!RV;LB4F-qZhC|P|uPHQ%^DG(U
zCN)d{lup7}K3V#q{OiD^j6anqtYp!{?KoqSX!&L55W$$YmHkw=;4YEB<>jvtPZ?6y
z=G-i@-Codc3-7uWsq+yq)=4qxfVnDkWHiTTS<&!IfQmeD3nZApU9Hc`mNBqy1HG#I
zUsSzQbR})rt{dBS(y^U%Y}-l4>DV@A)Uh*TcWm3XZ6_Vu+WG$Vuf4}UsgtTv2UTO#
zTkmz_p=#2Ad?ucdyJOS9D_Xmo3#i4&9?NCs?Ei=v?Lohi>U95B4ms0(IU6z-Bh!&}
z@JG|CW?dU-@-F@|SzEdK?rxP;THhI2KR5L&aZcf;3i}m3^HTV-Cjk!tGiwFGYKWPM
z&dF#O?f0|S;>{=dxHfZ=DR5o37jIL(yl!@>j%RUKcSeH$K}{81Zhpm^Qtc}K&m&q(
zZq>m%Fj`Ah4N^vs84|-2910;72{Ndx{fLFBLh+L!H?{SWBXhzM&YxyAZdvdiI}4oo
z3;S{}HN*pAXy8JL`pN*AR@C=eb_$=k%a~G{&g_Yr-ron?_D91i80*FFAJMY*lZ-ck
z%&NIoo;PUL@{Qw^fA`gxw<+xoSs`VVvtztUsOy3-9M#eeHZ=<t!LU*N{-aZPjvlhG
zk@I|Z@r|&x66sg}Nnw9i;fCz|F#?-}b9=-Ki2q0UFVg|Y+y>6JxC(<-N_1Vp_E<dO
zEs;fErb`e?OOSgDi~ETaBESS7LoUtsmfXdbAPpsUYx1PRN$wOeu(+tSJjbL#K_lqR
zXxwUSp4w*qn)$}ez6e-`#**espnBQ<@bpxqTvGhw?J}DsXP+E-1%o4K4Y$DbBv}j5
zlks$IG712q=uMN1_DsD@Ix4r6)sj?8fdzf4It>lUub^<pl6kT9Gj?S+9(kZ>7Ulno
zng0)XP@N+h`cDAR=O~AbP+W}oZH{TyI;t(+sw|+vF9JE}1wn(0Ii)Q{W5n?%y&i6U
zPY5sOHVdx6!GP|Y`+HNyK|f}V0XT#*Fd9QyQ-IT&5)<1QPOQ#<**xjR5nWW|4oh}D
zXx2CG+~?#mit7K>r}^ef10E}0-qtzlS9OQ#uML)>%nbw#?xkXw+3u}et%vGQn7=mp
z{qiB>=XD_#8Tk8)FN@Gk?@6WJWW3G{Bk$>t#qv%k)9PL59YE<-_rR&p0LyAKsNLV+
zSZC0Zhis&%7qFx~_B($N&vVe)QGh{K<IDrdEe5d{QB2dt%COxE7@D@Gc~Ib)u2OMR
zAqfK#a%xJ<_2`Ux^AzqnTtC&lRM<Sq@0NRhBYl$0bYpwFKg;<@;#1CYEd&D*yn4RB
z@tCj#peZM=QQcD)nlcBt00LP*ECe{l^vV@IIe&O^UZG_Q_px3ikMZ(ZC>nFXa?Lxx
zOH>DEt?1UjH{rqWMqXt9v2(0ZW|G)(J}X5TP$bl^6KlPmIT3MIN@%;(i@Hh#sT6WZ
zpVo&UwvrK=QKy04)4)-_96wg<Y7hIpu(lKFH0zVw{CAR&3T46>7ocR#*%}Aa6IM`#
zPrTxb_S7oulqcMIw69JPuO!dL{^`=Gmjdd)J@BaLju92@cK64d>j8ihxsmd&>d6Z2
zI}5Ff@N^40c#vWL9x1+%+eFAw*67G8>FBzBp}H_9wn_rI<}EwUE6tX2?AC_-+);Cs
zLMd?A+~m7(ztAeP4A52jvoJ*Z$I1>sY)O6fq|C8-DdVK_+27qgi!-ew>gBz@A_4K%
zU-bT+kpOkoP&dvna@lWY)Z0jEN{Cm(n;g26u}3UqC#*b^lDU%8u<~jyAFK(|@v^BC
z07^3@ak+mNvB$oyHf=|))hzMDN7jGvkHgtGTQ`E**F~pl0`RfS)H<lFf&x_sOsAGp
zn30B9Z4I!~#>45bBir3;=5*g@DC8_kP%4HAr0@0qaJ!i|9?jm!U<o`u>aA`yba~eT
zkLMD;{0=+#65!_U#)efKlm}|Pv%f68nqs}#YvO+L2Hh%e5AOtXa$TC(EhZJ>XOEsd
z@0^fIA4$DR0wg~M=ja<LP6gO4laJkaytehzUAxf5?3@C`RFMq+dPdx!28}Q+2G2su
z-P-9mB<>ZvcE80<730`CiM7%|PSsS)kg>gm`Fi@*9_1@?w35Jd=tKnYX|s|)<6`xn
zc#AqSb3D+hD}3B;TeQk62pmdEQ2#Woxz~k5&@5hx0;oqiwUv9H9LLqA(3V356Qj9R
z$;d9J(N4gt4X&8Af<!^eP14OlP9%;&@>yDq!;5?*AA%`0oF#RXs;&S3gj^TnFQKAa
zsV~V_@4VF<(YS75#+o+1I2;TP*Henrl+pP05g$TWXups)0qT@X7vg@N(nMPTrpLl4
zt*L;Ysu6NROoPBC#_e{x{R<jIF^N8m6Mj@yD2luE4kopEtq^19`XnM7ke9&$FK&&6
zlt0@gx1*wkjLfnyQ4W+Zr1NlLxNJ=nX(}H)zs%W%&+%6}`;`-nBRJUpQ`yf?Ucg-F
z2!q*;;^!yhAy8tLwDjMd-Qy3y)+1#h_D2D`MpNJ!kcf?j*1lHG67C_@($TrdwgUJ=
z&}_oyoVEZ_xihqy?VQ1TZ?Z4mE6A}U-w_8Es(K0va(N$&?tTi)>1z)xGJAlJ^Q$tP
zLg!z4E^9GOm<E~qv}{tS`L$I`4Q8(jh|g!sD_!NMMXlt4zwHP`s!9hSk}Q3KGz3ND
z=TGPEOlCBFZP=(wep6XYsH1!XBpupG$bqc7-m80EA|AtyIYmMqop4*`80BHkH(q@u
z;@-vbq?FYQ(#a!*Fq;J#vE;r-cFrrmBk!yC(YccP6<y=U`i*xt(mtT;djk?j-=*}*
z?q++fwXzi0w%jZXL>~nJLuN8oj*N9#UI#8CRPsUm;M5(LeH;|>YF0f2w!BtyATFKX
zd!h_$aQEnCdd4>t<#O*OHqUgO)|`voQGl+QkqfDPtay7f!<-aY5IC84eK04sfwNZ@
zm2~6@z&*o`JdjT)XrLKN?*-94-u60v$DWF^1ayx&phg?yW@P~?P#L?O>;6%npUReC
z9T_wtwfe$u$LVgop9T-LOAzr3Gk?vVQIA(mw5+NMvT!r8$zA-TL4HUzcwq(-fjDMh
zOibh)GvY$9@QpR~Kq*cwY_#}qI5X}TIa?1|_&d}Eb-X7E1%;`<bJ@iduwhm(zO(8D
zyzi(&Za}m6NYnwaeu+vsf(k&(BezENA;C*!^#WxAicUB1i1+${D$Dmj7Z%$-|Lzr8
zCg*L?_48R+4L`Gwprsk;pA(<FU7z50D)0(~m8c|zMGdo=)5cLBaCgNb{i@9HfsRcM
z`XuxjLn^Ew;#V8Lh2w!V_cTrOmmRS<+%4F&d#He0TAKxk+nt1TqzHB9=&8d=$5y1$
zTqo-)5x_FWxBLb1xP?>{G70j6)@S=CPaZmFIir1<Bw=K%(;Ku~UT-w|pcc;Fc41mX
z&WR<SCh}!M55w#^g4JPGGi8T%;JPb(n{G;v(}h>*9Art;>)j&hlo>*hKS+%J4>GCn
zuh8qNqaGF@$uX5p36dT2s@VXF;qIx!7QO(Keayjb3~0r04u3g-zjG2*?fLoRcf`gU
zs(=_=J*{E@{ZS~NYpOc&Jo>Mh8f3Opw%^(rr+SaK=?`}{+EYA9lbUedw9wq36?4ur
zpHP06;``1fHz0EFo&xT|*ZnkjDj0>?f4>)QYDraqbu_e@cUT3(aFsRARK3;7>iNwb
zu3B3(h2Cq`GtF<4gk7^w%4}&)eq*oy=(<&zZ+Y!bm*>eQW2`IDAv4&#<SM`9So`w<
zSuy8a$6&Ofy0vZgp1#4=HKk;P1y3(ux<r+)@JUL&grYidEZ$T+o(9_VCw;4%I{hFg
zsWsrAJVS0xT~NXFkP7o!9RCwexSC3Og1ZPLBz#}1e<1Yok&LphYQSl?CV=v)V~y|I
zZ==!&b3nxEhxodPdDAOL&0Qda4IRZo`l6c@vgfRhm(hCPrAJpG!g9;z#LAw^7DpvP
zGR@n(Z%RX$@+VRMr(pX^l_!+-a;rbIf-QhehJR`R{9A8{ZTPa77Z^Uc(N}`$>0vo<
z0U70_E^}oUr?)<Hn4QFJQ$#+K>Z%TC3m29NV9>?D*kXMVN^uoN9n(cg;MOWSPD31c
z{D;tfkffX5=7Oct9V1UCTt^Z9J-)zU9w9kf78Eg4hfM=<ESy*Wm7AQmLmp{z{U3l^
zXK-wSr(T`e6<c#RPHW8>Wz51=$6t@UsW8j~(uLr)28+6Es?xSil)h7^OC^f(MKdKw
z-BucKY==Hz?1V4zZ3&8hKg<~*n-olEPkE+RSRC+e0R7|9A%zDug&#RZh_5q8n=FO>
z<K>{wQ36-B9ujx{XIB#m2-H)hdLp1M9uc=KcB-4q+h_7lN+V{6!$5)C63WuJTp#^k
zr?@_E6o*k_lRRDXgS)O*n?65%|J(Z-PJK8He<i1<twg#15|RENu2vXVj&=4vj9KsA
z^aSWxs=0Pou5`0HwCW6=P;62-AK6KGWj0GqzSB;j!gpqcZ&IMgwz5p#{tqy-xFQ&2
zkkpVXI3|3wyR1@yea3;yc@DLWLP1A4B%_L|8dHSFbAP{RBDnGjJMV#a0RB0_yfxr0
z*bO2X6<KMvYEK;UD{jq0&zoSnWItbrs*#iQQpQRTT?_CZho($wjM{@iXpRP-Y1ne!
zxP5=zc*W@uO0-uwy@iZ&0I(jx<8Was_8?fwh?;TP>U#&3E<vgN!lMjacVo}vRhc;8
zyPfTsbU>l}d;W)A842B}(OOy?U?0}*mI{--KH9agUYL{8>$=w~Pa`}%lpx9#>~fMb
zZYKj90+t-4-FjX`B&=82Rk3tiW3+&ph+dpnr{+}a-)Z_28NN?f7=X0t=nQ&a2$I_|
z4lxp!_<&~7LfW{mEHjK?d_j_)<2!bzgU6=TUKGg6+{8frz?CR|EG%~rlsrU1I>H`3
z+_)3Ds!ma`5W|)PCz&@F4-XPWBV11>bp2AwAK+=V5aWCfjFE*S4gXrmA$)~h8bVmA
zD$PZRvZa$DoSFbZ1{jgjAVbvU^!<Eg6omOHVH1OegW6Bpg9HX`+r<vJ9e+6eNbFt`
zllV9u<yPsHcDOlzGQ>vE$TNGglbJd~fSI9)ZghP1?>CIA|324jeew+>t@FL1hdk7F
z_mVVEQ|)cBIw@tsyidxG&4~rtxO9#(L<>dmFY5GrXW5VeD-}9dF{3GDlQ|q{52V$S
zV=eI~B?uub6P5&K0B=VL&_6)UQS>LQY1bw(G;wz{^ACxGV{+Ldo2(gU1!l$Q5KMuF
z6m&6sIn^f|TM9*AfftX6P;I7Sx-W7})WiNjOWkNKxSYzzfi^<Tp91po4VvT%QBBSy
zmed;gL!5sAGrnOY+G*bYqj4zKT=pcOJju8MUAMEaS4#-(ytSPri&_f%N4^Nj85_v2
z)O8ki$=0rdaPqz`N4bSOKb+6sSdk6(DhDVjDP(vrrxs8W>Ri4<r;ubq5nO#CY-~NR
znIh#J2S5&y^67k(8Q~Wg2<wkhN@T@cYztnJA5{wg!IBH+TJ_PSrBfon3beT&!Ki=p
zXOolM>{?O61&0<p74y!T_DA*AjHI>eFj`NYQX#a{AJt)W&Sq5x;yKmJ%*tH7Z;6J4
z+9$_dr_v4)xFpCKMoJ91b+;#_VxGZXwyZt#of8lw6vI_uz=2k3s{}fpIW7xMTG%R%
zh>rsTtwX0?9s8McO(dm7YD$T<`zsQM@9e_-@<r{D)_-r0Ezz+%<ee2X(&Dz%vAvu7
z)oV9)-4;X_J-1uXgC?`w?yUlP2u5?I`cIx)ua=>5o@3$rwL$xcDvjLDpzyVwDH~n9
z_=B>cAHY-ZUvk35vUQm1ns6iXf2EC$D3Jij9zv3StO^BmSa?0B8&wiYlB5NVq9P9m
zbkEyIiT&R{y!%g8Ubx=@9rmG9ar?91SMKuE{^DYQk4eOiiXYiobnt{vZv+t-l*Fr$
z37Soa4Z8)4kjuX(UNjenOReFl`_O{!VVx4QZ8M-WN$(1+ACBJUR-|mUQ2@MYj@xls
z+6vGk7S*1i62{=Nki61n`097<?vEcpJ^!Eug}U0gGPy<%1}QMTOtrRWi-!%Z>wT26
zx9WigpEU(4&ZZxpV3c|@rN88a%{}y6X|~2V1!n!B0-)R=cVoKY*9!)0KkHO~WSF`)
zm%cr~BB&0X6>y9Ws^Z3-5dl_VjB<4C$!0KwstyyU-;XrEO^9@nEB@N<Hp~D9t`5-5
zC|-8co>u6P1HSnn0jo1j@&Z&cN2JDO0tEPmWxS3%O-jMf>34(buN~5|c_nv+2cIkF
zYEFQDM$q#>IL8Zl6nW1#_9J{69`6iojpTmSY)cX<kG`ou-aHLV1{e)JFKMxzhP<BA
zC_rRyZxZb+#gI2J%JrY6JSWFxQ8pbFG^%6aQ(@brG-+Ebbw`g{G)D5l6@ePOFKOY0
zQh}(G(a`uJTmha1>Bo1=%5Vm(-ze)U;Ut=kA~Jj<$&6oc-WzT`5*Ez|t~?(0r5-)L
z`T?&8#2tVay3Z>n08pqT){ZG1ft8cS1!)6Dq4m>|Tp`o%qmx(7#N&|a!{C<~C7#vg
zNa`KkSjGZL?$b5-Xmw052Y=pj_sTeW`+7ZT>TKHQn4*R$vIV<%$1xT<dj^T_KjW6}
z_4g0kN6;zUnUn!%Di@yLSCY-JeTrLe8n`vd!o^!;0_71f0KUPua&|mUG3<3;PUjS^
zbK1F1LK`ME@eCK_6nGV)ysnZ`QI?f<9&UQxzki`z3-WlB=gIC>c4Q9Z?yI-AMqMDW
zZ;hYR;5hDmIzvrjFQgo&^H}lsTR{x$=QCAcLg3OfB_iOj7ePL!Dt+M|mAt4>(6t){
zfBVPJCFIRH0zxcx*K-&0Gl``6f-QX<@a6=A3%#T;s3bwSd<ljzC8ea7oMVq*P?$-C
zxAJ0-VQQZB1wDe4F*RD24M+q`S=?8ndG&f(g;gvd5Kwy;R&MDwRjj}dI$int^_E?J
zyllFCiqUgoDF4c5-Y>-5%)ug#4Xi43ZqP@N(p}?v28hz(RCEvClYI5}t|B+|+i?_1
zZU^Pocle=Jn;xSzR3Cb3h$mOuqpO|gP1N&mC*e3CYd1gDxH=*eK?{gEwn7(4r;o*9
zK6V3j&s2-O>tnP&_8a`A?<PvSNkqzZntrcTlq^(#lE;EPFO}(3NVB~xKyLKtsldBX
zcbMLx19UrQ)Of+pZRuEw_`B_JLh|)ud@zFK=_?7u-S)8Cd5GwCVJG@SokL3{lFj&7
z`V`IhKq)@ax61-Yk3Ze=kH7ZyXtLQzK`TerDS$F>G|{}c7noh3&h3v~Q^>|~bR@sT
z@OgWabwPjAk`5ugP(o;0lyz{qb7GvBJvL*T1AgqGdmm=z5nvA^EF!eEx*U_l^hL0M
zBK@FxI1)Q77jP7v!6DvP`kl>XAuu^+oNL)=^29&JyAwoHZsP^qR&m??*~KgijlAQa
zKmUt|RLHJT@v7=j``g*V<dlwtaic1NRL%l3J4_`@BOeO3L`00$b6xIx_l$_do!`0i
z2H?sq$;8lbB0`LtBs-jgpbYmjhoU<b{9RV<wZ81N8f7QU(^pL(k~4EQ^5`TOyqdi_
zfh_g$8TxhmFwHb6cEm>5%&TSlq_#;LR3)?>>?XOLxNU6&m&2v~+^I|8gne-<NRADi
zy?xEgchQ*CSE8xv;`NdCzMXOi{TFF%5>QoT{Gsc{Lo6SLKqbv0{Jed$48}U3q*2;@
z9Vy-0*+4uY>wr9MvCRS5S0JY(w^&V8Igx97GU~qlnXmXB^;}r^%Y)J+fMz;}CiX>l
zNw0EhMO0C^lsSPwL6OE@Qu0-;h#emPwMx#?1N4id!yTqYtuy6gD|`;88l^0}0H6q@
zG*WhPZ}f{rFPybO;?4Y9LHi*e*pS?1(uITLZL-r&i!@yn>yA8Vh6V2J3j^=ki^;aZ
z%IU$|ST$>I$y4HT#xe55p#q9`a{B0LJqw(l!6T-1c6fluN0s_bI0-O@*>*8n6<Ic+
zXHEaWqRew)knf~3p*)X=n%-Gl1?28{>5}}ZJE?QC4o|kF^QVKtrG7DSjkE?kYoHX?
zkKvQiFN=~4`JSkzqg+X0VeVbfV}*gk^c+UHnoe^=DxP4vUs5DzEcy`2vjVi-A)wYd
z3Su$UE-#<FT%s&DGF#OV;P^A?Oz1~)r#p-cT?7=D9>pm}0s>)J=n$xn08HHl1ND}_
ztcnZRCz!o-mTKv0k<wszms-Uce_cX?-x5)!*u<+|9*DC{A1hG%l8gTH{~PH%s$v~?
zvHQNlw)pQy-Qik@L%O=`bm!tP*am}ReDXWPZeL=-aQbK`98-7l_@vo>r!76SU*FrZ
zoC~R>hbq)G)Uvr_cntK(ApmEa9iu;Z-81LCxHK`5+KH@8v>l0bOlGd9Q-ZiKZiSQd
zyyEYy6F&)#hI5M3a9WYa5|boG&HIoC9|}CK-}e~%kb4pUUddWb92GU$gWei_!t^<J
zX(x&)!APMIr**KS7-!JfbR9Mk!Zu*z`C+zjMm;Ospmx@+E$CtVJs{C_$AR(JKPYjf
z;dEs}g$x|!R6A#lkR4e+Iri}Le`Zy1m3>RJ7CgJsEXRE;eeu%`w(vFZNkS@?@FiTP
zCXCnF35rhE+8cA;`qsKRN9HE}8>}CCZ4@O16*j1+C`IR~OdsR|9tAIw2}ddktxepo
zPT?GfrXw}<g<8nINq{DjuNcZXAD^*<vn>Ljxt7a?@{$GGwm=YwQz3F=1*pbx&p>Bk
zZCE>5mO-m!?v`|5#Jj2!WMM`T1TY3YHT2L8vJ}aDs^A@k@>ZClY$5aAOKjo0mHU2M
zTU_OS%n@@iFhYzU(R&xo|75-<6{IEzGUGxf+~r#~i!)K62XI-GO$qOvP6w7d-ytl6
z%E0Ewd5=(YvXKyZSUAi4@^Cp%@V=2pmj3y+aX&GfGE|)8tG%cxgezRDx0{hzJU8!5
z#{LT0)mI9iqaw6tAQ<LootO{=kYWF_^u9Tk`iVHkD2pJ?)uXuwkF@7re<5Z-A9*E`
zr6q@0#~(`P4M5hebS=+c)Xm0#Lb*@lT-CihR?{9$zpRv1N|FC*(h!G4CS|XP$&*N~
zflKi-37J%BHDe57-4BY9)di&zD7nzL3T^c}g*16-MtYk(gphvsaiZoqee{s4X6jNn
zV!kl=FdTe8ob~2DV%)PFBSREpVncT?1$2xJcSzVh1n^QMsV@xec_W%4qwY%tOjj@c
z6Pxx_xTMNJQDnO*kBqOO=P1&pb2Cq_SV@EX#-z4e|M#Kf5W*kaDxL*Kv=L<rEzS!J
zA9ungXc@jgXOg-48ZLehc9J)D{IZ~FY{kvKV-!+DRibZ-9b6^rsy>x&0?aG3eyK3B
zVAd$I7!dEc>Qh$9fNj&l{p<pOg7>GY=&8rC?Yh{Wbd+t6h3C8vHPCP7!_(%KG&cZx
zjrzf3P6mR*?|a=#k7rpD$=H7o#?UwHR6WS&N!wk^bC~S7&i*3Ra)GhspJ0bU$KM%O
zCy$*cbobnZ&<6_!7j&{-sEY0In{jTnPl^n60*rR3oznY!<|#%_EW<wQ-MWgrCRU+C
z%rF>GNf~B{FT?UhgjWBOqiCFhEj!UB32_?qw~Rm2h+PJ=J`$OVWXb(V5L<MbrfX&3
z^0)_ES9J=|Fx!6!w71rqr7#ARRhw(OjCS8DK(?u@7pbd`X>0?WpaJSr{!{Y+_1EbY
z05=NG%XoKI7Wm<y&X-;I-Y~z_f>h;h<XS-rlv2sA)BroS2K8cD34o|8rAC(NFk5~l
zwa)>^`WdqxT7NTzKc8|*vB+nwf0)_1bvt&tSS~kN@g)X(ri^FuI;MFQ7<6^WKzl8M
z=_%XW6vue!lx<_mtx1xiRM>^!t#WV%SXxwhepfHz8~KT_2YwfCVg52U>p*Hn4Pz4^
zO99tK+eV8~S`W6KiQAq`ZP&}6+QVQ0lZb9F3Yz9419_OS1Y43trZsdF0@;l8Vshi9
zg)Vc%2u-|?<TR~jNiCrH$1}JLX7hJYWAN3rbHZeO6d>g6UIunr;3+PJGIo|8pdU3k
zHfWN~WIb%C$4^Ur7W(a>;(r}LLbg?iCAb+uMJLEpQ7YadWmIq5=bBoFE+_QjcC~tS
zj-!t1O-+E?6zW{1Sazlw^Ve$LB$}K`TPszFQYbRY!?IW#BUiOIe*e>3pU(eARz<Fd
zQEh4=ceWUL#>bFFZm*?8l94b8FiF(hD}xdfq2<B34x`k;jHyY`;hHOg=<1{$t9Eo)
zjR0r;$9>3wRHG3wQA2l4<6gzzRyjV@+Oo38F=9`0q|PfTSwlb6v=mLXNY3G<XxV9F
zCm``TLdCf|f57WEvh)*tTUYcwRxvrjyS?6x1d>?c76{Su<7II9Yk2$#;OF;dqJr<j
zMy!&6uE%}P8xd{Pl21%ut*-pS`&Ue)D}NxJ@&Iy);;_B*t_Y~*qL(E4A>zXHE8#{f
z)ELsRFVw^An&_$?17U7J2~4!8+jk8#vvw5f0mFd4=W(fXxcsTy@#KT{2S{S1-5Yub
zVK@_|=%jn><}fmbo5_hKz_+hCbb0l521#M(vJy=q(j_kfQwK0Ct1*0F-h4DbEy*h0
z#~K=7e3v}{xZTvdO7V!pDKof(1L|Ijc<T|nrBjZ9p0d~KCKu+b`-wk><Fgs&R0F;)
zu0UkzS&WtUlU9GT7D>UX&LOa&KAt|)ClvXJVEw{clZ<@O8u(7NhxmoQXx)_|1{2Hq
z+wHLXep+_Sg1tx%-IGoU*P<FBk5eNzvC7J;^EoDSrvK|SE)Y$lAg79o`L*@(CGd2r
z19<%m73>QB-1s!P&w*9n3<=SBn#hB7_wo0}59<gdwt_3(RRRV*iF&I1mnsI^=EN(;
z?~pzQ<2wJIR!a@|x7w){5d$+^mn_wAK&;IA@%m)#64u<U`i0f4{FPk2)ZKmkv<7kf
zkaY2h#yAZ@$lS=&8n({&58os=UrRSp@#|7fixUI3`!?sM%T#I~v-3vQ?gk;L2ZrBg
zvZij$K2%=Dd_<ID*?nS9zQp8zqICR>H5!fla#+D&zW~cI*+2R&PNQ~sQgBl>!QLjV
z2ZELiVS>aNEL>-)i8THGBoQ;*hhZ?~N>!72=UJQT>UHib@1TJ0K7yXPdu9vGl3XhF
zj&~D1Mi9p7ho1n~M}Exn4}VW%UX=peyi0;C8z!l2TA$c22?AQa0rEJ>rkQXI175>^
z?|zoID}XQ~r`yYt->{x`_@+W(*im(rHiqfQ_|cHxB)+<^a|Dmv8~>>sG4wWv<A>6k
z1GTSBjb2Azelyf?n~*KekefRwk>iOpFmtN2iHzVr0d%QZ@OptaWQ}(saM5Z$0v2M~
z87omXevE{p+ir=))WDca{X~WtG{7dKfL0&W2JmdeCOjAGf+DvYf*8F6v<cV}a0Jz7
zQ69D|FVFo8-i9%ARx+2auW~pA8@RURWc&F&6zb$^jzO5+%x(b36-E`WJjEA@xS&DO
zj#t>6RxN!>tt85H2S(#Uq|kdy+mH(nmrPGMTbU;JBzdU;t?;QsMI!x3ver_YRgGtg
z84#VZ#v;Q%rU~RfJ<J&*8x)MdFek>flztdRj^6L8mT-R^`3F>Hmv!1MWf3rVS!9I2
zN_Z1LoeevhIqL*QKA3vc$!b}s=m-ff_D_JS+vef#X>+blkKnsIGPWHks%jEeN6NPm
zPf)DlO71z+<QjuJ<0Kl5y3#23rEOB^101^Z23Q?nsQ$l#1dJ;~tf);8YM%xejFm%F
zXo}^+g0#~nG;L<0W_s$sNde_QKyfbMC;=ssc$*B-UI|fB8k=(}p>~kwv`(O+mK8Sa
z@S^xkvd;bBI9hopKnFAosDGh^WrhYPLGOrj8wLL96>k#wLrCfzlaqh~(Zv&Rz9UEn
ziw3*_grt!CAUrL(q^vTi!UMI#pqwyV?VJks5a8n|T-EWw2T%LI$|3c0@ny$F#c7<I
zEv+%>g;HTbEsjxX8g$q5z5dCx`?*yQbNXI3%U{0*3Ur@V3LQuG-q+7&nOk!o*!jFb
zgoy_I+0m`g2GXSb2d)6_Sg_3dUL>m!Stt)PhY4QV9LZp~FCzJg`ljr|ch{V${0=0Y
ze<On=3{0WdKVvyG$~pgCEi-mfTX&gmdVpY<b*?f_aK3S@uah|}PTW=VL#ham3D;kX
zlpVFGr;5}PY#^Ah6hl_Ss<Ecp8e%M1<B9zk6#@Gt{^R-7M#~AnuO4_>ysiG%g%{<>
zfkp}irOswPa2bL#F$2o-mqlEiNt8I*EP_Vs?={)%*a0p`771BF%4v97oht&Clg@oF
zFv<r(Is?w)R<s${U{2WC?(mxn;*yDQ>)&!~9?0?Bv3SM$u=TVVyYVaaX>a>af<AB2
zR}8hyhSt#VMSS`IN*hd3N_qPI0f-UY>s20phE{~sV7p36TaK5$K`3jDZl<ZT8CC_d
zz57HwNHaUiMps%@&FxT`@*Z`^n(-(nr(4rYMGeOXNz@;?f0Odijpy?@Gw&I1FgNK~
zx8;scGYj?xkZOAyAN==Ll*8SUTxoL5S#y2d?eT*bgmabvnC}ilAhUJm2vIdkDyZ*n
zlU8+sZe+|*YTcCx3h6kNS!TFnzJCJ)2}_(Kby3(psyHaJpC&l#lvL4h42n@vTrJ4y
zXW}z!q~GIx1eM_`7`@aCf;*KEMw{kpD!z-b$zd~wxo<&-OB<Er$P2BK{x%*OMbnqm
z62{3GVzM^^mQL160=Pdd8I<F-4~Q%}Sc88XF%ecEiufCrRKikcv5ow1-Zp~jHJ9>U
zSn{6aq{%PhpK4<V;hM#8Qh|fBIz&5lq?Ry9f{jTh6$eESkF~n)4(W+#X=VK=P_K;=
z#~QlXk`6-ud4s3F@lB;~-x(UR9m&&6;j6|B0MsI-(ZpfSJR-|dR3K}z;STzn;nK`i
zVw9kO)v;qshy73M5r3s_q<4;H%ii#8bpZ^7>`^Asn8dmSVUEv<SG1m<5Iw3f+TPDh
z&1oMY`P)c?oVkVt<jD+&CK?b6yN_o-v;}6B&Y`&#!LfjAqHcN_!3+dy-xIFQA{QkA
z;62t#ZS@lt?DeX8uI%ro1AM)l*TGVzWMN~oy{SjSe>@NmsS%xgNqwndR{Chi1>tgs
zD*=nh(pDJ+(D{bX`6xO$yJ!cLY)1n+<@w&pPOd;$Z%I~}i)heAu2{{lwH%%Y0|tFR
zZxqx~DYLeCf9|Er+s9uJV(9`KA$M5-11_G^kRU|{(lum4+E`#Z*Xg}+^_&y_t@-Ry
zQt*BX)XWa9-;O=wnfUgeB{VlCdhlQ~2dFxawZLVBC29G<4gybLhXyWkNcC%@EeZn#
zb(dh(SHzj1?lq{megW92n96OW@w$LzPW`uKq>$5%?45|yji{%+Y#KR}E4>83H43sp
zp-F(V;EUjQ?Qb-dD{z+S_dAG(LCA}ihrMK5eNPkjp-uM>Xl95mM_nloO~pXss1Oqv
z<;QzQO6m-qM0aFq%NNQ|qaimQ8L}0Y$+02_k!rG+(yj9U(VxWUOF(T`kznYzefACL
z+n9Ho!aX*c{Mr*OH_sv#Rso7_ISTkQiue`&$IHrquY+u5*I_%baZspZFzo^#^S%j+
zspSE+?|hO}$ag-er`sJGWu~QGPi17-a@|z8Y~{7WaWU0Q{v5#<ld-8qH$mRD)RS}X
za4RwmIj5#cLm=uxBb_q$QH}(8;sQ>eaLuI2huZmt1pODy`(9BvAK+cDM4vIO<gY8;
z#=Sbh9ewMCGi=YnVs#*yXGsrtxG&93wvGcbkT(W;B>WI$L6`q4v*S(H8p`^q)&D!1
z#P%)2e#@s;A_Wz7T(~szbdZ{C&uu4CWwcKDJWu|qD9sw`EbF{><IPeZS*Xl7B2E+^
zu09z}^o}eB22AtbfS~w4awYDCN@U+jV^%gX89yzf;pC|Q7N}Vqw(qjvreu#x?9fFG
z<qA$QT5wHsLJxkhd~EsklR%eL;H9v|l|(hOz1jb|ab;nvv0`;J5>du?)VrS{Z?yfr
z`^kJS;{-$l5nvukF&(f^26);+j1h_+A6xcA)bGszL_+0wV#UiDG|!Lyiy5AvzxQ9g
zkG-6)&zzFfmAa41bO-`A;AIlZoC%G#Jj&SNARTvW2SK~nR><YeEi_`vDaFU{EV+%g
zD98upaNC0m95~ApkSy8BH&dolAVViAqqoCmd@h<vrwE~AMxAlvti{hlwK0ak)skJg
zLC`k<wqG8R-CF1d7j%Lse%7dw4o}dvQjS=YL<SeW2+%W{R=z2{d}%=fC&oCn@BW5w
z{~hs=C&LaEUs0E}_zcpYGn-#L_cp%=M2q9a(ub6xxgiLC{T69AVvd;knu0uhlK2~}
z7|a;0TMI2UciC!k{Ys07Eq4-Aomm25=mlsZ09&<%JNM;;0;0*U`Cj(cy5&GQutW}w
zHI9JDL8Z@i^qBhVCMb{aV_=*itPtJy9Nh~Sw#V4)5X}2t^P>CeV9u8^`6f;HvO6-;
zzy}>(sO+T;TF1*`oawhh7oJVvSR_}yPr$3Do3|h-$>99i5EZVS$~6jwW-lH<(g2XO
zi|I@lw_p-YCW-b>U2L=leU9fZf}a~l6Bun(DvJu-by8Z5<j6%3=DdIC1@z;nZ$lO6
zZ6_?{5TIdLtY-VN-JlN_UvSQ+b9C6FCnZ`MU?^#G9>Vk{dqCN;bT>mTw+iKF*Oimh
z#1kbib4~t)hRr}Q$U>B@DwZMO#s=6h!PX(|i-d}Rsz25ufoGQHrXBf!GGHKSV$GUj
zM~=j_^nd3bm(kkXJ;|p|!r4d%Q+1jCLD4_71ilvVFN8*;D!y_cSS@s?%!Fpt71R9j
z<Twm!EWUXcMeDl?=bn7Ue1SD9^Y&ZY21;akl+w;4&|A*-n(yhO$>J#%9|8ihwB6Gt
z0~*|Z%WLmP#>FfhZBF}KWeL8>RtvnekN=Az^tj+;WtzBvh%XhIqM~$6AJr!(T9px|
z)rr+`$bP2L4iIY#Rw;dnrx8#7W0@~eKdQOwX8VRS?IbkleIOL#{3}|Vc|(?<Zp7~5
z+d{-n6e1W>%q*vJxvQQUq6aWVZ_%_&^T>WmYgJ3oD~A(;RQH1VwJ?0ZTWRVzeRJ>%
zlr7OPa8ngKsZwE9+Nn2X4v<+`?h|(m7G-QK<hm`TUBzt;_KrAVU<P0PpbQ#S@8Bdi
z$ewd{ytonYgj<9Il2*GZ?aTofNBh5HMRtU@CcU0Y-@9~trU9_PX@I&_slaw(wOwk@
z!-dx_oXln}HLiFzXpn0}tN$`d<0L$=y-JpPqDW8p$Nz`ia7&5IkAg#)<0X+i4*c(b
zZ*kfKN5bf0l7+BB<fI{yyrO=Z_I~W<l%1Yv`q?X2m=8f7w{y)efl_Mo)SOuwxMr;R
zT9e=gPmu$94S$XBhv&_u1tMLMiE{K!e}z?>G_F@X)eQ!c<1YCyB|$%rbfxS;wrE}z
z0$s{kljiVQ49j$Epf=#UaF7$R6wrl^HJiWuEUR1ChH_sJ4b(5p*OXXWj`R=%1peJ7
zQ*`b$R0Z42VtyNY+rF~;N}JS83ihD|jk=JJz*GSYCmanWGb=oC{-7l0A^B(&1v{S%
zl6e>x9yI6VDOxF84JkwwM;57VARc6R#-Q-O7aIIque1$Yy=<7RQI2aEk&S7|MU;k8
zDucIFN>#jMDYgfmZxXzj%8zYz655n6PBB|5^chFXQ@lsYQ-*6O=H%g|Rq43q8x({t
zGKBy{8S9t}JO^pGL<><wo_q0BMV_Qh$z=srD;U~OC1XQym!#k?dv1)RQA8t%Bp+M#
z!y07O%kw1+YmHC;sEw|9i5Y)v{;@w~GjzUBgX*AEvL1dLVu#U9<Jof;PHmwVZ~DQ<
z>f_2u-wXV)W(yv@!A?j!A0;6KTf6k%Z!Vxd6$;XwJY$+FPbmv6ByyC??UFPW-fsf(
zD#g9yQ@vCF<cNw6Q0^IU4RU8kqNk7+TCVRsfw+5_=GBR%TD!Nxx>&h*HidlvTDDAR
zoH@oVHrhf9ZrFhDTEc|#R5ytWg9V3mLg5HCcGn6YNUWfYoU<19pZV!Xw6BuC4G`X(
zbITAs=6%4HV7@r#eAU7R=h1>$gi^se7WvwPuR(F<@GnvsZbfPdOZ}s%lHB<9h~rwx
zPeBASfyfzQ(&R)zKynC^^w+y{I9fvW3)z_~<dIZ#BRND91!Pyukq=`ZhQE!hZq{}*
zv)w|Qf9soe+@#_{$IfzYPV~282@r|)G~u0XRx4A>sUGN<OP5^ZAXgO{jF*FSMTFN~
zVoo{WI3OCs^IGj2OjY{7udT<%;yMGV5$R=$?^ej{egr+1k7X2{ntavi#7Pw{Fyhae
zud-_Kq8NYYA((PH5(>r3CSi&TzqG2?o;#u%7&9(L&_QYsE+cn8z$$zXtBJ5hF02P5
zd!yL{#3p?S0yu@9I(!s@*^K3hl=U7*xxgw0^BcZa(sd%(_P1L2FOwoP1JI*~{Dd~1
z@20Yno(P7q!U0IT_-)V(w-1q+2i24xno`z4o$pow1(MjT?*<I*1Md(I6!gEULEEaz
zT5ONov%{>V_;MN;0A@L@<b<4Vcv8WT&g9zqOhEnTi$YyxByh2~u@#VCE7{mosw1{#
zHeg8M_HygeCbh^@Hnh}&uUG_=5h=GM=Kqf`xftE;;^Ci4Ee9|hZ?JWq^6hTo1FFN2
z;6?;!?V-=5wdD{~`&R}^h`h0hMsVG#;K+#O^{$~9%Hq4#<1b;3iMy?DL3nY>?JjxM
z@wiAobvI**ILUa}xJ+`5{SVj*h%vC(UN;LuN(66>uXi`!@fiqNf!}<l5-8@?L%YD(
zX|F_X_$$`mYz#fHFSkB{Ox<0-d(8O!py|W%?6#hDWY0}ExN3*Nqg+Mj&%(O9Hz!;r
zSL7L)Rl@gh02)&wK7Y-D^2+qjO|0Th{4v2~m_ys&lU}ziw(PQ1RqSN#z#O)`$ZWXV
zqh=d^8SahgWr$xA*`pm6WTJ7x2_7E3*-}ST>|W~}2bav2%_63w^;m$niWm#6*6Iq6
zYTo`H^T);wz`m`{*?0ai{`K_}<f)t6;A;?<!q`8D8o(LGwFe85knvLrZAR2%GP_uD
zr0+cr0X`+W9ki6!UDPv-0wwNI%kod#^J(FrnzQv~DlX;>Op=YeTw(q=w_sLe-4Ew(
z<G@sVj*HZq@sLrk2ICN}PNSGr(ke-jIPiV{;Ju#*<+6{{8x23!uZ0cM-P=F{F};(%
zKHwZ+d;oQMdKvHd*<ruyt!SsB9!sU(m$3SX-cNBTN|L>>1>Zm4Qm#JUmn2&@ihk&1
zsnzEf(h(JB?PV4?U^N|UcdqgGnx{GX!LZBrjTz3fTk1uN{5dxV%`r6EouxnuGt#}M
zmj^$6JLuR8z!SOBE+wzQn;6;f>q>gf*ZMOI7zB(<3Bt$(39;wiFL!@Ex?>F~91bBq
zl)0n_%fyZ7SOyL#8fOxQ$jc9uk2Aw%wB3eem^-DIpDt^X*Ef>Uz_{=3h29L=M|~(I
zTCDkO0i*Q-{akL|=L<k3tF6}_vOF6vq=K!ouqdYwHR0_M&MCudDW@S8bbKVtE8zj&
z+5l7=Mm+Or@;vk!d)9N&=z%m-_e%Ci>uAaYprC#WzuaNDT|ONDVB;dGzR&KJQCv>6
zv-Tt3D5o*qu<iIZy2d^`Rt6fw*ynV5_qty)k-lfdKhiGsZ_{5idLbPda>bDRL4*#q
z<1fs#X2HaSpGL}awCyu$k!X`<ZIR+$qyQUchU(2sOMJTHU!r)PP8ZX0Y%Wx@{mZyW
zv^Jp}PlPvDE}rS}hX2bA{bQMZ1$E#$s8Q%$*jz$jYRl`1x~3e`RtV(A6NYvn$EBD(
zICQrn%xI)uxlVRs8?=(J@(YPkk0CKC3n(RP9l_Il_e2i=wUZ#jFJLvbDgmV5){qSZ
zT)}MjUZ1^{+9weqgH&}(W;%>Ig@w2SV3>Wg`UGQiMQR-mP}6PH_oKCk8*%3B`*xFm
zUPA68zqE67pi)xhKR0Y%;9&f;Vlbw&0j&`r>Y5XHuu#F!hWzcI-ZTP{!DIhy=n<I|
z1$Ni0MOPjN+nLP$kFtM{02=TU_lHNK9czN{jfG4$um|k}`l<EHZIxfuZmr@n%8A3s
z%=+<e9`85KSrFEyRJ|o6X-K5*4XK{;@>xL!n5u4O6I7BRv6WIj6AcGmEr>!VIgL~n
zVNX_pHN7o#CpF=b7w%FImAaKT<}+UisSN67Mq4`8u(DoqJur96^%fvrmP-=bppu&a
zuVPuLLf^X4y7xR4vQaWV{nwJF%}$){|6oQcrpgpQq)`^xM8;T4>Ct^wly(Q<z1*&U
zlr%3^O2Y|!5sG`^Y0jW8kVQO<(Xp|3BPr9fz*eC=5F1ytm=pWc&(o;yMwe84nj~7M
z90*}`d>oEfZsT4+G<>S}6eORG-Q+jSOtjt_7l0;j!!qLK_-2_ZQ)<i<juk}(1+IAw
z%(ekoUE*#2o+^$02D=$<(lS@3qkqfKFg>{~TUmjckw*Fz3yk>-d6^?0C`C6?H?gFH
ziJ~(5_K{r<EaFSNMUrD9$5^Ur{oy(6esN6x!n#eJ+6@57Pp9a+w^4&~K;(AicWF^j
zB!n#9_8Z>nlT=k>!QIbnhiD{q$R)=5wSkOnX{HiiejB}w1|%tkW`%`=$G`G&elL)F
z2mAa!Sy?6p2;}#Zy|lhJ>}WzKjzS`2|7X7lQ5bU<$0Dz1*~S7-&5bvn``vA_AiW6Y
zWs=zjm_7><J?^f4EhO)th1l-jS0T17eQPA7_jw#Gi)r=FfOX?yb|s2WWa-KfoJ|MC
z>&U*#@q^3Zza)cpZ|K^LGb5f2wI?ujy6ttZCv*j67>aj7^2Q_5%;$PxbHxzs8`?CT
zBY>tWQ@sGkr|Get=l!mp3|d4?YS<u*+-y_?JlJmFy0vI$MP=Ec+V5D#J^RgV{p`?~
z%8LKzB+|8>wPol)#bA6zHwF2?=jTW%K9>fvp9vNKFPAvm@ZBu9aECr^A?sK$r}P6O
zSJ5_Z7@pgrR7%kkH<@JJI`iB2abiC$0xe22YicL@k;2Fyx*S;xLSv<GmkfFtFN{YI
zXfz`5!l1Eukqvu<W;p3crP{1PnzLKKk~{m(pom+RAry-<Po*4|{<=gnktR6cTxyy(
zic1a+&`MbO19m{f_V4c2<ogc1WnFR>*c{q>ylJmhLFBu}WwS-{BQ$~<o5urRa|eAd
z+A5{O`J4|Tgq)4X)f|d?_0yTU1p*lWLu(JK<Qt&T11>u#Q`=i=K#LA}oKKq^<nY?x
z%>*JK_RrsNjt2S@6JMzuFwc|6kwau<$TUXz_=0Kp3Pf!j9|t+K*f*gc$u=LuO6*K@
zo0OT9+%sKFyL-a-8xLJUFzL2xg7R)O=%TgCh27g)IJR-$?bIT2U3W>SPiZRv7|92n
z7R}yW3sTXl6}IwB?QkdZYggdg22=MfvcS{!b9WteJ^{yY)QzXz<Qjac^1_m9x^|X>
z>B*FC=*^$~GVG7w2Lkb#{=wd=e0PE2EI)s47oQaHr>%}fvnTyRTi7iXQyJ`q9WF8M
zQ?24WRAv_d-d{-%?#-<W1s*2=Z#~bjDCbb==}aWm{_rRh&iIY}j)t+&t|udQajfif
zk4tFr!OX};iMZ<|)#80=$4aGiY2m!T#bhaq(d4gWYJ6kD*WO+{IMC*gsPOoIYsG$7
zC(0knNCq8WO?h7j(%ChPMM_crFw}aV3oMwpEaf*3%w!sK@9Ns!JU`w5a_MuY?avye
zL`5*bEuyvs9RW6%IpT_kuI<%1_6pC6lG6ZB@}cR+NM88nQRg$Q{VMP)q6z$(@?lVW
zpF`+AdxpOp&9;`lD??mqCiQ-X#av0ADunS**g!+jHQ$FKAoYb9w;99W1ZIHmP=RbX
zw3BezJa!?3o0A%}eV8~P$|jO@<_}tNJ<%~Mtb>wfo%SV=CU+o|xAg2_R$us0h6z%@
z$<^lUM5e^$;;u0+(am@ruFNvse~l%8kG^?a>e~|SxhpJ3o)%9ap0*;qvnqp_bWDe8
zu0(;)`O!uZnioM%3CV~~k}Jm;;JLTK$OQMKgFT7YSEPp0QLzCK_#Y(uzl|3Y(8%UI
zu^ZPTi2Of$LIO0wyV~yk#r)_+$-C-dk3ki%6J4{Kze==8Q>49HQ|`Gew2k5LF_|3^
z$7YtGX0@}-(CE*P*^Hl?(w1oc1hJ@#Z$7eB)S#PyFIh#G7}2D51c`^#%Ig086X;?W
zIg3eUya=dfx?+V>Hq-`{*ri^JiKJuVg{%Ll6MSKGc=~Hv-1JdrE?uo)73ph=C_-Mq
zBeKDiSfzQUg3-T>Ox?!UA!fHZ=YnED`W=n)39od#F{_#>_O%@--1I-id9d87n=w%w
zp&JKdCz=4WK*Xy78S2&<0NHR$2i5<)cIWGkIRbbOck}WI;X&1$!`?6Dbbal{GW|vQ
zX-C7(ZWgQSrITlLh?qLVyDO>Qsko(mmmlFrp8NifSdHdd^-Is0_ye6I#1g-vA>6m^
zzSNzlsnD(dkkeqA)p;Bb;)!h5+@3D(F6-P=6>cxscIY>ji%-6$owlKL>_3m(eagRI
z;JE;;y6od|W%RQ{>d(%5Cm?T9Y76=4Dm*&63%ZdliSV5FbSrsu{SPv6&x5eu@n|l|
zi>8Vtmz5C)TOmx8ce%NdeL-_hzkH($e!Ko*?YD(u437XZsyzx1_;f|xy353;IVyNS
z&z+Ec=KG2Vbf_Gpo%O^Nbf<;8mpG$TfE*xZ0<v^E2Hxy19-k{t1s|3DW-Qqyy$H=@
z)nPRHpJDAIsMC#z4KUxg!40tDhDNv|IJ{Y~elRNw1t8UHvtjrficPG!6JV9BYLv*~
z0BNN^P^}12j$4-xP!ClMaQr25<=Y-2@9A}tH0Cvmv@UwSS{UA?g<a8Ec*bT*TMh7a
zf6!TeB!@<j-!aiuk*6|9SBgT8?QIpmbH`t;AFwX*;9}^zE+G$s`d6i_Z8)}xsc6(9
zbWe<w)s(>+vbS?bSu`2jvyzMdXT`TBvVXl`s~!0f2NmQ>3oTcA6V%xzQr!<Baa4)a
zry15|LAm>VHCV-W&0(@$`~9fUy&dqkWNw8p;~ZZ<A-Pbag0k^-xu@L;=kf-Fh>&mI
zn~sv;eCRSXkaPxCFG=W0o^i~NtWiw(q7)7P2RKikHl5S+Up**N46MQx5b36FO)Ziv
zfwzmkq3KVK+aL~!(n#|!7<C@=f&n~PbeiWp9Gy{>{>z_7t1{iAD<zfvwwHinonlOR
zd1IO-kUXH3V3+NW+RRfM{GWv+Qi6WeMc*k&qwB}?3V9mk{djtLZL!=#?h2Jex)Wo0
zhmqy<ns!@{&F<7w7(_Mi%K%24ZcU{<&K;QWJ<5ezyKpKdvLBG|8KPc@^r|(d$^&j+
zWzc&jVl6-8H8Ezk6hgzx3)TQX>ng=u=!ETRdN7pAq+;R4bD<Y8AJ1c%savZkn2C{4
zYAS;}u;z00alG~vsagKFMV^_|4xD0;VGJB+HCBK3oQ>tbt6j6#Wh@$RTRb_?wGng?
zzuO@6dMJ-B$dWE&WcZaO#J=<7r9ruP(5Lw)>v)_h&P4O#>wue|96r7&1ucbJKZ0X0
zpb`;~6uWgUjd=r64i-469QjA@;9I;o6`sMtT@?zQL$QoesFzInAb*eg-w5dMZ+~f_
zTee0|$W^^bC4WC``@?zjFV)Jg^Bj$A-^b~b)+op=pGR*GF0k=e@`W@!i{|&%1wQ!^
zcN?!OCUVv(M8KImypgJ-thHS+EGJ*w^hTQx6a?a#y@M@SNZ}O%Ok+&ssZ3)-UZWsv
zBC`x);yFWuETLwR1;NZ+Wm+(Hj@9R<%qy=IP0IH1zLbz8eDTzPd;wywt(^OS9L>yR
zaU!B@F*7gPB|qVEJ>o>GD?+#H;G8lhM{9wU71I=0D*(0!B%RpLVoGb2f*kw7)V8vS
zu3tPpXgwM1xI8#%eRSk<5uIOtQO57Mo%YwNW@(#pRk>}pzv9clw_tz~#_^(zp3BAh
z8;V2o{|N^S`17Q8k_G7=39Oy+GUT6=M|N$T!O}Gs<bhM$j8cy?d8a>!iJ)J4l!l|$
zG_L7d`6C$+6db^R80D*VP0z-q6koE9HQ5@M{;;I+-rtiw4{9B{^KA8Gzr|DkwVdCh
zwJjxX&R}cYR5+UCl1oo}>2D@_3tbZwtlR=Q>Lc}zep@N%3JuQS)!Co`+Qy{RZ7D#?
zG+p8$Qbx-F_uhfm43;U(fRZ~B?W!;m3|<Xav7%WDfU6&Wm-;A6JzUw*+P_Fe>$#FE
z>^Af+k6U(^g;7GdQv=_u7`d;$RAEARCc)NB;rAu1WLTFkBEI{-)mxq17K0e&MLY3Z
zos7agq#JJ#dEeyCC2va@-pOvdy9<JaE%_??64-h<Jyug?P*m!40|i0pH<F0!CEuB-
z`XIXoVkVS-a$U53R@e)Tp>xyD$$u*nya*CWh|X<<p+LX3fv&1=5dRz~jCgLF!Q62z
zaMT;OCWLx)uPDCpOFe@RDoJ(7O3(yJ$934ndTSl{@FpunMT-?v43rE<4>E2D6kCq|
zHZ&)O63)4er-QGInGZgGX_$Yvj?m=B1<XB{0va}dw`PobgcHGE{z)Ls14Wq9&U0W*
z>|51>q^$NuFjJ}9Mx@Y^Sm7uJ@l7poA}h2Zrpa#YX0FPDUSi>|K%VE?<)_$zr64ZA
zE)s6Ejs?umjcb9V>fG7|sxDd(st31eeh#{}q`z~w3F0xiO-86gIPurZKZy?>Y5tL<
zIUFi~6nG;<&d~uaFy!Nr%oUinHyvQ1xI1h>$`TuAqAqzcja9|CYJ|Ud{`pDE#q*zN
z)Q=p)Ow_cSR><yh2VZODOd9xFt7O&q_4@Z0-diNZrg?a$s|-66{A{16S`$&5s;t<_
z$hjYK8rD7rKX6CPg6WLqWE@zi2Jvqn`DRal*XgjGQ_ns3HOok4(h-$8PNC~JrETK4
zYg;QI%W}AgC@B5Hv9AU&_N_UmOa1+rcHzYz4dC(GXZ)TM6k-qx{6?q~GQ(;0=)3?a
zLhO<-ayyi@1642;*5xPk4;=8*>%abm_m;aer1l<!v|{qT?Z->@lWk56r_;*wybk1l
zg7M9vT$!96_JP6n@Udn~XhTrn;xZVd0u2YvUfwP)vxjZmU6LU^xx2u&6h`hYDG&*{
zy9A?6Q@GIG<&>O4Q@khpg*NLlm@*(O^$a%m?z|O_I18{4u7896jZ1G!G=m+!9bv#o
zLsqa>M&tT~8Y`!}V60l&?;mmyF9p|sB$>vQUq-Sch6><eyOZI5g$l?R9!5Rj>2;|W
zM*<&G&qNe<b*DPK@?s@QCKNhKmL0AU=-NGMQZ64zccaidsZos9jyz6g!cnc_R5FtO
zZow0JU7j#*B($~p)W2Ox-|oBLti?xU4#H))G2bVWGKL3k(xTJ*Zc2$Zwq8Sj7|J3l
zt<2d|xI`%{hqZE9@+VP!m9`-N&O`SDshr1XF!Wq4i8li~DuEQ3!kBcmxS`6)eo7_f
zdaT)~Jcae}cQP|?trC2@>;ng*TsJ%AP~c21LFJRW_l_NNGOUVk4wtyVEw~4lZbo<j
zXYz{!=eaun?98TZ&0y_57x4Ihxp~2_qR);-4{1Ul5IMupAC5}2*RkQ7uB@rmeq5z5
zC;M9cbAoX#r*~Gt=sJT+sg;wN7F@&C{9Oe{SGI(CtlL_tt6h~~_~|O4pcK@m769ll
zCz2;h5}>nNSpr>J-O|ok=7~CXC@yQw&*T@98#7qD&ILShYMW8&an4MC{s1PDt~tGK
zuD_FU+NM5^WS)kPK`xH_G%`sipWvTp>U_LD6qtK(a73GQLLQ_F*deB0@xg+kK2Iuv
zR#A>rg0bKJ*d%?6M+wP11xIV^?Y*aM`F3vwadAozE3_NC*04PPE9R1ulq5LEBRR4M
z4M<4V967)dcRC;E$`}iO{2=fDyOJ`Kki?by^RPsiRk_0Il&84mihWGO+&;bj5WX=D
z-{RZbZ5lq+`?fNxh8ea!a9jAIMEF%ni2<F4ANUd92<>YYW_&u<cu=n(%LEVNl6jl(
zUfTrvd9BG?A?5sSd23)^1ajyInziqRlee0HDIag*p`c9|mt~iKO_)dSxM-_QI7t~N
z2ya#pYpB2fBQvR2C7ZV!y_9TZFQONuEv1sZ$N{3u?L|CpN3?xp!1c|-1;fLr=T@a2
zYCaRxo3RS7LrKD+qh#IV8gXZ#UAP3S+QTl)55m_sB9_S>#uRZ~ridefZDbZE(zjc0
z6QJst%n?Vz-+iNhXdDT0`%_f7s<quP=tVJ`=9ixMl9HU;l`2s3U~XXafmUsGe&E?u
z81%QLLM)c7nF_9$ZS#{+Zd2coHg%%Kyjxo_ovpH<mx^tDAxHUNpfcM8qt$Hz_LYzf
zY4Iy4vkx;Dcu&>2wb%KTRs*KTUYqu3Ra+X>c1w`u=VF_G2B98d^6h@<C-K24iU0C1
z*Mp&XiZw>NLVo_Ev~5e$*E%R`Y8g?#=|LIR!nDs_6{|9La1AOjQWX=pGN}*4CURvW
z_nJyd3&CNWxW`zcIOPIGVV}4;Pn&u#Ymgj0efzU!vgGCkF8y;!L4bQG_%-NXu`}rd
znh<e~iaRMyJyS(Bgr2UVW7%&iZnCbP+|&X_PLia>nC75V4CZB%w2H%JDGR4{^RtSZ
zws8ha*IbYX#<m5e9%tr(hcJ;x+JCfZ|NQL#2gfZ!Mwh!G0aO7vmk=TWN)^C~>%`d7
zc(yxZApAkKIa`2Z8Il5*Zz2IbfBsCDFQ-6f<u1_su&v7L`q?wYw}l{_JHDp#x+}Xt
z9HaBl)=$kQv~Zg>^=1(|PiNx^U54jwO}{>Ow~J(3Ai$hX>SKr6Ab$BmZ?Fi*t|dC{
z&B_KVl#zC09dm<jhE=L+2uL4h_k{O$oTJqkV{T(xgUfZ<hM1C$N6WiEe-@wa7vHD1
zb+@lJbXk8tR-1Yo&{A?u;gj*#BlOjAN2gm9RCO;`cXS-uO*n4LV;4<YkD0=0O&3o;
zy670a*?%UD>KLi1PF>x^6M38YW;$Nhx6|=`c^Z<_@d`aLMps@iErnMM$II9nXR8(S
zmg_8H$Js3Es3qx<f*4gK6}47g<MfhfUPb4PkV!P$+aiZB#v7NvBLOFWt?x@T1^3G8
zSTRu=?_8KEv^Pa6!6^9h98t-02}Y&Xh%qddkn*0BY3}<$<YnR0Omsh=K7hd>aaGPv
zMtNmy7ExVqY?z595m=_J*BKaV<LHJg=sy`_EZSrXr-m+_@fW!fEiL<9%L;!{zh#)4
zW`i-8sna;6-swCgiwU29V+e_XWd|T8`mQ6m7B6iV9;e5@>&OBTduRM&Ga@iTQCwWN
zw}4H{Z{=h77ieEcrnqt-o~y`2&c)MrYdSfUJKS=mw56kXkGiO*H|6OrRJ(m%<r~%|
zS32#=L$w(lcZWb2U7+YcQL#%sgboZhu*sx41kjScV2!Y=+OBzj`7qknKf*`)&}>74
z>-=F=9dGt!g8&o!KBD*2=@1@c()U;Q;jh*0=-a1dxvw9~U#_jm*Y=e`?7MqBshYNn
zxd^Afm%XSoT~*s|-}=H?q7<G2tP4^VU}YsVbTT~>#2_tX3;1Zjh*@y0AjwYyr6%i@
zGRaPY#Z>`+>xdSA*pCb$B1j7OA+|HnML(78E*>ch#D!jAUja~try5dC=E7FFJ_k?r
zM7fCmI_6S%%hZ#w;(`^Mrx2&|KM?in#50;OqAL&z$ie~a1DJ|4kjxt(nM)wS?Vo`p
zCB3iO7MMr}lIisVOzz!BCw>ZBe6F4lmDAs<ZR<1r!{#Rhs=D{#m**t`CYKK)0Tq`b
zCIKWuGBP+}WnwdAWj8ZnI5smeI5amoWi~TrIXGrDGBPk`K0GloW@9)oG&VCcV=!Sj
zV`VrpVK6XaGh#7iIWaRbVmFtFCIK#0Q4N4F420qT7-NHk-~mM700X!{1}>065QLP$
zn)cyKbC<LLr3fZyAb_-tzRL{a**qD{#%#?jw0axO&P*c3{~CGswiowVljEvi<`<h%
YKIWVWgqI2@0W1nNGcXDzB}Gq03L8*N>Hq)$

delta 52552
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
Q0W1nKH8%<+B}Gq03W+WA00000

diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
index 69e6b9f8a..43d5a658c 100755
--- a/document/database/knowledge.a5er
+++ b/document/database/knowledge.a5er
@@ -75,15 +75,15 @@ Fields1=USER_ID
 Fields2=USER_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,3441,6398,4308,R,R
+Position="MAIN",0,3607,6398,4351,R,R
 Dependence=0
 Caption=
 PName=
 ModifiedDateTime=20170831112338
 LineMode=0
-Bar1=344
+Bar1=361
 Bar2=640
-Bar3=431
+Bar3=435
 TermPos1=R
 TermPos2=R
 
@@ -100,12 +100,13 @@ Field="履歴番号","HISTORY_NO","BIGINT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="アクティビティ番号","ACTIVITY_NO","BIGINT","NOT NULL",,"","",$FFFFFFFF,""
 Field="獲得のタイプ","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="獲得ポイント","POINT","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Field="獲得前ポイント","BEFORE_TOTAL","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="トータルポイント","TOTAL","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Index=IDX_POINT_USER_HISTORIES_INSERT_DATETIME=0,INSERT_DATETIME
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20170906092459
+ModifiedDateTime=20170907135513
 Position="MAIN",3500,850
 
 [Relation]
@@ -117,7 +118,7 @@ Fields1=ACTIVITY_NO
 Fields2=ACTIVITY_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,6576,4612,4384,R,R
+Position="MAIN",0,6576,4612,6570,R,R
 Dependence=0
 Caption=
 PName=
@@ -125,7 +126,7 @@ ModifiedDateTime=20170831112218
 LineMode=0
 Bar1=658
 Bar2=461
-Bar3=438
+Bar3=657
 TermPos1=R
 TermPos2=R
 
@@ -157,19 +158,20 @@ Comment=
 TableOption=
 Page=MAIN
 Left=2450
-Top=1100
+Top=1050
 Field="ナレッジID","KNOWLEDGE_ID","BIGINT","NOT NULL",0,"","",$FFFFFFFF,""
 Field="履歴番号","HISTORY_NO","BIGINT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="アクティビティ番号","ACTIVITY_NO","BIGINT","NOT NULL",,"","",$FFFFFFFF,""
 Field="獲得のタイプ","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="獲得ポイント","POINT","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Field="獲得前ポイント","BEFORE_TOTAL","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="トータルポイント","TOTAL","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Index=IDX_POINT_KNOWLEDGE_HISTORIES_INSERT_DATETIME=0,INSERT_DATETIME
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20170906092323
-Position="MAIN",2450,1100
+ModifiedDateTime=20170907135426
+Position="MAIN",2450,1050
 
 [Relation]
 Entity1=BADGES
@@ -180,7 +182,7 @@ Fields1=NO
 Fields2=NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4598,5968,5732,R,R
+Position="MAIN",0,4598,5968,5747,R,R
 Dependence=1
 Caption=
 PName=
@@ -188,7 +190,7 @@ ModifiedDateTime=20170829163644
 LineMode=0
 Bar1=460
 Bar2=597
-Bar3=573
+Bar3=575
 TermPos1=R
 TermPos2=R
 
@@ -534,7 +536,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=ITEM_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4194,5115,6185,R,R
+Position="MAIN",0,4194,5115,6199,R,R
 Dependence=0
 Caption=
 PName=
@@ -542,7 +544,7 @@ ModifiedDateTime=20170220204434
 LineMode=0
 Bar1=419
 Bar2=512
-Bar3=618
+Bar3=620
 TermPos1=R
 TermPos2=R
 
@@ -573,7 +575,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4662,4335,5351,R,R
+Position="MAIN",0,4662,4335,5353,R,R
 Dependence=0
 Caption=
 PName=
@@ -726,7 +728,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4320,4611,5405,R,R
+Position="MAIN",0,4320,4611,5418,R,R
 Dependence=1
 Caption=
 PName=
@@ -734,7 +736,7 @@ ModifiedDateTime=20170222215225
 LineMode=0
 Bar1=432
 Bar2=461
-Bar3=540
+Bar3=542
 TermPos1=R
 TermPos2=R
 
@@ -876,7 +878,7 @@ Fields1=HOOK_ID
 Fields2=HOOK
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4124,4194,3050,R,R
+Position="MAIN",0,4124,4194,3043,R,R
 Dependence=0
 Caption=
 PName=
@@ -884,7 +886,7 @@ ModifiedDateTime=20161206104307
 LineMode=0
 Bar1=412
 Bar2=419
-Bar3=305
+Bar3=304
 TermPos1=R
 TermPos2=R
 
@@ -1700,7 +1702,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,2082,5725,4629,R,R
+Position="MAIN",0,2082,5725,4638,R,R
 Dependence=1
 Caption=
 PName=
@@ -1708,7 +1710,7 @@ ModifiedDateTime=20150910042925
 LineMode=0
 Bar1=208
 Bar2=572
-Bar3=463
+Bar3=464
 TermPos1=R
 TermPos2=R
 
diff --git a/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
index 60893261f..806732a09 100644
--- a/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
@@ -12,9 +12,11 @@
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.dao.gen.GenPointUserHistoriesDao;
+import org.support.project.knowledge.entity.PointUserHistoriesEntity;
 import org.support.project.knowledge.vo.ContributionPointHistory;
 import org.support.project.knowledge.vo.UserConfigs;
 import org.support.project.ormapping.common.SQLManager;
+import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 
 /**
@@ -59,6 +61,7 @@ private String convTimeToString(int min) throws ParseException {
         return builder.toString();
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ContributionPointHistory> selectPointHistoriesByDate(Integer userId, UserConfigs userConfigs) {
         String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date.sql");
         if (ConnectionManager.getInstance().getDriverClass().indexOf("postgresql") != -1) {
@@ -74,6 +77,13 @@ public List<ContributionPointHistory> selectPointHistoriesByDate(Integer userId,
         }
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<PointUserHistoriesEntity> selectOnUser(Integer userId, int limit, int offset, Order order) {
+        String sql = "SELECT * FROM POINT_USER_HISTORIES WHERE USER_ID = ? ORDER BY INSERT_DATETIME %S LIMIT ? OFFSET ?;";
+        sql = String.format(sql, order.toString());
+        return executeQueryList(sql, PointUserHistoriesEntity.class, userId, limit, offset);
+    }
+
 
 
 }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
index 56f1c0791..988955edb 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
@@ -219,6 +219,7 @@ public PointKnowledgeHistoriesEntity rawPhysicalInsert(PointKnowledgeHistoriesEn
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getBeforeTotal(), 
             entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
@@ -242,6 +243,7 @@ public PointKnowledgeHistoriesEntity physicalInsert(PointKnowledgeHistoriesEntit
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getBeforeTotal(), 
             entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
@@ -290,6 +292,7 @@ public PointKnowledgeHistoriesEntity physicalUpdate(PointKnowledgeHistoriesEntit
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getBeforeTotal(), 
             entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
index 32b700285..bf811244e 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
@@ -219,6 +219,7 @@ public PointUserHistoriesEntity rawPhysicalInsert(PointUserHistoriesEntity entit
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getBeforeTotal(), 
             entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
@@ -242,6 +243,7 @@ public PointUserHistoriesEntity physicalInsert(PointUserHistoriesEntity entity)
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getBeforeTotal(), 
             entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
@@ -290,6 +292,7 @@ public PointUserHistoriesEntity physicalUpdate(PointUserHistoriesEntity entity)
             entity.getActivityNo(), 
             entity.getType(), 
             entity.getPoint(), 
+            entity.getBeforeTotal(), 
             entity.getTotal(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 84dce4acb..456f34488 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -5,6 +5,7 @@
 import org.support.project.aop.Aspect;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.DateUtils;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.UserConfig;
 import org.support.project.knowledge.dao.CommentsDao;
@@ -12,6 +13,7 @@
 import org.support.project.knowledge.dao.LikeCommentsDao;
 import org.support.project.knowledge.dao.LikesDao;
 import org.support.project.knowledge.dao.ParticipantsDao;
+import org.support.project.knowledge.dao.PointUserHistoriesDao;
 import org.support.project.knowledge.dao.StockKnowledgesDao;
 import org.support.project.knowledge.dao.SurveyAnswersDao;
 import org.support.project.knowledge.dao.ViewHistoriesDao;
@@ -21,6 +23,7 @@
 import org.support.project.knowledge.entity.LikeCommentsEntity;
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.ParticipantsEntity;
+import org.support.project.knowledge.entity.PointUserHistoriesEntity;
 import org.support.project.knowledge.entity.StockKnowledgesEntity;
 import org.support.project.knowledge.entity.SurveyAnswersEntity;
 import org.support.project.knowledge.entity.ViewHistoriesEntity;
@@ -42,7 +45,9 @@ public static Migrate_1_11_2 get() {
         return org.support.project.di.Container.getComp(Migrate_1_11_2.class);
     }
     private int limit = 1; // 1件毎にコミットいれないと、別コネクションで取得して結果をクリアしてしまう？
-
+    
+    private int calcTotal = 0; // トータルポイントの再計算に使う内部保持変数（シーケンシャルに1件づつ処理をすること）
+    
     @Override
     public boolean doMigrate() throws Exception {
         InitializeDao initializeDao = InitializeDao.get();
@@ -72,15 +77,62 @@ public boolean doMigrate() throws Exception {
         // コメントへのイイネイベントによりポイント集計
         doAddPointByCommentLike();
         
+        // ポイント集計は、今後は時系列になり問題は無いが、このマイグレーションの中では、時系列にはならんでいないので、履歴のトータルを再構築
+        reCalcPointUserHistory();
+        
+        
         return true;
     }
     
+    private void reCalcPointUserHistory() throws InterruptedException {
+        List<UsersEntity> list;
+        int offset = 0;
+        do {
+            list = reCalcPointUserHistory(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+    private List<UsersEntity> reCalcPointUserHistory(int offset) throws InterruptedException {
+        List<UsersEntity> list;
+        list = UsersDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (UsersEntity item : list) {
+            LOG.info("Recalculation total point. [user]" + item.getUserId());
+            int offset2 = 0;
+            calcTotal = 0; // ユーザ毎にトータルポイントを初期化
+            List<PointUserHistoriesEntity> histories;
+            do {
+                histories = reCalcPointUserHistoryOnUser(item.getUserId(), offset2);
+                offset2 = offset2 + limit;
+                synchronized (this) {
+                    wait(_WAIT);
+                }
+            } while (histories.size() > 0);
+        }
+        return list;
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private List<PointUserHistoriesEntity> reCalcPointUserHistoryOnUser(Integer userId, int offset2) {
+        List<PointUserHistoriesEntity> list;
+        list = PointUserHistoriesDao.get().selectOnUser(userId, limit, offset2, Order.ASC);
+        for (PointUserHistoriesEntity item : list) {
+            item.setBeforeTotal(calcTotal);
+            calcTotal += item.getPoint();
+            item.setTotal(calcTotal); // 日付毎に処理してトータルを再計算
+            LOG.info("\t" + DateUtils.getSimpleFormat().format(item.getInsertDatetime()) + " [total]" + calcTotal);
+            PointUserHistoriesDao.get().physicalUpdate(item);
+        }
+        return list;
+    }
+
     private void doAddPointByCommentLike() throws InterruptedException {
         LOG.info("Aggregate point by comment like");
         List<LikeCommentsEntity> list;
         int offset = 0;
         do {
-            list = doAddPointByCommentLike(offset, limit);
+            list = doAddPointByCommentLike(offset);
             offset = offset + limit;
             synchronized (this) {
                 wait(_WAIT);
@@ -89,7 +141,7 @@ private void doAddPointByCommentLike() throws InterruptedException {
     }
 
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private List<LikeCommentsEntity> doAddPointByCommentLike(int offset, int limit2) {
+    private List<LikeCommentsEntity> doAddPointByCommentLike(int offset) {
         List<LikeCommentsEntity> list;
         list = LikeCommentsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (LikeCommentsEntity item : list) {
@@ -116,7 +168,7 @@ private void doAddPointByCommentInsert() throws InterruptedException {
         List<CommentsEntity> list;
         int offset = 0;
         do {
-            list = doAddPointByKnowledgeComment(offset, limit);
+            list = doAddPointByKnowledgeComment(offset);
             offset = offset + limit;
             synchronized (this) {
                 wait(_WAIT);
@@ -124,7 +176,7 @@ private void doAddPointByCommentInsert() throws InterruptedException {
         } while (list.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<CommentsEntity> doAddPointByKnowledgeComment(int offset, int limit) {
+    public List<CommentsEntity> doAddPointByKnowledgeComment(int offset) {
         List<CommentsEntity> list;
         list = CommentsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (CommentsEntity item : list) {
@@ -146,7 +198,7 @@ private void doAddPointByKnowledgeJoinEvent() throws InterruptedException {
         List<ParticipantsEntity> list;
         int offset = 0;
         do {
-            list = doAddPointByKnowledgeJoinEvent(offset, limit);
+            list = doAddPointByKnowledgeJoinEvent(offset);
             offset = offset + limit;
             synchronized (this) {
                 wait(_WAIT);
@@ -154,7 +206,7 @@ private void doAddPointByKnowledgeJoinEvent() throws InterruptedException {
         } while (list.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<ParticipantsEntity> doAddPointByKnowledgeJoinEvent(int offset, int limit) {
+    public List<ParticipantsEntity> doAddPointByKnowledgeJoinEvent(int offset) {
         List<ParticipantsEntity> list;
         list = ParticipantsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (ParticipantsEntity item : list) {
@@ -181,7 +233,7 @@ private void doAddPointByKnowledgeAnswer() throws InterruptedException {
         List<SurveyAnswersEntity> list;
         int offset = 0;
         do {
-            list = doAddPointByKnowledgeAnswer(offset, limit);
+            list = doAddPointByKnowledgeAnswer(offset);
             offset = offset + limit;
             synchronized (this) {
                 wait(_WAIT);
@@ -190,7 +242,7 @@ private void doAddPointByKnowledgeAnswer() throws InterruptedException {
     }
 
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<SurveyAnswersEntity> doAddPointByKnowledgeAnswer(int offset, int limit) {
+    public List<SurveyAnswersEntity> doAddPointByKnowledgeAnswer(int offset) {
         List<SurveyAnswersEntity> list;
         list = SurveyAnswersDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (SurveyAnswersEntity item : list) {
@@ -217,7 +269,7 @@ private void doAddPointByKnowledgeStock() throws InterruptedException {
         List<StockKnowledgesEntity> list;
         int offset = 0;
         do {
-            list = doAddPointByKnowledgeStock(offset, limit);
+            list = doAddPointByKnowledgeStock(offset);
             offset = offset + limit;
             synchronized (this) {
                 wait(_WAIT);
@@ -226,7 +278,7 @@ private void doAddPointByKnowledgeStock() throws InterruptedException {
     }
 
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset, int limit) {
+    public List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset) {
         List<StockKnowledgesEntity> list;
         list = StockKnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (StockKnowledgesEntity item : list) {
@@ -253,7 +305,7 @@ private void doAddPointByKnowledgeLike() throws InterruptedException {
         List<LikesEntity> list;
         int offset = 0;
         do {
-            list = doAddPointByKnowledgeLike(offset, limit);
+            list = doAddPointByKnowledgeLike(offset);
             offset = offset + limit;
             synchronized (this) {
                 wait(_WAIT);
@@ -261,7 +313,7 @@ private void doAddPointByKnowledgeLike() throws InterruptedException {
         } while (list.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<LikesEntity> doAddPointByKnowledgeLike(int offset, int limit) {
+    public List<LikesEntity> doAddPointByKnowledgeLike(int offset) {
         List<LikesEntity> list;
         list = LikesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (LikesEntity item : list) {
@@ -288,7 +340,7 @@ private void doAddPointByKnowledgeShow() throws InterruptedException {
         List<ViewHistoriesEntity> list;
         int offset = 0;
         do {
-            list = doAddPointByKnowledgeShow(offset, limit);
+            list = doAddPointByKnowledgeShow(offset);
             offset = offset + limit;
             synchronized (this) {
                 wait(_WAIT);
@@ -296,7 +348,7 @@ private void doAddPointByKnowledgeShow() throws InterruptedException {
         } while (list.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset, int limit) {
+    public List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset) {
         List<ViewHistoriesEntity> list;
         list = ViewHistoriesDao.get().selectDistinctAllWidthPager(limit, offset);
         for (ViewHistoriesEntity item : list) {
@@ -323,7 +375,7 @@ public void doAddPointByKnowledge() throws InterruptedException {
         List<KnowledgesEntity> knowledges;
         int offset = 0;
         do {
-            knowledges = doAddPointByKnowledge(offset, limit);
+            knowledges = doAddPointByKnowledge(offset);
             offset = offset + limit;
             synchronized (this) {
                 wait(_WAIT);
@@ -331,7 +383,7 @@ public void doAddPointByKnowledge() throws InterruptedException {
         } while (knowledges.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<KnowledgesEntity> doAddPointByKnowledge(int offset, int limit) {
+    public List<KnowledgesEntity> doAddPointByKnowledge(int offset) {
         List<KnowledgesEntity> knowledges;
         knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (KnowledgesEntity item : knowledges) {
@@ -353,7 +405,7 @@ private void doSetViewCountToKnowledge() throws InterruptedException {
         List<KnowledgesEntity> knowledges;
         int offset = 0;
         do {
-            knowledges = doSetViewCountToKnowledge(offset, limit);
+            knowledges = doSetViewCountToKnowledge(offset);
             offset = offset + limit;
             synchronized (this) {
                 wait(_WAIT);
@@ -361,7 +413,7 @@ private void doSetViewCountToKnowledge() throws InterruptedException {
         } while (knowledges.size() > 0);
     }
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<KnowledgesEntity> doSetViewCountToKnowledge(int offset, int limit) {
+    public List<KnowledgesEntity> doSetViewCountToKnowledge(int offset) {
         List<KnowledgesEntity> knowledges;
         knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (KnowledgesEntity knowledge : knowledges) {
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java
index 2b68f5814..d3ffc698f 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenPointKnowledgeHistoriesEntity.java
@@ -61,6 +61,8 @@ public GenPointKnowledgeHistoriesEntity(Long historyNo, Long knowledgeId) {
     private Integer type;
     /** 獲得ポイント */
     private Integer point;
+    /** 獲得前ポイント */
+    private Integer beforeTotal;
     /** トータルポイント */
     private Integer total;
     /** 登録ユーザ */
@@ -154,6 +156,22 @@ public GenPointKnowledgeHistoriesEntity setPoint(Integer point) {
         return this;
     }
 
+    /**
+     * Get 獲得前ポイント.
+     * @return 獲得前ポイント
+     */
+    public Integer getBeforeTotal() {
+        return this.beforeTotal;
+    }
+    /**
+     * Set 獲得前ポイント.
+     * @param beforeTotal 獲得前ポイント
+     * @return this object     */
+    public GenPointKnowledgeHistoriesEntity setBeforeTotal(Integer beforeTotal) {
+        this.beforeTotal = beforeTotal;
+        return this;
+    }
+
     /**
      * Get トータルポイント.
      * @return トータルポイント
@@ -306,6 +324,7 @@ public String toString() {
         builder.append("activityNo = ").append(activityNo).append("\n");
         builder.append("type = ").append(type).append("\n");
         builder.append("point = ").append(point).append("\n");
+        builder.append("beforeTotal = ").append(beforeTotal).append("\n");
         builder.append("total = ").append(total).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
         builder.append("insertDatetime = ").append(insertDatetime).append("\n");
@@ -366,6 +385,16 @@ public List<ValidateError> validate() {
             errors.add(error);
         }
         validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.beforeTotal, convLabelName("Before Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.beforeTotal, convLabelName("Before Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
         error = validator.validate(this.total, convLabelName("Total"));
         if (error != null) {
             errors.add(error);
@@ -437,6 +466,16 @@ public List<ValidateError> validate(Map<String, String> values) {
             errors.add(error);
         }
         validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("beforeTotal"), convLabelName("Before Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("beforeTotal"), convLabelName("Before Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
         error = validator.validate(values.get("total"), convLabelName("Total"));
         if (error != null) {
             errors.add(error);
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java
index 93268628d..800244f08 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenPointUserHistoriesEntity.java
@@ -61,6 +61,8 @@ public GenPointUserHistoriesEntity(Long historyNo, Integer userId) {
     private Integer type;
     /** 獲得ポイント */
     private Integer point;
+    /** 獲得前ポイント */
+    private Integer beforeTotal;
     /** トータルポイント */
     private Integer total;
     /** 登録ユーザ */
@@ -154,6 +156,22 @@ public GenPointUserHistoriesEntity setPoint(Integer point) {
         return this;
     }
 
+    /**
+     * Get 獲得前ポイント.
+     * @return 獲得前ポイント
+     */
+    public Integer getBeforeTotal() {
+        return this.beforeTotal;
+    }
+    /**
+     * Set 獲得前ポイント.
+     * @param beforeTotal 獲得前ポイント
+     * @return this object     */
+    public GenPointUserHistoriesEntity setBeforeTotal(Integer beforeTotal) {
+        this.beforeTotal = beforeTotal;
+        return this;
+    }
+
     /**
      * Get トータルポイント.
      * @return トータルポイント
@@ -306,6 +324,7 @@ public String toString() {
         builder.append("activityNo = ").append(activityNo).append("\n");
         builder.append("type = ").append(type).append("\n");
         builder.append("point = ").append(point).append("\n");
+        builder.append("beforeTotal = ").append(beforeTotal).append("\n");
         builder.append("total = ").append(total).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
         builder.append("insertDatetime = ").append(insertDatetime).append("\n");
@@ -371,6 +390,16 @@ public List<ValidateError> validate() {
             errors.add(error);
         }
         validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.beforeTotal, convLabelName("Before Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.beforeTotal, convLabelName("Before Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
         error = validator.validate(this.total, convLabelName("Total"));
         if (error != null) {
             errors.add(error);
@@ -447,6 +476,16 @@ public List<ValidateError> validate(Map<String, String> values) {
             errors.add(error);
         }
         validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("beforeTotal"), convLabelName("Before Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("beforeTotal"), convLabelName("Before Total"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
         error = validator.validate(values.get("total"), convLabelName("Total"));
         if (error != null) {
             errors.add(error);
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
index abc0f842e..28bd6f6dc 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractActivityProcessor.java
@@ -118,8 +118,11 @@ protected int addPointForUser(int targetUser, long activityNo, int type, int poi
                 config.setConfigValue("0");
             }
             
-            int now = Integer.parseInt(config.getConfigValue());
-            now = now + point;
+            int before = Integer.parseInt(config.getConfigValue());
+            int now = before + point;
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Add point [user]" + targetUser + " [point]" + point + " [before]" + before + " [now]" + now);
+            }
             config.setConfigValue(String.valueOf(now));
             UserConfigsDao.get().save(config);
             
@@ -131,6 +134,7 @@ protected int addPointForUser(int targetUser, long activityNo, int type, int poi
             history.setActivityNo(activityNo);
             history.setType(type);
             history.setPoint(point);
+            history.setBeforeTotal(before);
             history.setTotal(now);
             history.setInsertUser(eventUser.getUserId());
             history.setInsertDatetime(new Timestamp(eventDateTime.getTime()));
@@ -155,9 +159,11 @@ protected int addPointForKnowledge(long knowledgeId, long activityNo, int type,
         synchronized (lockKnowledge) {
             // Daoのupdateメソッドなどを使うと、「更新者」が更新されるので、ポイントのみを更新するメソッドを呼ぶ
             // なお、記事の存在チェックは行わない
-            int now = KnowledgesDao.get().selectPoint(knowledgeId);
-            LOG.info("Add point [knowledge]" + knowledgeId + " [point]" + point + " [now]" + now);
-            now = now + point;
+            int before = KnowledgesDao.get().selectPoint(knowledgeId);
+            int now = before + point;
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Add point [knowledge]" + knowledgeId + " [point]" + point + " [before]" + before + " [now]" + now);
+            }
             KnowledgesDao.get().updatePoint(knowledgeId, now);
             
             long num = PointKnowledgeHistoriesDao.get().selectNumOnKnowledge(knowledgeId);
@@ -168,6 +174,7 @@ protected int addPointForKnowledge(long knowledgeId, long activityNo, int type,
             history.setActivityNo(activityNo);
             history.setType(type);
             history.setPoint(point);
+            history.setBeforeTotal(before);
             history.setTotal(now);
             history.setInsertUser(eventUser.getUserId());
             history.setInsertDatetime(new Timestamp(eventDateTime.getTime()));
diff --git a/src/main/java/org/support/project/knowledge/vo/ContributionPointHistory.java b/src/main/java/org/support/project/knowledge/vo/ContributionPointHistory.java
index fc9c15a74..0c0f51bd7 100644
--- a/src/main/java/org/support/project/knowledge/vo/ContributionPointHistory.java
+++ b/src/main/java/org/support/project/knowledge/vo/ContributionPointHistory.java
@@ -7,6 +7,7 @@
 public class ContributionPointHistory {
     private String ymd;
     private int total;
+    private int before;
     /**
      * @return the ymd
      */
@@ -31,5 +32,17 @@ public int getTotal() {
     public void setTotal(int total) {
         this.total = total;
     }
+    /**
+     * @return the before
+     */
+    public int getBefore() {
+        return before;
+    }
+    /**
+     * @param before the before to set
+     */
+    public void setBefore(int before) {
+        this.before = before;
+    }
     
 }
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql
index 6e8c5fdb3..1daae0fd3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_insert.sql
@@ -5,6 +5,7 @@ HISTORY_NO
  , ACTIVITY_NO
  , TYPE
  , POINT
+ , BEFORE_TOTAL
  , TOTAL
  , INSERT_USER
  , INSERT_DATETIME
@@ -23,4 +24,5 @@ HISTORY_NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql
index 6e8c5fdb3..1daae0fd3 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_raw_insert.sql
@@ -5,6 +5,7 @@ HISTORY_NO
  , ACTIVITY_NO
  , TYPE
  , POINT
+ , BEFORE_TOTAL
  , TOTAL
  , INSERT_USER
  , INSERT_DATETIME
@@ -23,4 +24,5 @@ HISTORY_NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql
index d412e7545..ac82cb842 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointKnowledgeHistoriesDao/PointKnowledgeHistoriesDao_update.sql
@@ -3,6 +3,7 @@ SET
    ACTIVITY_NO = ?
  , TYPE = ?
  , POINT = ?
+ , BEFORE_TOTAL = ?
  , TOTAL = ?
  , INSERT_USER = ?
  , INSERT_DATETIME = ?
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql
index 3063beabb..b6fdc84a7 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_insert.sql
@@ -5,6 +5,7 @@ HISTORY_NO
  , ACTIVITY_NO
  , TYPE
  , POINT
+ , BEFORE_TOTAL
  , TOTAL
  , INSERT_USER
  , INSERT_DATETIME
@@ -23,4 +24,5 @@ HISTORY_NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql
index 3063beabb..b6fdc84a7 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_raw_insert.sql
@@ -5,6 +5,7 @@ HISTORY_NO
  , ACTIVITY_NO
  , TYPE
  , POINT
+ , BEFORE_TOTAL
  , TOTAL
  , INSERT_USER
  , INSERT_DATETIME
@@ -23,4 +24,5 @@ HISTORY_NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql
index ec002a027..10a951133 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/PointUserHistoriesDao_update.sql
@@ -3,6 +3,7 @@ SET
    ACTIVITY_NO = ?
  , TYPE = ?
  , POINT = ?
+ , BEFORE_TOTAL = ?
  , TOTAL = ?
  , INSERT_USER = ?
  , INSERT_DATETIME = ?
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_h2.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_h2.sql
index c8532631e..67ae8ea55 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_h2.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_h2.sql
@@ -1,6 +1,7 @@
 SELECT
         YMD
         ,MAX(TOTAL) AS TOTAL
+        ,MIN(BEFORE_TOTAL) AS BEFORE
     FROM
         (
             SELECT
@@ -10,6 +11,7 @@ SELECT
                         ,INSERT_DATETIME
                     ), 'YYYYMMDD') AS YMD
                     ,TOTAL
+                    ,BEFORE_TOTAL
                 FROM
                     POINT_USER_HISTORIES
                 WHERE
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_postgresql.sql b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_postgresql.sql
index da8105348..0c33aed6b 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_postgresql.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/PointUserHistoriesDao/select_point_history_by_date_postgresql.sql
@@ -1,11 +1,13 @@
 SELECT
         YMD
         ,MAX(TOTAL) AS TOTAL
+        ,MIN(BEFORE_TOTAL) AS BEFORE
     FROM
         (
             SELECT
                     TO_CHAR(INSERT_DATETIME + CAST (? AS INTERVAL), 'YYYYMMDD') AS YMD
                     ,TOTAL
+                    ,BEFORE_TOTAL
                 FROM
                     POINT_USER_HISTORIES
                 WHERE
diff --git a/src/main/resources/org/support/project/knowledge/database/ddl.sql b/src/main/resources/org/support/project/knowledge/database/ddl.sql
index cb8533ed4..007e6a342 100644
--- a/src/main/resources/org/support/project/knowledge/database/ddl.sql
+++ b/src/main/resources/org/support/project/knowledge/database/ddl.sql
@@ -7,6 +7,7 @@ create table POINT_USER_HISTORIES (
   , ACTIVITY_NO BIGINT not null
   , TYPE integer not null
   , POINT integer not null
+  , BEFORE_TOTAL integer not null
   , TOTAL integer not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
@@ -28,6 +29,7 @@ create table POINT_KNOWLEDGE_HISTORIES (
   , ACTIVITY_NO BIGINT not null
   , TYPE integer not null
   , POINT integer not null
+  , BEFORE_TOTAL integer not null
   , TOTAL integer not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
@@ -862,6 +864,7 @@ comment on column POINT_USER_HISTORIES.HISTORY_NO is '履歴番号';
 comment on column POINT_USER_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
 comment on column POINT_USER_HISTORIES.TYPE is '獲得のタイプ';
 comment on column POINT_USER_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_USER_HISTORIES.BEFORE_TOTAL is '獲得前ポイント';
 comment on column POINT_USER_HISTORIES.TOTAL is 'トータルポイント';
 comment on column POINT_USER_HISTORIES.INSERT_USER is '登録ユーザ';
 comment on column POINT_USER_HISTORIES.INSERT_DATETIME is '登録日時';
@@ -875,6 +878,7 @@ comment on column POINT_KNOWLEDGE_HISTORIES.HISTORY_NO is '履歴番号';
 comment on column POINT_KNOWLEDGE_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
 comment on column POINT_KNOWLEDGE_HISTORIES.TYPE is '獲得のタイプ';
 comment on column POINT_KNOWLEDGE_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_KNOWLEDGE_HISTORIES.BEFORE_TOTAL is '獲得前ポイント';
 comment on column POINT_KNOWLEDGE_HISTORIES.TOTAL is 'トータルポイント';
 comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_USER is '登録ユーザ';
 comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_DATETIME is '登録日時';
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
index 4d7e5bdc2..0af68a392 100644
--- a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_2.sql
@@ -7,6 +7,7 @@ create table POINT_USER_HISTORIES (
   , ACTIVITY_NO BIGINT not null
   , TYPE integer not null
   , POINT integer not null
+  , BEFORE_TOTAL integer not null
   , TOTAL integer not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
@@ -28,6 +29,7 @@ create table POINT_KNOWLEDGE_HISTORIES (
   , ACTIVITY_NO BIGINT not null
   , TYPE integer not null
   , POINT integer not null
+  , BEFORE_TOTAL integer not null
   , TOTAL integer not null
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
@@ -101,6 +103,7 @@ comment on column POINT_USER_HISTORIES.HISTORY_NO is '履歴番号';
 comment on column POINT_USER_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
 comment on column POINT_USER_HISTORIES.TYPE is '獲得のタイプ';
 comment on column POINT_USER_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_USER_HISTORIES.BEFORE_TOTAL is '獲得前ポイント';
 comment on column POINT_USER_HISTORIES.TOTAL is 'トータルポイント';
 comment on column POINT_USER_HISTORIES.INSERT_USER is '登録ユーザ';
 comment on column POINT_USER_HISTORIES.INSERT_DATETIME is '登録日時';
@@ -114,6 +117,7 @@ comment on column POINT_KNOWLEDGE_HISTORIES.HISTORY_NO is '履歴番号';
 comment on column POINT_KNOWLEDGE_HISTORIES.ACTIVITY_NO is 'アクティビティ番号';
 comment on column POINT_KNOWLEDGE_HISTORIES.TYPE is '獲得のタイプ';
 comment on column POINT_KNOWLEDGE_HISTORIES.POINT is '獲得ポイント';
+comment on column POINT_KNOWLEDGE_HISTORIES.BEFORE_TOTAL is '獲得前ポイント';
 comment on column POINT_KNOWLEDGE_HISTORIES.TOTAL is 'トータルポイント';
 comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_USER is '登録ユーザ';
 comment on column POINT_KNOWLEDGE_HISTORIES.INSERT_DATETIME is '登録日時';
diff --git a/src/main/webapp/WEB-INF/views/open/account/account.jsp b/src/main/webapp/WEB-INF/views/open/account/account.jsp
index 625a715ec..f67628a27 100644
--- a/src/main/webapp/WEB-INF/views/open/account/account.jsp
+++ b/src/main/webapp/WEB-INF/views/open/account/account.jsp
@@ -31,6 +31,8 @@
 
 
 <c:param name="PARAM_CONTENT">
+<input type="hidden" id="userId" value="<%= jspUtil.out("userId") %>" />
+<input type="hidden" id="point" value="<%= jspUtil.out("point") %>" />
 <div class="row">
     <div class="col-sm-6 col-md-6">
         <h4 class="title">
diff --git a/src/main/webapp/js/account-page.js b/src/main/webapp/js/account-page.js
index 6719ed338..59ed8165a 100644
--- a/src/main/webapp/js/account-page.js
+++ b/src/main/webapp/js/account-page.js
@@ -1,29 +1,66 @@
 $(document).ready(function() {
-    var ctx = document.getElementById('cpChart').getContext('2d');
+    var userId = $('#userId').val();
     
+    // 軸を作成
     moment.locale(_LANG);
     var m = moment();
     var labels = [];
-    var data = [];
-    for (var i = 0; i < 30; i++) {
+    var ymds = [];
+    for (var i = 0; i < 28; i++) {
         labels.push(m.format('L'));
+        ymds.push(m.format('YYYYMMDD'));
         m.subtract(1, 'days');
-        data.push(i);
     }
     labels.reverse();
-    
-    var myChart = new Chart(ctx, {
-      type: 'line',
-      data: {
-        labels: labels,
-        datasets: [{
-          label: 'Contribution Point',
-          data: data,
-          backgroundColor: "rgba(0,0,255,0.5)",
-          steppedLine: 'before'
-        }]
-      }
+    ymds.reverse();
+    $.ajax({
+        url: _CONTEXT + '/open.account/cp/' + userId,
+        type: 'GET',
+        timeout: 10000,  // 単位はミリ秒
+    }).done(function(result, textStatus, xhr) {
+        //console.log(result);
+        var before = $('#point').val();
+        var valmap = {};
+        if (result.length > 0) {
+            var hit = false;
+            for (var i = 0; i < result.length; i++) {
+                var item = result[i];
+                if (!hit) {
+                    before = item.before;
+                }
+                valmap[item.ymd] = item.total;
+                if (ymds.includes(item.ymd)) {
+                    hit = true;
+                }
+            }
+        }
+        //console.log(ymds);
+        //console.log(valmap);
+        var data = [];
+        ymds.forEach(function(ymd) {
+            if (valmap[ymd]) {
+                data.push(valmap[ymd]);
+                before = valmap[ymd];
+            } else {
+                data.push(before);
+            }
+        });
+        
+        var ctx = document.getElementById('cpChart').getContext('2d');
+        var myChart = new Chart(ctx, {
+          type: 'line',
+          data: {
+            labels: labels,
+            datasets: [{
+              label: 'Contribution Point',
+              data: data,
+              backgroundColor: "rgba(0,0,255,0.5)",
+              steppedLine: 'before'
+            }]
+          }
+        });
+        
+    }).fail(function(xhr, textStatus, error) {
+        handleErrorResponse(xhr, textStatus, error);
     });
-    
-    
 });

From 8403ef43e2f6cfb138b8a17529e381a4aa4cccd1 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 8 Sep 2017 04:43:23 +0900
Subject: [PATCH 055/138] #840 Add activity list

---
 bower.json                                    |  3 +-
 .../control/open/AccountControl.java          | 36 ++++++++-
 .../project/knowledge/dao/ActivitiesDao.java  | 20 ++++-
 .../knowledge/entity/ActivitiesEntity.java    | 16 ++++
 .../filter/CloseAbleAuthenticationFilter.java |  1 +
 .../logic/activity/ActivityLogic.java         | 56 ++++++++++++++
 .../project/knowledge/vo/UserConfigs.java     | 14 ++++
 src/main/resources/appresource.properties     |  6 +-
 src/main/resources/appresource_ja.properties  |  6 ++
 .../WEB-INF/views/open/account/account.jsp    | 38 ++++++----
 src/main/webapp/js/account-page.js            | 73 +++++++++++++++++--
 11 files changed, 244 insertions(+), 25 deletions(-)

diff --git a/bower.json b/bower.json
index dbe3860f6..3e425746a 100644
--- a/bower.json
+++ b/bower.json
@@ -36,7 +36,8 @@
     "tableExport.jquery.plugin": "1.8.1",
     "diff2html": "2.3.0",
     "jsdiff": "3.2.0",
-    "chart.js": "2.6.0"
+    "chart.js": "2.6.0",
+    "vue": "2.4.2"
   },
   "devDependencies": {},
   "resolutions": {
diff --git a/src/main/java/org/support/project/knowledge/control/open/AccountControl.java b/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
index 14083dfa0..7aeb5623f 100644
--- a/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
@@ -28,6 +28,7 @@
 import org.support.project.knowledge.vo.AccountInfo;
 import org.support.project.knowledge.vo.ContributionPointHistory;
 import org.support.project.knowledge.vo.StockKnowledge;
+import org.support.project.knowledge.vo.StringList;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.control.service.Get;
 import org.support.project.web.dao.UsersDao;
@@ -133,7 +134,40 @@ public Boundary cp() throws Exception {
         List<ContributionPointHistory> list = ActivityLogic.get().getUserPointHistoriesByDate(userId, getUserConfigs());
         return send(list);
     }
-
+    
+    @Get
+    public Boundary knowledge() throws Exception {
+        Integer userId = getPathInteger(-1);
+        UsersEntity account = UsersDao.get().selectOnKey(userId);
+        if (account == null) {
+            return send(HttpStatus.SC_NOT_FOUND, "NOT FOUND");
+        }
+        // そのユーザが登録したナレッジを取得
+        int offset = 0;
+        if (StringUtils.isInteger(getParam("offset"))) {
+            offset = getParam("offset", Integer.class);
+        }
+        List<KnowledgesEntity> knowledges = KnowledgeLogic.get().showKnowledgeOnUser(userId, getLoginedUser(), offset * PAGE_LIMIT, PAGE_LIMIT);
+        List<StockKnowledge> stocks = KnowledgeLogic.get().setStockInfo(knowledges, getLoginedUser());
+        KnowledgeLogic.get().setViewed(stocks, getLoginedUser());
+        return send(stocks);
+    }
+    
+    @Get
+    public Boundary activity() throws Exception {
+        Integer userId = getPathInteger(-1);
+        UsersEntity account = UsersDao.get().selectOnKey(userId);
+        if (account == null) {
+            return send(HttpStatus.SC_NOT_FOUND, "NOT FOUND");
+        }
+        int limit = 20;
+        int offset = 0;
+        if (StringUtils.isInteger(getParam("offset"))) {
+            offset = getParam("offset", Integer.class);
+        }
+        StringList list = ActivityLogic.get().getUserPointHistoriese(userId, limit, offset, getUserConfigs());
+        return send(list);
+    }
     
 
 }
diff --git a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
index 887366adc..132fbbd70 100644
--- a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
@@ -1,10 +1,11 @@
 package org.support.project.knowledge.dao;
 
+import java.util.List;
+
 import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-
 import org.support.project.knowledge.dao.gen.GenActivitiesDao;
 import org.support.project.knowledge.entity.ActivitiesEntity;
 
@@ -28,6 +29,23 @@ public ActivitiesEntity select(int userId, int type, String target) {
         String sql = "SELECT * FROM ACTIVITIES WHERE USER_ID = ? AND KIND = ? AND TARGET = ?";
         return executeQuerySingle(sql, ActivitiesEntity.class, userId, type, target);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ActivitiesEntity> selectOnNos(List<Long> activityNos) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("SELECT *, USERS.USER_NAME FROM ACTIVITIES INNER JOIN USERS ON (ACTIVITIES.user_id = users.user_id) ");
+        sql.append("WHERE activity_no IN (");
+        boolean appended = false;
+        for (Long no : activityNos) {
+            if (appended) {
+                sql.append(", ");
+                
+            }
+            sql.append("?");
+            appended = true;
+        }
+        sql.append(");");
+        return executeQueryList(sql.toString(), ActivitiesEntity.class, activityNos.toArray(new Long[0]));
+    }
 
 
 
diff --git a/src/main/java/org/support/project/knowledge/entity/ActivitiesEntity.java b/src/main/java/org/support/project/knowledge/entity/ActivitiesEntity.java
index edbb7647c..d3924b4e4 100644
--- a/src/main/java/org/support/project/knowledge/entity/ActivitiesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/ActivitiesEntity.java
@@ -21,6 +21,8 @@ public class ActivitiesEntity extends GenActivitiesEntity {
 
     /** SerialVersion */
     private static final long serialVersionUID = 1L;
+    
+    private String userName = "";
 
     /**
      * Get instance from DI container.
@@ -46,4 +48,18 @@ public ActivitiesEntity(Long no) {
         super( no);
     }
 
+    /**
+     * @return the userName
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * @param userName the userName to set
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
 }
diff --git a/src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java b/src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java
index 93eea4d81..1976654a4 100644
--- a/src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java
+++ b/src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java
@@ -76,6 +76,7 @@ public void doFilter(ServletRequest servletrequest, ServletResponse servletrespo
             if (StringUtils.isInteger(offset)) {
                 userConfig.setTimezoneOffset(Integer.parseInt(offset));
             }
+            userConfig.setLocale(HttpUtil.getLocale(req));
             req.setAttribute(UserConfig.REQUEST_USER_CONFIG_KEY, userConfig);
             
             try {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index 46e745b7b..96f693b21 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -2,20 +2,30 @@
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.support.project.aop.Aspect;
+import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.ActivitiesDao;
 import org.support.project.knowledge.dao.PointUserHistoriesDao;
+import org.support.project.knowledge.entity.ActivitiesEntity;
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.PointUserHistoriesEntity;
 import org.support.project.knowledge.vo.ContributionPointHistory;
+import org.support.project.knowledge.vo.StringList;
 import org.support.project.knowledge.vo.UserConfigs;
+import org.support.project.ormapping.config.Order;
 import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.logic.DateConvertLogic;
 
 @DI(instance = Instance.Singleton)
 public class ActivityLogic {
@@ -98,4 +108,50 @@ public void processActivity(Activity activity, LoginedUser eventUser, Date event
     public List<ContributionPointHistory> getUserPointHistoriesByDate(Integer userId, UserConfigs userConfigs) {
         return PointUserHistoriesDao.get().selectPointHistoriesByDate(userId, userConfigs);
     }
+
+    private String getDisplayDate(Date date, UserConfigs userConfigs) {
+        return DateConvertLogic.get().convertDate(date, userConfigs.getLocale(), String.valueOf(userConfigs.getTimezoneOffset()));
+    }
+    
+    private String getActivityMsg(PointUserHistoriesEntity history, Map<Long, ActivitiesEntity> activities, UserConfigs userConfigs) {
+        Resources resources = Resources.getInstance(userConfigs.getLocale());
+        ActivitiesEntity activity = activities.get(history.getActivityNo());
+        if (activity == null) {
+            return "";
+        }
+        if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_INSERT) {
+            return resources.getResource("knowledge.activity.type.11.do.insert",
+                    getDisplayDate(history.getInsertDatetime(), userConfigs), activity.getTarget());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_SHOW) {
+            return resources.getResource("knowledge.activity.type.21.do.show",
+                    getDisplayDate(history.getInsertDatetime(), userConfigs), activity.getTarget());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_SHOWN_BY_OHER) {
+            return resources.getResource("knowledge.activity.type.22.shown",
+                    getDisplayDate(history.getInsertDatetime(), userConfigs),activity.getTarget(), activity.getUserName());
+        }
+        return "なんかした";
+    }
+    public StringList getUserPointHistoriese(Integer userId, int limit, int offset, UserConfigs userConfigs) {
+        List<PointUserHistoriesEntity> histories = PointUserHistoriesDao.get().selectOnUser(userId, limit, offset, Order.DESC);
+        List<Long> activityNos = new ArrayList<>();
+        for (PointUserHistoriesEntity history : histories) {
+            activityNos.add(history.getActivityNo());
+        }
+        List<ActivitiesEntity> activityList = ActivitiesDao.get().selectOnNos(activityNos);
+        Map<Long, ActivitiesEntity> activities = new HashMap<>();
+        for (ActivitiesEntity activitiesEntity : activityList) {
+            activities.put(activitiesEntity.getActivityNo(), activitiesEntity);
+        }
+        List<String> list = new ArrayList<>();
+        for (PointUserHistoriesEntity history : histories) {
+            String msg = getActivityMsg(history, activities, userConfigs);
+            if (StringUtils.isNotEmpty(msg)) {
+                list.add(msg);
+            }
+        }
+        StringList stringList = new StringList();
+        stringList.setList(list);
+        return stringList;
+    }
+
 }
diff --git a/src/main/java/org/support/project/knowledge/vo/UserConfigs.java b/src/main/java/org/support/project/knowledge/vo/UserConfigs.java
index 4407c34ba..0146b564a 100644
--- a/src/main/java/org/support/project/knowledge/vo/UserConfigs.java
+++ b/src/main/java/org/support/project/knowledge/vo/UserConfigs.java
@@ -1,10 +1,12 @@
 package org.support.project.knowledge.vo;
 
 import java.io.Serializable;
+import java.util.Locale;
 
 public class UserConfigs implements Serializable {
     /** serialVersion */
     private static final long serialVersionUID = 1L;
+    private Locale locale = Locale.getDefault();
     /** タイムゾーン */
     private String timezone = "UTC";
     /** タイムゾーンオフセット（分） */
@@ -61,6 +63,18 @@ public int getHighlight() {
     public void setHighlight(int highlight) {
         this.highlight = highlight;
     }
+    /**
+     * @return the locale
+     */
+    public Locale getLocale() {
+        return locale;
+    }
+    /**
+     * @param locale the locale to set
+     */
+    public void setLocale(Locale locale) {
+        this.locale = locale;
+    }
     
     
     
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index c1b946d15..f1b58a896 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -853,5 +853,9 @@ knowledge.maintenance.do.migrate.no.login=Execute maintenance(only administrator
 knowledge.maintenance.migrate.title=Database migration
 knowledge.maintenance.migrate.message=You can execute database migration. recommend to backup database data.
 
-
+knowledge.activity.type.11.do.insert={1} This user posted #{2}
+knowledge.activity.type.13.inserted={1} #{2} was posted by {3}
+knowledge.activity.type.21.do.show={1} This user showed #{2}
+knowledge.activity.type.22.shown={1} #{2} was shown by {3}
+knowledge.activity.type.23.shown={1} #{2} was shown by {3}
 
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index 8778aff81..fd0a46db0 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -853,5 +853,11 @@ knowledge.maintenance.do.migrate.no.login=メンテナンス管理を実行(管
 knowledge.maintenance.migrate.title=Database migration
 knowledge.maintenance.migrate.message=DBのマイグレーションを実行します。事前にDBのバックアップを取ることをオススメします。
 
+knowledge.activity.type.11.do.insert={1} #{2} の記事を投稿しました
+knowledge.activity.type.13.inserted={1} #{2} の記事が、{3} によって投稿されました
+knowledge.activity.type.21.do.show={1} #{2} の記事を参照しました
+knowledge.activity.type.22.shown={1} #{2} の記事を、{3} が参照しました
+knowledge.activity.type.23.shown={1} #{2} の記事を、{3} が参照しました
+
 
 
diff --git a/src/main/webapp/WEB-INF/views/open/account/account.jsp b/src/main/webapp/WEB-INF/views/open/account/account.jsp
index f67628a27..b72405af4 100644
--- a/src/main/webapp/WEB-INF/views/open/account/account.jsp
+++ b/src/main/webapp/WEB-INF/views/open/account/account.jsp
@@ -24,6 +24,7 @@
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/moment/min/moment.min.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/moment/locale/ja.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/chart.js/dist/Chart.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/vue/dist/vue.min.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/js/knowledge-list.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/js/account-page.js"></script>
 <!-- endbuild -->
@@ -80,33 +81,29 @@
     </div>
 </div>
 
-<div class="row">
+<div class="row" id="tabArea">
     <ul class="nav nav-tabs">
-        <li role="presentation" class="active"><a href="<%=request.getContextPath()%>/open.account/info/<%= jspUtil.out("userId") %>">
+        <li role="presentation" class="active"><a v-on:click="showKnowledge">
             <%= jspUtil.label("knowledge.account.label.knowledges") %>
         </a></li>
-        <li role="presentation"><a href="<%=request.getContextPath()%>/open.account/like/<%= jspUtil.out("userId") %>">
+        <li role="presentation"><a v-on:click="showLike">
             <%=jspUtil.label("knowledge.account.label.like")%>
         </a></li>
-        <li role="presentation"><a href="<%=request.getContextPath()%>/open.account/activity/<%= jspUtil.out("userId") %>">
+        <li role="presentation"><a v-on:click="showActivity">
             <%=jspUtil.label("knowledge.account.label.activity")%>
         </a></li>
     </ul>
 </div>
 
 
-
-<div class="sub_title">
-
-</div>
-
-<!-- リスト -->
-<div class="row" id="knowledgeList">
-    <% request.setAttribute("list_data", jspUtil.getValue("knowledges", List.class)); %>
-    <c:import url="/WEB-INF/views/open/knowledge/partials/common_list.jsp" />
-</div>
-
-
+<div id="knowledgesArea">
+    <div class="sub_title">
+    </div>
+    <!-- リスト -->
+    <div class="row" id="knowledgeList">
+        <% request.setAttribute("list_data", jspUtil.getValue("knowledges", List.class)); %>
+        <c:import url="/WEB-INF/views/open/knowledge/partials/common_list.jsp" />
+    </div>
     <!-- Pager -->
     <nav>
         <ul class="pager">
@@ -122,8 +119,17 @@
             </li>
         </ul>
     </nav>
+</div>
 
 
+<div id="activityArea" style="display:none">
+    <br/><br/>
+    <ul class="list-group" id="activityList">
+        <li class="list-group-item" v-for="activity in activities">
+        {{ activity }}
+        </li>
+    </ul>
+</div>
 
 </c:param>
 
diff --git a/src/main/webapp/js/account-page.js b/src/main/webapp/js/account-page.js
index 59ed8165a..7e3db0578 100644
--- a/src/main/webapp/js/account-page.js
+++ b/src/main/webapp/js/account-page.js
@@ -1,6 +1,4 @@
-$(document).ready(function() {
-    var userId = $('#userId').val();
-    
+var loadCPGGraph = function(userId, before) {
     // 軸を作成
     moment.locale(_LANG);
     var m = moment();
@@ -19,7 +17,6 @@ $(document).ready(function() {
         timeout: 10000,  // 単位はミリ秒
     }).done(function(result, textStatus, xhr) {
         //console.log(result);
-        var before = $('#point').val();
         var valmap = {};
         if (result.length > 0) {
             var hit = false;
@@ -59,8 +56,74 @@ $(document).ready(function() {
             }]
           }
         });
-        
     }).fail(function(xhr, textStatus, error) {
         handleErrorResponse(xhr, textStatus, error);
     });
+};
+
+var loadKnowledge = function(userId, offset) {
+    var list = [];
+    var knowledgeList = new Vue({
+        el: '#knowledgeList',
+        data: {
+            list: list
+        }
+    });
+    $.ajax({
+        url: _CONTEXT + '/open.account/knowledge/' + userId,
+        type: 'GET',
+        timeout: 10000,
+    }).done(function(result, textStatus, xhr) {
+        result.forEach(function(item) {
+            knowledgeList.list.push(item);
+        });
+    }).fail(function(xhr, textStatus, error) {
+        handleErrorResponse(xhr, textStatus, error);
+    });
+};
+
+var loadAndShowActivity = function(userId, offset) {
+    $('#knowledgesArea').hide();
+    $('#activityArea').show();
+    var activities = [];
+    var activityList = new Vue({
+        el: '#activityList',
+        data: {
+            activities: activities
+        }
+    });
+    $.ajax({
+        url: _CONTEXT + '/open.account/activity/' + userId,
+        type: 'GET',
+        timeout: 10000,
+    }).done(function(result, textStatus, xhr) {
+        console.log(result);
+        result.list.forEach(function(item) {
+            activityList.activities.push(item);
+        });
+    }).fail(function(xhr, textStatus, error) {
+        handleErrorResponse(xhr, textStatus, error);
+    });
+};
+
+
+$(document).ready(function() {
+    var userId = $('#userId').val();
+    var before = $('#point').val();
+    // グラフをロード
+    loadCPGGraph(userId, before);
+    
+    var tab = new Vue({
+        el: '#tabArea',
+        data: {},
+        methods: {
+            showKnowledge: function (event) {
+            },
+            showLike: function (event) {
+            },
+            showActivity: function (event) {
+                loadAndShowActivity(userId);
+            }
+        }
+    });
 });

From 96e64f7aef979244554c300595839488104e6637 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 8 Sep 2017 07:07:43 +0900
Subject: [PATCH 056/138] #840 Change design of activity history list

---
 .../control/open/AccountControl.java          |  4 +-
 .../logic/activity/ActivityLogic.java         | 27 ++++++-----
 .../project/knowledge/vo/ActivityHistory.java | 46 +++++++++++++++++++
 src/main/resources/appresource.properties     | 10 ++--
 src/main/resources/appresource_ja.properties  | 10 ++--
 .../WEB-INF/views/open/account/account.jsp    | 19 ++++----
 src/main/webapp/js/account-page.js            | 12 ++++-
 7 files changed, 92 insertions(+), 36 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/vo/ActivityHistory.java

diff --git a/src/main/java/org/support/project/knowledge/control/open/AccountControl.java b/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
index 7aeb5623f..4d72f1cb7 100644
--- a/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
@@ -26,9 +26,9 @@
 import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.knowledge.vo.AccountInfo;
+import org.support.project.knowledge.vo.ActivityHistory;
 import org.support.project.knowledge.vo.ContributionPointHistory;
 import org.support.project.knowledge.vo.StockKnowledge;
-import org.support.project.knowledge.vo.StringList;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.control.service.Get;
 import org.support.project.web.dao.UsersDao;
@@ -165,7 +165,7 @@ public Boundary activity() throws Exception {
         if (StringUtils.isInteger(getParam("offset"))) {
             offset = getParam("offset", Integer.class);
         }
-        StringList list = ActivityLogic.get().getUserPointHistoriese(userId, limit, offset, getUserConfigs());
+        List<ActivityHistory> list = ActivityLogic.get().getUserPointHistoriese(userId, limit, offset, getUserConfigs());
         return send(list);
     }
     
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index 96f693b21..dcd0de508 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -20,8 +20,8 @@
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.PointUserHistoriesEntity;
+import org.support.project.knowledge.vo.ActivityHistory;
 import org.support.project.knowledge.vo.ContributionPointHistory;
-import org.support.project.knowledge.vo.StringList;
 import org.support.project.knowledge.vo.UserConfigs;
 import org.support.project.ormapping.config.Order;
 import org.support.project.web.bean.LoginedUser;
@@ -120,18 +120,15 @@ private String getActivityMsg(PointUserHistoriesEntity history, Map<Long, Activi
             return "";
         }
         if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_INSERT) {
-            return resources.getResource("knowledge.activity.type.11.do.insert",
-                    getDisplayDate(history.getInsertDatetime(), userConfigs), activity.getTarget());
+            return resources.getResource("knowledge.activity.type.11.do.insert", activity.getTarget());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_SHOW) {
-            return resources.getResource("knowledge.activity.type.21.do.show",
-                    getDisplayDate(history.getInsertDatetime(), userConfigs), activity.getTarget());
+            return resources.getResource("knowledge.activity.type.21.do.show", activity.getTarget());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_SHOWN_BY_OHER) {
-            return resources.getResource("knowledge.activity.type.22.shown",
-                    getDisplayDate(history.getInsertDatetime(), userConfigs),activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.22.shown", activity.getTarget(), activity.getUserName());
         }
-        return "なんかした";
+        return "";
     }
-    public StringList getUserPointHistoriese(Integer userId, int limit, int offset, UserConfigs userConfigs) {
+    public List<ActivityHistory> getUserPointHistoriese(Integer userId, int limit, int offset, UserConfigs userConfigs) {
         List<PointUserHistoriesEntity> histories = PointUserHistoriesDao.get().selectOnUser(userId, limit, offset, Order.DESC);
         List<Long> activityNos = new ArrayList<>();
         for (PointUserHistoriesEntity history : histories) {
@@ -142,16 +139,18 @@ public StringList getUserPointHistoriese(Integer userId, int limit, int offset,
         for (ActivitiesEntity activitiesEntity : activityList) {
             activities.put(activitiesEntity.getActivityNo(), activitiesEntity);
         }
-        List<String> list = new ArrayList<>();
+        List<ActivityHistory> list = new ArrayList<>();
         for (PointUserHistoriesEntity history : histories) {
             String msg = getActivityMsg(history, activities, userConfigs);
             if (StringUtils.isNotEmpty(msg)) {
-                list.add(msg);
+                ActivityHistory activity = new ActivityHistory();
+                activity.setDate(history.getInsertDatetime());
+                activity.setDispDate(getDisplayDate(history.getInsertDatetime(), userConfigs));
+                activity.setMsg(msg);
+                list.add(activity);
             }
         }
-        StringList stringList = new StringList();
-        stringList.setList(list);
-        return stringList;
+        return list;
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/vo/ActivityHistory.java b/src/main/java/org/support/project/knowledge/vo/ActivityHistory.java
new file mode 100644
index 000000000..18d27cb10
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/vo/ActivityHistory.java
@@ -0,0 +1,46 @@
+package org.support.project.knowledge.vo;
+
+import java.util.Date;
+
+public class ActivityHistory {
+    private Date date;
+    private String dispDate;
+    private String msg;
+    /**
+     * @return the date
+     */
+    public Date getDate() {
+        return date;
+    }
+    /**
+     * @param date the date to set
+     */
+    public void setDate(Date date) {
+        this.date = date;
+    }
+    /**
+     * @return the dispDate
+     */
+    public String getDispDate() {
+        return dispDate;
+    }
+    /**
+     * @param dispDate the dispDate to set
+     */
+    public void setDispDate(String dispDate) {
+        this.dispDate = dispDate;
+    }
+    /**
+     * @return the msg
+     */
+    public String getMsg() {
+        return msg;
+    }
+    /**
+     * @param msg the msg to set
+     */
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+    
+}
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index f1b58a896..14684ebfd 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -853,9 +853,9 @@ knowledge.maintenance.do.migrate.no.login=Execute maintenance(only administrator
 knowledge.maintenance.migrate.title=Database migration
 knowledge.maintenance.migrate.message=You can execute database migration. recommend to backup database data.
 
-knowledge.activity.type.11.do.insert={1} This user posted #{2}
-knowledge.activity.type.13.inserted={1} #{2} was posted by {3}
-knowledge.activity.type.21.do.show={1} This user showed #{2}
-knowledge.activity.type.22.shown={1} #{2} was shown by {3}
-knowledge.activity.type.23.shown={1} #{2} was shown by {3}
+knowledge.activity.type.11.do.insert=This user posted #{1}
+knowledge.activity.type.13.inserted=#{1} was posted by {2}
+knowledge.activity.type.21.do.show=This user showed #{1}
+knowledge.activity.type.22.shown=#{1} was shown by {2}
+knowledge.activity.type.23.shown=#{1} was shown by {2}
 
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index fd0a46db0..19693ee28 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -853,11 +853,11 @@ knowledge.maintenance.do.migrate.no.login=メンテナンス管理を実行(管
 knowledge.maintenance.migrate.title=Database migration
 knowledge.maintenance.migrate.message=DBのマイグレーションを実行します。事前にDBのバックアップを取ることをオススメします。
 
-knowledge.activity.type.11.do.insert={1} #{2} の記事を投稿しました
-knowledge.activity.type.13.inserted={1} #{2} の記事が、{3} によって投稿されました
-knowledge.activity.type.21.do.show={1} #{2} の記事を参照しました
-knowledge.activity.type.22.shown={1} #{2} の記事を、{3} が参照しました
-knowledge.activity.type.23.shown={1} #{2} の記事を、{3} が参照しました
+knowledge.activity.type.11.do.insert=このユーザが #{1} の記事を投稿しました
+knowledge.activity.type.13.inserted=#{1} の記事が、{2} によって投稿されました
+knowledge.activity.type.21.do.show=#{1} の記事を参照しました
+knowledge.activity.type.22.shown=このユーザが投稿した #{1} の記事を、{2} が参照しました
+knowledge.activity.type.23.shown=#{1} の記事を、{2} が参照しました
 
 
 
diff --git a/src/main/webapp/WEB-INF/views/open/account/account.jsp b/src/main/webapp/WEB-INF/views/open/account/account.jsp
index b72405af4..ceeb39227 100644
--- a/src/main/webapp/WEB-INF/views/open/account/account.jsp
+++ b/src/main/webapp/WEB-INF/views/open/account/account.jsp
@@ -83,13 +83,15 @@
 
 <div class="row" id="tabArea">
     <ul class="nav nav-tabs">
-        <li role="presentation" class="active"><a v-on:click="showKnowledge">
+        <li role="presentation" class="active" id="tabKnowledge"><a v-on:click="showKnowledge">
             <%= jspUtil.label("knowledge.account.label.knowledges") %>
         </a></li>
-        <li role="presentation"><a v-on:click="showLike">
+        <%--
+        <li role="presentation" id="tabLike"><a v-on:click="showLike">
             <%=jspUtil.label("knowledge.account.label.like")%>
         </a></li>
-        <li role="presentation"><a v-on:click="showActivity">
+        --%>
+        <li role="presentation" id="tabActivity"><a v-on:click="showActivity">
             <%=jspUtil.label("knowledge.account.label.activity")%>
         </a></li>
     </ul>
@@ -124,11 +126,12 @@
 
 <div id="activityArea" style="display:none">
     <br/><br/>
-    <ul class="list-group" id="activityList">
-        <li class="list-group-item" v-for="activity in activities">
-        {{ activity }}
-        </li>
-    </ul>
+    <div class="list-group" id="activityList">
+        <a class="list-group-item" v-for="activity in activities">
+            <h4 class="list-group-item-heading">{{ activity.msg }}</h4>
+            <p class="list-group-item-text">{{ activity.dispDate }}</p>
+        </a>
+    </div>
 </div>
 
 </c:param>
diff --git a/src/main/webapp/js/account-page.js b/src/main/webapp/js/account-page.js
index 7e3db0578..f336cf9b4 100644
--- a/src/main/webapp/js/account-page.js
+++ b/src/main/webapp/js/account-page.js
@@ -82,9 +82,17 @@ var loadKnowledge = function(userId, offset) {
     });
 };
 
+var showKnowledge = function() {
+    $('#knowledgesArea').show();
+    $('#activityArea').hide();
+    $('#tabKnowledge').addClass('active');
+    $('#tabActivity').removeClass('active');
+};
 var loadAndShowActivity = function(userId, offset) {
     $('#knowledgesArea').hide();
     $('#activityArea').show();
+    $('#tabKnowledge').removeClass('active');
+    $('#tabActivity').addClass('active');
     var activities = [];
     var activityList = new Vue({
         el: '#activityList',
@@ -98,7 +106,7 @@ var loadAndShowActivity = function(userId, offset) {
         timeout: 10000,
     }).done(function(result, textStatus, xhr) {
         console.log(result);
-        result.list.forEach(function(item) {
+        result.forEach(function(item) {
             activityList.activities.push(item);
         });
     }).fail(function(xhr, textStatus, error) {
@@ -106,7 +114,6 @@ var loadAndShowActivity = function(userId, offset) {
     });
 };
 
-
 $(document).ready(function() {
     var userId = $('#userId').val();
     var before = $('#point').val();
@@ -118,6 +125,7 @@ $(document).ready(function() {
         data: {},
         methods: {
             showKnowledge: function (event) {
+                showKnowledge();
             },
             showLike: function (event) {
             },

From 296997293b56ec859b7ebfa96065ac0d9d609db5 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 8 Sep 2017 20:39:10 +0900
Subject: [PATCH 057/138] #840 Change contribution point at knowledge saved

---
 .../control/protect/KnowledgeControl.java     |   3 +-
 .../project/knowledge/dao/ActivitiesDao.java  |  30 +++++-
 .../deploy/v1_11_0/Migrate_1_11_2.java        |   2 +-
 ...AbstractAddPointForKnowledgeProcessor.java |  15 ++-
 .../knowledge/logic/activity/Activity.java    |  30 +++++-
 .../logic/activity/ActivityLogic.java         |  34 +++++-
 .../activity/KnowledgeInsertActivity.java     |  55 ----------
 .../logic/activity/KnowledgesaveActivity.java | 102 ++++++++++++++++++
 .../activity/MultiActivityProcessor.java      |  12 +++
 .../partials/partials-view-count.jsp          |   3 +
 10 files changed, 214 insertions(+), 72 deletions(-)
 delete mode 100644 src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/activity/MultiActivityProcessor.java

diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index b61667683..ee879ec85 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -214,7 +214,7 @@ private Boundary add(KnowledgesEntity entity) throws Exception, ParseException {
         LOG.trace("save");
 
         KnowledgesEntity insertedEntity = knowledgeLogic.insert(data, super.getLoginedUser());
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, getLoginedUser(), new Date(), insertedEntity);
+        ActivityLogic.get().processKnowledgeSaveActivity(getLoginedUser(), new Date(), insertedEntity);
         
         return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK,
                 String.valueOf(insertedEntity.getKnowledgeId()), "message.success.insert");
@@ -310,6 +310,7 @@ private Boundary update(KnowledgesEntity entity) throws Exception {
         }
         
         KnowledgesEntity updatedEntity = knowledgeLogic.update(data, super.getLoginedUser());
+        ActivityLogic.get().processKnowledgeSaveActivity(getLoginedUser(), new Date(), updatedEntity);
         
         if (data.isUpdateContent()) {
             return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK,
diff --git a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
index 132fbbd70..02e1a8307 100644
--- a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.dao;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.support.project.aop.Aspect;
@@ -32,8 +33,8 @@ public ActivitiesEntity select(int userId, int type, String target) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<ActivitiesEntity> selectOnNos(List<Long> activityNos) {
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT *, USERS.USER_NAME FROM ACTIVITIES INNER JOIN USERS ON (ACTIVITIES.user_id = users.user_id) ");
-        sql.append("WHERE activity_no IN (");
+        sql.append("SELECT *, USERS.USER_NAME FROM ACTIVITIES INNER JOIN USERS ON (ACTIVITIES.USER_ID = USERS.USER_ID) ");
+        sql.append("WHERE ACTIVITY_NO IN (");
         boolean appended = false;
         for (Long no : activityNos) {
             if (appended) {
@@ -44,7 +45,30 @@ public List<ActivitiesEntity> selectOnNos(List<Long> activityNos) {
             appended = true;
         }
         sql.append(");");
-        return executeQueryList(sql.toString(), ActivitiesEntity.class, activityNos.toArray(new Long[0]));
+        return executeQueryList(sql.toString(), ActivitiesEntity.class, activityNos.toArray(new Object[0]));
+    }
+    
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public ActivitiesEntity selectBefore(Integer userId, String target, int... kinds) {
+        StringBuilder sql = new StringBuilder();
+        List<Object> params = new ArrayList<>();
+        params.add(userId);
+        params.add(target);
+        sql.append("SELECT * FROM ACTIVITIES ");
+        sql.append("WHERE USER_ID = ? AND TARGET = ? AND ");
+        sql.append("KIND IN (");
+        boolean appended = false;
+        for (int i : kinds) {
+            if (appended) {
+                sql.append(", ");
+                
+            }
+            sql.append("?");
+            appended = true;
+            params.add(i);
+        }
+        sql.append(") ORDER BY INSERT_DATETIME DESC LIMIT 1 OFFSET 0");
+        return executeQuerySingle(sql.toString(), ActivitiesEntity.class, params.toArray(new Object[0]));
     }
 
 
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 456f34488..8e12180a0 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -395,7 +395,7 @@ public List<KnowledgesEntity> doAddPointByKnowledge(int offset) {
             }
             user.setLoginUser(account);
             LOG.debug("    knowledge [" + item.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_INSERT, user, item.getInsertDatetime(), item);
+            ActivityLogic.get().processKnowledgeSaveActivity(user, item.getInsertDatetime(), item);
         }
         return knowledges;
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
index a8323cbb4..a085399e6 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.logic.activity;
 
+import org.bouncycastle.jcajce.provider.asymmetric.dsa.DSASigner.noneDSA;
 import org.support.project.aop.Aspect;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
@@ -43,20 +44,26 @@ public void execute() throws Exception {
             // 既に指定のKnowledge登録済
             return;
         }
+        TypeAndPoint exec = getTypeAndPointForActivityExecuter();
+        TypeAndPoint owner = getTypeAndPointForKnowledgeOwner();
+        TypeAndPoint knowledge = getTypeAndPointForKnowledge();
+        if (exec == null && owner == null && knowledge == null) {
+            // ポイントをつける対象が無いので、処理終了
+            LOG.info("This activity is not add point. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+            + " [knowledge]" + getKnowledge().getKnowledgeId());
+            return;
+        }
         LOG.info("activity process started. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
         + " [knowledge]" + getKnowledge().getKnowledgeId());
         
         StringBuilder logmsg = new StringBuilder();
         logmsg.append("Activity : " + getActivity().toString());
-        
          // ポイント発行アクティビティを生成
         ActivitiesEntity activity = addActivity(
                 getActivity(),
                 String.valueOf(getKnowledge().getKnowledgeId()));
         
-        
         // 実行したユーザのポイントアップ
-        TypeAndPoint exec = getTypeAndPointForActivityExecuter();
         if (exec != null) {
             int point = addPointForUser(
                     eventUser.getUserId(), // ターゲットは、実行したユーザ
@@ -66,7 +73,6 @@ public void execute() throws Exception {
             logmsg.append("\n\tAdd event user: [id]" + eventUser.getUserId() + " [type]" + exec.type + " [add]" + exec.point + " [result]" + point);
         }
          // 記事の登録者のポイントをアップ
-        TypeAndPoint owner = getTypeAndPointForKnowledgeOwner();
         if (owner != null) {
             int point = addPointForUser(
                     getKnowledge().getInsertUser(), // ターゲットは登録者
@@ -76,7 +82,6 @@ public void execute() throws Exception {
             logmsg.append("\n\tAdd owner user: [id]" + getKnowledge().getInsertUser() + " [type]" + owner.type + " [add]" + owner.point + " [result]" + point);
         }
          // 記事のポイントアップ
-        TypeAndPoint knowledge = getTypeAndPointForKnowledge();
         if (knowledge != null) {
             int point = addPointForKnowledge(
                     getKnowledge().getKnowledgeId(),
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/Activity.java b/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
index db5d3e730..4ffb3fe28 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/Activity.java
@@ -4,12 +4,15 @@
  * ポイントが増減するアクティビティの種類
  * 
  * 種類  | ターゲット文字列 | イベントの内容
- * 1    | knowledge_id  | 記事を登録
+ * 1    | knowledge_id  | 記事を登録(使わない）
  * 2    | knowledge_id  | 記事参照
  * 3    | knowledge_id  | 記事へイイネを登録
  * 4    | knowledge_id  | 記事をストック
  * 5    | knowledge_id  | アンケート回答
  * 6    | knowledge_id  | イベント参加
+ * 10   | knowledge_id  | 記事を「公開」で投稿（登録／更新時）→増える
+ * 11   | knowledge_id  | 記事を「保護」で投稿（登録／更新時）→前が非公開であれば増える、前が公開であれば減る
+ * 12   | knowledge_id  | 記事を「非公開」で投稿（登録／更新時）→前が「公開」「保護」の場合減る（前が「公開」「保護」で無い場合登録しない/非公開の記事ではポイント増えない）
  * 101  | comment_no    | コメント登録
  * 103  | comment_no    | コメントにイイネ登録
  * -6   | knowledge_id  | イベント参加の取り消し
@@ -19,8 +22,8 @@
  * ポイント操作
  * 
  * 種類  | 獲得のタイプ  | ポイント付与先 | ポイント    | 獲得タイプの意味
- * 1    | 11          | 記事登録者    | 50       | 記事を投稿したら投稿者にポイント追加
- * 1    | 13          | 記事         | 50       | 登録された記事のポイント初期値
+ * 1    | 11          | 記事登録者    | 50       | 記事を投稿したら投稿者にポイント追加(使わない）
+ * 1    | 13          | 記事         | 50       | 登録された記事のポイント初期値(使わない）
  * 2    | 21          | 参照者       | 1        | 記事を参照するアクションを行うと、参照者にポイント追加（一つの記事に付き1回のみ）
  * 2    | 22          | 記事登録者    | 1        | 自分が登録された記事が参照されたら、登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
  * 2    | 23          | 記事         | 1        | 記事が参照されると、その記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
@@ -36,6 +39,12 @@
  * 6    | 61          | 参照者       | 5        | イベント参加者にポイント付与
  * 6    | 62          | 記事登録者    | 5       | 記事の登録者にポイント追加（一つの記事に対し、参照者毎に1回のみ）
  * 6    | 63          | 記事         | 5       | 記事のポイントが追加（一つの記事に対し、参照者毎に1回のみ）
+ * 10   | 101         | 記事登録者    | 50       | 公開になった時点でトータル50になるように
+ * 10   | 103         | 記事         | 50       | 
+ * 11   | 111         | 記事登録者    | 30       | 
+ * 11   | 113         | 記事         | 30       | 
+ * 12   | 121         | 記事登録者    | 0        | このアクティビティの前に、投稿のアクティビティがあった場合、それを打ち消す（マイナスのポイント）
+ * 12   | 123         | 記事         | 0        | 
  * 101  | 1011        | 登録者       | 20       | コメントを投稿すると、投稿者にポイント追加
  * 101  | 1013        | 記事         | 20       | 記事にコメントが付くと、その記事に対しポイント追加
  * 103  | 1031        | 参照者       | 2       | イイネを押すと、押した人にポイント追加
@@ -60,6 +69,9 @@ public enum Activity {
     KNOWLEDGE_ANSWER, // アンケートに回答した
     KNOWLEDGE_EVENT_ADD, // イベントに参加した
     KNOWLEDGE_EVENT_DELETE, // イベント参加キャンセル
+    KNOWLEDGE_POST_PUBLIC, // 公開で投稿
+    KNOWLEDGE_POST_PROTECTED, // 保護で投稿
+    KNOWLEDGE_POST_PRIVATE, // 非公開で投稿
     COMMENT_INSERT, // コメント追加
     COMMENT_LIKE; // コメントにイイネを押した
     
@@ -78,6 +90,12 @@ public int getValue() {
             return 6;
         } else if (this ==KNOWLEDGE_EVENT_DELETE) {
             return -6;
+        } else if (this ==KNOWLEDGE_POST_PUBLIC) {
+            return 10;
+        } else if (this ==KNOWLEDGE_POST_PROTECTED) {
+            return 11;
+        } else if (this ==KNOWLEDGE_POST_PRIVATE) {
+            return 12;
         } else if (this ==COMMENT_INSERT) {
             return 101;
         } else if (this ==COMMENT_LIKE) {
@@ -101,6 +119,12 @@ public static Activity getType(int type) {
             return KNOWLEDGE_EVENT_ADD;
         } else if (type == -6) {
             return KNOWLEDGE_EVENT_DELETE;
+        } else if (type == 10) {
+            return KNOWLEDGE_POST_PUBLIC;
+        } else if (type == 11) {
+            return KNOWLEDGE_POST_PROTECTED;
+        } else if (type == 12) {
+            return KNOWLEDGE_POST_PRIVATE;
         } else if (type == 101) {
             return COMMENT_INSERT;
         } else if (type == 102) {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index dcd0de508..0f0e86bc6 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -20,6 +20,7 @@
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.PointUserHistoriesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.knowledge.vo.ActivityHistory;
 import org.support.project.knowledge.vo.ContributionPointHistory;
 import org.support.project.knowledge.vo.UserConfigs;
@@ -38,8 +39,10 @@ public static ActivityLogic get() {
     
     private List<ActivityProcessor> getActivityProcessors(Activity activity) {
         List<ActivityProcessor> array = new ArrayList<>();
-        if (activity == Activity.KNOWLEDGE_INSERT) {
-            array.add(KnowledgeInsertActivity.get());
+        if (activity == Activity.KNOWLEDGE_POST_PUBLIC
+                || activity == Activity.KNOWLEDGE_POST_PROTECTED
+                || activity == Activity.KNOWLEDGE_POST_PRIVATE) {
+            array.add(KnowledgesaveActivity.get());
         } else if (activity == Activity.KNOWLEDGE_SHOW) {
             array.add(KnowledgeShowActivity.get());
         } else if (activity == Activity.KNOWLEDGE_LIKE) {
@@ -81,6 +84,15 @@ private void execute(Activity activity, LoginedUser eventUser, Date eventDateTim
                 AbstractAddPointForCommentProcessor processor = (AbstractAddPointForCommentProcessor) activityProcessor;
                 processor.setComment(comment);
             }
+            if (activityProcessor instanceof AbstractActivityProcessor) {
+                AbstractActivityProcessor processor = (AbstractActivityProcessor) activityProcessor;
+                processor.setEventUser(eventUser);
+                processor.setEventDateTime(eventDateTime);
+            }
+            if (activityProcessor instanceof MultiActivityProcessor) {
+                MultiActivityProcessor processor = (MultiActivityProcessor) activityProcessor;
+                processor.setActivity(activity);
+            }
             try {
                 activityProcessor.execute();
             } catch (Exception e) {
@@ -94,16 +106,30 @@ private void execute(Activity activity, LoginedUser eventUser, Date eventDateTim
     public void processActivity(Activity activity, LoginedUser eventUser, Date eventDateTime) {
         execute(activity, eventUser, eventDateTime, null, null);
     }
-    
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void processActivity(Activity activity, LoginedUser eventUser, Date eventDateTime, KnowledgesEntity knowledge) {
         execute(activity, eventUser, eventDateTime, knowledge, null);
     }
-    
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void processActivity(Activity activity, LoginedUser eventUser, Date eventDateTime, CommentsEntity comment) {
         execute(activity, eventUser, eventDateTime, null, comment);
     }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void processKnowledgeSaveActivity(LoginedUser eventUser, Date eventDateTime, KnowledgesEntity knowledge) {
+        Activity activity = null;
+        if (knowledge.getPublicFlag().intValue() == KnowledgeLogic.PUBLIC_FLAG_PUBLIC) {
+            activity = Activity.KNOWLEDGE_POST_PUBLIC;
+        } else if (knowledge.getPublicFlag().intValue() == KnowledgeLogic.PUBLIC_FLAG_PROTECT) {
+            activity = Activity.KNOWLEDGE_POST_PROTECTED;
+        } else if (knowledge.getPublicFlag().intValue() == KnowledgeLogic.PUBLIC_FLAG_PRIVATE) {
+            activity = Activity.KNOWLEDGE_POST_PRIVATE;
+        }
+        if (activity == null) {
+            LOG.warn("invalid public flag. knowledge[]" + knowledge.getKnowledgeId());
+            return;
+        }
+        execute(activity, eventUser, eventDateTime, knowledge, null);
+    }
 
     public List<ContributionPointHistory> getUserPointHistoriesByDate(Integer userId, UserConfigs userConfigs) {
         return PointUserHistoriesDao.get().selectPointHistoriesByDate(userId, userConfigs);
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
deleted file mode 100644
index 973fdd701..000000000
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeInsertActivity.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.support.project.knowledge.logic.activity;
-
-import org.support.project.common.log.Log;
-import org.support.project.common.log.LogFactory;
-import org.support.project.common.util.StringUtils;
-import org.support.project.di.Container;
-import org.support.project.di.DI;
-import org.support.project.di.Instance;
-
-/**
- * ナレッジ登録時のポイント付与
- * 
- * 種類  | 獲得のタイプ  | ポイント付与先 | ポイント    | 獲得タイプの意味
- * 1    | 11          | 記事登録者    | 50       | 記事を投稿したら投稿者にポイント追加
- * 1    | 12          | 記事         | 50       | 登録された記事のポイント初期値
- * @author koda
- */
-@DI(instance = Instance.Prototype)
-public class KnowledgeInsertActivity extends AbstractAddPointForKnowledgeProcessor {
-    private static final Log LOG = LogFactory.getLog(KnowledgeInsertActivity.class);
-    public static KnowledgeInsertActivity get() {
-        return Container.getComp(KnowledgeInsertActivity.class);
-    }
-    @Override
-    protected Activity getActivity() {
-        LOG.debug("Start add point process on insert knowledge.");
-        return Activity.KNOWLEDGE_INSERT;
-    }
-    
-    private int getPoint() {
-        // 文章が多い力先はポイントが高いように調整
-        int point = 50;
-        if (StringUtils.isNotEmpty(getKnowledge().getContent()) && getKnowledge().getContent().length() > 1000) {
-            int add = (getKnowledge().getContent().length() - 1000) / 100;
-            if (add > 100) {
-                add = 100;
-            }
-            point += add;
-        }
-        return point;
-    }
-    
-    @Override
-    protected TypeAndPoint getTypeAndPointForActivityExecuter() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_INSERT, getPoint());
-    }
-    @Override
-    protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
-        return null;
-    }
-    @Override
-    protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_KNOWLEDGE_INSERTED, getPoint());
-    }
-}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
new file mode 100644
index 000000000..eb53771b2
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
@@ -0,0 +1,102 @@
+package org.support.project.knowledge.logic.activity;
+
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.StringUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.dao.ActivitiesDao;
+import org.support.project.knowledge.entity.ActivitiesEntity;
+
+/**
+ * ナレッジ投稿時のポイント付与
+ * 過去の投稿の公開区分によって、今回獲得するポイントが変化する
+ * 
+ * 種類  | 獲得のタイプ  | ポイント付与先 | ポイント    | 獲得タイプの意味
+ * 10   | 101         | 記事登録者    | 50       | 公開になった時点でトータル50になるように
+ * 10   | 103         | 記事         | 50       | 
+ * 11   | 111         | 記事登録者    | 30       | 
+ * 11   | 113         | 記事         | 30       | 
+ * 12   | 121         | 記事登録者    | 0        | このアクティビティの前に、投稿のアクティビティがあった場合、それを打ち消す（マイナスのポイント）
+ * 12   | 123         | 記事         | 0        | 
+ * @author koda
+ */
+@DI(instance = Instance.Prototype)
+public class KnowledgesaveActivity extends AbstractAddPointForKnowledgeProcessor implements MultiActivityProcessor {
+    private static final Log LOG = LogFactory.getLog(KnowledgesaveActivity.class);
+    public static KnowledgesaveActivity get() {
+        return Container.getComp(KnowledgesaveActivity.class);
+    }
+    private Activity activity;
+    public void setActivity(Activity activity) {
+        this.activity = activity;
+    }
+    @Override
+    protected Activity getActivity() {
+        LOG.info("Activity process start. " + activity.toString());
+        return activity;
+    }
+    private int point = 0;
+    private int getKindPoint(int kind) {
+        if (kind == Activity.KNOWLEDGE_POST_PUBLIC.getValue()) {
+            return 50;
+        } else if (kind == Activity.KNOWLEDGE_POST_PROTECTED.getValue()) {
+            return 30;
+        }
+        return 0;
+    }
+    private int getPoint() {
+        if (point != 0) {
+            return point;
+        }
+        // 過去に登録した情報があるか検索
+        ActivitiesEntity before = ActivitiesDao.get().selectBefore(
+                super.eventUser.getUserId(),
+                String.valueOf(getKnowledge().getKnowledgeId()),
+                Activity.KNOWLEDGE_POST_PUBLIC.getValue(),
+                Activity.KNOWLEDGE_POST_PROTECTED.getValue(),
+                Activity.KNOWLEDGE_POST_PRIVATE.getValue()
+                );
+        int point = getKindPoint(getActivity().getValue());
+        if (before == null) {
+            if (getActivity() == Activity.KNOWLEDGE_POST_PRIVATE) {
+                // 過去に登録した履歴が無く、今回が非公開ならポイント付けない
+                return 0;
+            }
+            // 文章が多い力先はポイントが高いように調整(初めの一回なので、初めの一回を超えて
+            if (StringUtils.isNotEmpty(getKnowledge().getContent()) && getKnowledge().getContent().length() > 1000) {
+                int add = (getKnowledge().getContent().length() - 1000) / 100;
+                if (add > 100) {
+                    add = 100;
+                }
+                point += add;
+            }
+        } else {
+            point = point - getKindPoint(before.getKind());
+        }
+        this.point = point;
+        return point;
+    }
+    
+    @Override
+    protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        int point = getPoint();
+        if (point == 0) {
+            return null;
+        }
+        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_INSERT, point);
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        return null;
+    }
+    @Override
+    protected TypeAndPoint getTypeAndPointForKnowledge() {
+        int point = getPoint();
+        if (point == 0) {
+            return null;
+        }
+        return new TypeAndPoint(TYPE_KNOWLEDGE_INSERTED, point);
+    }
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/MultiActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/MultiActivityProcessor.java
new file mode 100644
index 000000000..7bff43fb5
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/activity/MultiActivityProcessor.java
@@ -0,0 +1,12 @@
+package org.support.project.knowledge.logic.activity;
+
+
+/**
+ * 通常のActivityProcessorは、単一のActivityを処理することを想定しているが、
+ * 複数のActivityを一つのクラスで処理してしまいたいこともある。
+ * この場合、どのActivityとして呼び出されたかを保持する必要があるので、Activityを外部からセットするIFを持つ
+ * @author koda
+ */
+public interface MultiActivityProcessor {
+    void setActivity(Activity activity);
+}
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp
index d39495ed7..daf3f8086 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp
@@ -13,9 +13,12 @@
 
 <div class="row">
     <div class="col-xs-4">
+        <%-- 
         <a href="<%=request.getContextPath()%>/open.knowledge/activities/<%=jspUtil.out("knowledgeId")%><%=jspUtil.out("params")%>" class="text-primary btn-link">
         <i class="fa fa-heart-o" aria-hidden="true"></i>&nbsp;CP × <%= jspUtil.out("point") %>
         </a>
+        --%>
+        <i class="fa fa-heart-o" aria-hidden="true"></i>&nbsp;CP × <%= jspUtil.out("point") %>
     </div>
     <div class="col-xs-4">
         <a href="<%=request.getContextPath()%>/open.knowledge/likes/<%=jspUtil.out("knowledgeId")%><%=jspUtil.out("params")%>" class="text-primary btn-link">

From 52e7dbae5597f7f5835c0cb3c219601002480471 Mon Sep 17 00:00:00 2001
From: koda <koda.masaru3@gmail.com>
Date: Sat, 9 Sep 2017 05:39:46 +0900
Subject: [PATCH 058/138] #840 Change cp point add

---
 .../project/knowledge/control/Control.java    |  7 ++++
 .../filter/CloseAbleAuthenticationFilter.java |  1 -
 .../AbstractAddPointForCommentProcessor.java  | 22 ++++++++++---
 ...AbstractAddPointForKnowledgeProcessor.java |  1 -
 .../logic/activity/ActivityLogic.java         |  9 +++++
 .../logic/activity/ActivityProcessor.java     |  3 ++
 .../logic/activity/CommentInsertActivity.java | 33 +++++++++++++++++--
 .../logic/activity/CommentLikeActivity.java   |  9 +++++
 .../activity/KnowledgeAnswerActivity.java     |  6 ++++
 .../activity/KnowledgeEventActivity.java      |  6 ++++
 .../logic/activity/KnowledgeLikeActivity.java |  6 ++++
 .../logic/activity/KnowledgeShowActivity.java |  9 +++++
 .../activity/KnowledgeStockActivity.java      |  6 ++++
 src/main/resources/appresource.properties     |  8 +++--
 src/main/resources/appresource_ja.properties  | 10 ++++--
 15 files changed, 121 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/Control.java b/src/main/java/org/support/project/knowledge/control/Control.java
index 5410a42d3..50d6151ac 100644
--- a/src/main/java/org/support/project/knowledge/control/Control.java
+++ b/src/main/java/org/support/project/knowledge/control/Control.java
@@ -19,6 +19,7 @@
 import org.support.project.knowledge.dao.NotifyConfigsDao;
 import org.support.project.knowledge.entity.NotifyConfigsEntity;
 import org.support.project.knowledge.vo.UserConfigs;
+import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.common.HttpUtil;
 import org.support.project.web.logic.NotificationLogic;
@@ -184,6 +185,12 @@ protected UserConfigs getUserConfigs() {
         if (userConfigs == null) {
             userConfigs = new UserConfigs();
         }
+        LoginedUser login = getLoginedUser();
+        if (login != null) {
+            userConfigs.setLocale(login.getLocale());
+        } else {
+            userConfigs.setLocale(getLocale());
+        }
         return userConfigs;
     }
 
diff --git a/src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java b/src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java
index 1976654a4..93eea4d81 100644
--- a/src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java
+++ b/src/main/java/org/support/project/knowledge/filter/CloseAbleAuthenticationFilter.java
@@ -76,7 +76,6 @@ public void doFilter(ServletRequest servletrequest, ServletResponse servletrespo
             if (StringUtils.isInteger(offset)) {
                 userConfig.setTimezoneOffset(Integer.parseInt(offset));
             }
-            userConfig.setLocale(HttpUtil.getLocale(req));
             req.setAttribute(UserConfig.REQUEST_USER_CONFIG_KEY, userConfig);
             
             try {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
index 3a5fc0ce1..3290bcca2 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
@@ -14,6 +14,7 @@
 public abstract class AbstractAddPointForCommentProcessor extends AbstractActivityProcessor {
     private static final Log LOG = LogFactory.getLog(AbstractAddPointForCommentProcessor.class);
     private CommentsEntity comment;
+    private KnowledgesEntity parentKnowledge;
     /**
      * @return the comment
      */
@@ -25,8 +26,12 @@ public CommentsEntity getComment() {
      */
     public void setComment(CommentsEntity comment) {
         this.comment = comment;
+        this.parentKnowledge = KnowledgesDao.get().selectOnKey(getComment().getKnowledgeId());
     }
-    
+    public KnowledgesEntity getParentKnowledge() {
+        return parentKnowledge;
+    }
+
     protected abstract Activity getActivity();
     protected abstract TypeAndPoint getTypeAndPointForActivityExecuter();
     protected abstract TypeAndPoint getTypeAndPointForCommentOwner();
@@ -44,12 +49,22 @@ public void execute() throws Exception {
                     + " [comment]" + getComment().getCommentNo());
             return;
         }
-        KnowledgesEntity parentKnowledge = KnowledgesDao.get().selectOnKey(getComment().getKnowledgeId());
         if (parentKnowledge == null) {
             LOG.info("Knowledge is not found. [comment] " + getComment().getCommentNo() + " [knowledge]" + getComment().getKnowledgeId());
             return;
         }
         
+        TypeAndPoint exec = getTypeAndPointForActivityExecuter();
+        TypeAndPoint owner = getTypeAndPointForCommentOwner();
+        TypeAndPoint knowledge = getTypeAndPointForKnowledge();
+        if (exec == null && owner == null && knowledge == null) {
+            // ポイントをつける対象が無いので、処理終了
+            LOG.info("This activity is not add point. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+            + " [comment]" + getComment().getCommentNo());
+            return;
+        }
+
+        
         LOG.info("activity process started. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
         + " [comment]" + getComment().getCommentNo());
         
@@ -62,7 +77,6 @@ public void execute() throws Exception {
                 String.valueOf(getComment().getCommentNo()));
         
         // 実行したユーザのポイントアップ
-        TypeAndPoint exec = getTypeAndPointForActivityExecuter();
         if (exec != null) {
             int point = addPointForUser(
                     eventUser.getUserId(), // ターゲットは、実行したユーザ
@@ -72,7 +86,6 @@ public void execute() throws Exception {
             logmsg.append("\n\tAdd event user: [id]" + eventUser.getUserId() + " [type]" + exec.type + " [add]" + exec.point + " [result]" + point);
         }
          // コメントの登録者のポイントをアップ
-        TypeAndPoint owner = getTypeAndPointForCommentOwner();
         if (owner != null) {
             int point = addPointForUser(
                     getComment().getInsertUser(), // ターゲットは登録者
@@ -82,7 +95,6 @@ public void execute() throws Exception {
             logmsg.append("\n\tAdd owner user: [id]" + getComment().getInsertUser() + " [type]" + owner.type + " [add]" + owner.point + " [result]" + point);
         }
          // 記事のポイントアップ（コメントにはポイントをもっていないので、親のナレッジのポイントをアップ）
-        TypeAndPoint knowledge = getTypeAndPointForKnowledge();
         if (knowledge != null) {
             int point = addPointForKnowledge(
                     parentKnowledge.getKnowledgeId(),
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
index a085399e6..34be1160e 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
@@ -1,6 +1,5 @@
 package org.support.project.knowledge.logic.activity;
 
-import org.bouncycastle.jcajce.provider.asymmetric.dsa.DSASigner.noneDSA;
 import org.support.project.aop.Aspect;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index 0f0e86bc6..14e71e0d9 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -151,6 +151,15 @@ private String getActivityMsg(PointUserHistoriesEntity history, Map<Long, Activi
             return resources.getResource("knowledge.activity.type.21.do.show", activity.getTarget());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_SHOWN_BY_OHER) {
             return resources.getResource("knowledge.activity.type.22.shown", activity.getTarget(), activity.getUserName());
+        
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_LIKE) {
+            return resources.getResource("knowledge.activity.type.31.do.like", activity.getTarget(), activity.getUserName());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_LIKED_BY_OHER) {
+            return resources.getResource("knowledge.activity.type.32.liked", activity.getTarget(), activity.getUserName());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_STOCK) {
+            return resources.getResource("knowledge.activity.type.41.do.stock", activity.getTarget(), activity.getUserName());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_STOCKED_BY_OHER) {
+            return resources.getResource("knowledge.activity.type.42.stocked", activity.getTarget(), activity.getUserName());
         }
         return "";
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
index 647c2093b..a9b9cbed8 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
@@ -18,6 +18,9 @@ public interface ActivityProcessor {
     public static final int TYPE_KNOWLEDGE_DO_JOIN_EVENT = 61;
     public static final int TYPE_KNOWLEDGE_JOINED_BY_OHER = 62;
     public static final int TYPE_KNOWLEDGE_JOINED = 63;
+    
+    
+    
     public static final int TYPE_COMMENT_DO_INSERT = 1011;
     public static final int TYPE_COMMENT_INSERTED = 1013;
     public static final int TYPE_COMMENT_DO_LIKE = 1031;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java
index 6f2546a38..e8521aebf 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/CommentInsertActivity.java
@@ -7,6 +7,7 @@
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.dao.CommentsDao;
+import org.support.project.knowledge.logic.KnowledgeLogic;
 
 /**
  * 
@@ -24,12 +25,30 @@ public static CommentInsertActivity get() {
     
     private int point = 0;
     
+    private int getKnowledgePoint() {
+        if (getParentKnowledge().getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PRIVATE) {
+            // 非公開の記事にポイントをつけてもポイントにはならない
+            return 0;
+        }
+        int point = 0;
+        if (getParentKnowledge().getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PUBLIC) {
+            point = 20;
+        } else if (getParentKnowledge().getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PROTECT) {
+            point = 10;
+        }
+        return point;
+    }
+    
     private int getPoint() {
         if (point != 0) {
             return point;
         }
+        if (getParentKnowledge().getPublicFlag() == KnowledgeLogic.PUBLIC_FLAG_PRIVATE) {
+            // 非公開の記事にポイントをつけてもポイントにはならない
+            return 0;
+        }
         // 指定の記事に登録した、ユニークなユーザ数によりポイントを変える
-        int point = 20;
+        int point = getKnowledgePoint();
         long count = CommentsDao.get().selectUniqueUserCountOnKnowledgeId(getComment().getKnowledgeId());
         int add = 0;
         if (count > 100) {
@@ -54,7 +73,11 @@ protected Activity getActivity() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForActivityExecuter() {
-        return new TypeAndPoint(TYPE_COMMENT_DO_INSERT, 20);
+        int point = getKnowledgePoint();
+        if (point == 0) {
+            return null;
+        }
+        return new TypeAndPoint(TYPE_COMMENT_DO_INSERT, point);
     }
     @Override
     protected TypeAndPoint getTypeAndPointForCommentOwner() {
@@ -62,7 +85,11 @@ protected TypeAndPoint getTypeAndPointForCommentOwner() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        return new TypeAndPoint(TYPE_COMMENT_INSERTED, getPoint());
+        int point = getPoint();
+        if (point == 0) {
+            return null;
+        }
+        return new TypeAndPoint(TYPE_COMMENT_INSERTED, point);
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
index d86647964..2ae15010c 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
@@ -55,14 +55,23 @@ protected Activity getActivity() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        if (eventUser.getUserId().intValue() == getComment().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_COMMENT_DO_LIKE, 2);
     }
     @Override
     protected TypeAndPoint getTypeAndPointForCommentOwner() {
+        if (eventUser.getUserId().intValue() == getComment().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_COMMENT_LIKED_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
+        if (eventUser.getUserId().intValue() == getParentKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_COMMENT_LIKED, getPoint());
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
index edad428e1..6d5bc5514 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
@@ -43,10 +43,16 @@ protected TypeAndPoint getTypeAndPointForActivityExecuter() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_ANSWERD_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_ANSWERD, getPoint());
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
index 1e1935f72..3e1975360 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
@@ -59,10 +59,16 @@ protected TypeAndPoint getTypeAndPointForActivityExecuter() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_JOINED_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_JOINED, getPoint());
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
index f9b2dd8d7..25fe4865c 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
@@ -58,10 +58,16 @@ protected TypeAndPoint getTypeAndPointForActivityExecuter() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_LIKED_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_LIKED, getPoint());
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
index 9b559b924..11aa26f95 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
@@ -45,14 +45,23 @@ private int getPoint() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForActivityExecuter() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_DO_SHOW, 1);
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_SHOWN_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_SHOWN, getPoint());
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
index ecd805968..7e54fe9c3 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
@@ -45,10 +45,16 @@ protected TypeAndPoint getTypeAndPointForActivityExecuter() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_STOCKED_BY_OHER, getPoint());
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
+        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
+            return null;
+        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_STOCKED, getPoint());
     }
 
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 14684ebfd..278fa98c0 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -854,8 +854,12 @@ knowledge.maintenance.migrate.title=Database migration
 knowledge.maintenance.migrate.message=You can execute database migration. recommend to backup database data.
 
 knowledge.activity.type.11.do.insert=This user posted #{1}
-knowledge.activity.type.13.inserted=#{1} was posted by {2}
 knowledge.activity.type.21.do.show=This user showed #{1}
 knowledge.activity.type.22.shown=#{1} was shown by {2}
-knowledge.activity.type.23.shown=#{1} was shown by {2}
+knowledge.activity.type.31.do.like=This user liked #{1}
+knowledge.activity.type.32.liked=#{1} was liked by {2}
+knowledge.activity.type.41.do.stock=This user stocked #{1}
+knowledge.activity.type.42.stocked=#{1} was stocked by {2}
 
+knowledge.activity.type.13.inserted=#{1} was posted by {2}
+knowledge.activity.type.23.shown=#{1} was shown by {2}
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index 19693ee28..88abe79ad 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -853,11 +853,15 @@ knowledge.maintenance.do.migrate.no.login=メンテナンス管理を実行(管
 knowledge.maintenance.migrate.title=Database migration
 knowledge.maintenance.migrate.message=DBのマイグレーションを実行します。事前にDBのバックアップを取ることをオススメします。
 
-knowledge.activity.type.11.do.insert=このユーザが #{1} の記事を投稿しました
-knowledge.activity.type.13.inserted=#{1} の記事が、{2} によって投稿されました
+knowledge.activity.type.11.do.insert=#{1} の記事を投稿しました
 knowledge.activity.type.21.do.show=#{1} の記事を参照しました
 knowledge.activity.type.22.shown=このユーザが投稿した #{1} の記事を、{2} が参照しました
-knowledge.activity.type.23.shown=#{1} の記事を、{2} が参照しました
+knowledge.activity.type.31.do.like=#{1} の記事にいいねを押しました
+knowledge.activity.type.32.liked=このユーザが投稿した #{1} の記事を、{2} がいいね！を押しました
+knowledge.activity.type.41.do.stock=#{1} の記事をストックしました
+knowledge.activity.type.42.stocked=このユーザが投稿した #{1} の記事を、{2} ストックしました
 
+knowledge.activity.type.13.inserted=#{1} の記事が、{2} によって投稿されました
+knowledge.activity.type.23.shown=#{1} の記事を、{2} が参照しました
 
 

From 997aa5970bc18dbd0b429fce13a4202b4b232814 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sat, 9 Sep 2017 06:20:29 +0900
Subject: [PATCH 059/138] #840 Add activity history message

---
 .../logic/activity/ActivityLogic.java         | 29 ++++++++++++++++++-
 .../logic/activity/ActivityProcessor.java     |  7 ++++-
 .../logic/activity/KnowledgesaveActivity.java | 24 +++++++++++++--
 src/main/resources/appresource.properties     | 10 +++++++
 src/main/resources/appresource_ja.properties  | 14 +++++++--
 5 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index 14e71e0d9..efd19d119 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -15,6 +15,7 @@
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.dao.ActivitiesDao;
+import org.support.project.knowledge.dao.CommentsDao;
 import org.support.project.knowledge.dao.PointUserHistoriesDao;
 import org.support.project.knowledge.entity.ActivitiesEntity;
 import org.support.project.knowledge.entity.CommentsEntity;
@@ -151,7 +152,6 @@ private String getActivityMsg(PointUserHistoriesEntity history, Map<Long, Activi
             return resources.getResource("knowledge.activity.type.21.do.show", activity.getTarget());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_SHOWN_BY_OHER) {
             return resources.getResource("knowledge.activity.type.22.shown", activity.getTarget(), activity.getUserName());
-        
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_LIKE) {
             return resources.getResource("knowledge.activity.type.31.do.like", activity.getTarget(), activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_LIKED_BY_OHER) {
@@ -160,6 +160,33 @@ private String getActivityMsg(PointUserHistoriesEntity history, Map<Long, Activi
             return resources.getResource("knowledge.activity.type.41.do.stock", activity.getTarget(), activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_STOCKED_BY_OHER) {
             return resources.getResource("knowledge.activity.type.42.stocked", activity.getTarget(), activity.getUserName());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_ANSWER) {
+            return resources.getResource("knowledge.activity.type.51.do.ansewer", activity.getTarget(), activity.getUserName());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_ANSWERD_BY_OHER) {
+            return resources.getResource("knowledge.activity.type.52.answered", activity.getTarget(), activity.getUserName());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_JOIN_EVENT) {
+            return resources.getResource("knowledge.activity.type.61.do.join", activity.getTarget(), activity.getUserName());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_JOINED_BY_OHER) {
+            return resources.getResource("knowledge.activity.type.62.joined", activity.getTarget(), activity.getUserName());
+
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_POST_PUBLIC) {
+            return resources.getResource("knowledge.activity.type.101.do.post.public", activity.getTarget(), activity.getUserName());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_POST_PROTECT) {
+            return resources.getResource("knowledge.activity.type.111.do.post.protect", activity.getTarget(), activity.getUserName());
+        } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_POST_PRIVATE) {
+            return resources.getResource("knowledge.activity.type.121.do.post.private", activity.getTarget(), activity.getUserName());
+
+        } else if (history.getType() >= ActivityProcessor.TYPE_COMMENT_DO_INSERT) {
+            CommentsEntity comment = CommentsDao.get().selectOnKey(new Long(activity.getTarget()));
+            if (comment != null) {
+                if (history.getType() == ActivityProcessor.TYPE_COMMENT_DO_INSERT) {
+                    return resources.getResource("knowledge.activity.type.1011.do.comment.insert", String.valueOf(comment.getKnowledgeId()), activity.getUserName());
+                } else if (history.getType() == ActivityProcessor.TYPE_COMMENT_DO_LIKE) {
+                    return resources.getResource("knowledge.activity.type.1031.do.comment.like", String.valueOf(comment.getKnowledgeId()), activity.getUserName());
+                } else if (history.getType() == ActivityProcessor.TYPE_COMMENT_LIKED_BY_OHER) {
+                    return resources.getResource("knowledge.activity.type.1032.comment.liked", String.valueOf(comment.getKnowledgeId()), activity.getUserName());
+                }
+            }
         }
         return "";
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
index a9b9cbed8..e28df5526 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityProcessor.java
@@ -19,7 +19,12 @@ public interface ActivityProcessor {
     public static final int TYPE_KNOWLEDGE_JOINED_BY_OHER = 62;
     public static final int TYPE_KNOWLEDGE_JOINED = 63;
     
-    
+    public static final int TYPE_KNOWLEDGE_DO_POST_PUBLIC = 101;
+    public static final int TYPE_KNOWLEDGE_POSTED_PUBLIC = 103;
+    public static final int TYPE_KNOWLEDGE_DO_POST_PROTECT = 111;
+    public static final int TYPE_KNOWLEDGE_POSTED_PROTECT = 113;
+    public static final int TYPE_KNOWLEDGE_DO_POST_PRIVATE = 121;
+    public static final int TYPE_KNOWLEDGE_POSTED_PRIVATE = 123;
     
     public static final int TYPE_COMMENT_DO_INSERT = 1011;
     public static final int TYPE_COMMENT_INSERTED = 1013;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
index eb53771b2..2f5a85ff7 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
@@ -78,6 +78,26 @@ private int getPoint() {
         this.point = point;
         return point;
     }
+    private int getTypeForExecuter() {
+        if (getActivity() == Activity.KNOWLEDGE_POST_PUBLIC) {
+            return TYPE_KNOWLEDGE_DO_POST_PUBLIC;
+        } else if (getActivity() == Activity.KNOWLEDGE_POST_PROTECTED) {
+            return TYPE_KNOWLEDGE_DO_POST_PROTECT;
+        } else if (getActivity() == Activity.KNOWLEDGE_POST_PRIVATE) {
+            return TYPE_KNOWLEDGE_DO_POST_PRIVATE;
+        }
+        return -1;
+    }
+    private int getTypeForKnowledge() {
+        if (getActivity() == Activity.KNOWLEDGE_POST_PUBLIC) {
+            return TYPE_KNOWLEDGE_POSTED_PUBLIC;
+        } else if (getActivity() == Activity.KNOWLEDGE_POST_PROTECTED) {
+            return TYPE_KNOWLEDGE_POSTED_PROTECT;
+        } else if (getActivity() == Activity.KNOWLEDGE_POST_PRIVATE) {
+            return TYPE_KNOWLEDGE_POSTED_PRIVATE;
+        }
+        return -1;
+    }
     
     @Override
     protected TypeAndPoint getTypeAndPointForActivityExecuter() {
@@ -85,7 +105,7 @@ protected TypeAndPoint getTypeAndPointForActivityExecuter() {
         if (point == 0) {
             return null;
         }
-        return new TypeAndPoint(TYPE_KNOWLEDGE_DO_INSERT, point);
+        return new TypeAndPoint(getTypeForExecuter(), point);
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
@@ -97,6 +117,6 @@ protected TypeAndPoint getTypeAndPointForKnowledge() {
         if (point == 0) {
             return null;
         }
-        return new TypeAndPoint(TYPE_KNOWLEDGE_INSERTED, point);
+        return new TypeAndPoint(getTypeForKnowledge(), point);
     }
 }
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 278fa98c0..45c895468 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -860,6 +860,16 @@ knowledge.activity.type.31.do.like=This user liked #{1}
 knowledge.activity.type.32.liked=#{1} was liked by {2}
 knowledge.activity.type.41.do.stock=This user stocked #{1}
 knowledge.activity.type.42.stocked=#{1} was stocked by {2}
+knowledge.activity.type.51.do.ansewer=This user answered to survey on #{1}
+knowledge.activity.type.52.answered=#{1}'s survey was answered by {2}
+knowledge.activity.type.61.do.join=This user registration event to #{1}
+knowledge.activity.type.62.joined=#{1}'s event was registered by {2}
+knowledge.activity.type.101.do.post.public=This user posted #{1} to Public
+knowledge.activity.type.111.do.post.protect=This user posted #{1} to Protect
+knowledge.activity.type.121.do.post.private=This user posted #{1} to Private
+knowledge.activity.type.1011.do.comment.insert=This user posted comment to #{1}
+knowledge.activity.type.1031.do.comment.like=This user liked #{1}'s comment
+knowledge.activity.type.1032.comment.liked=This user's comment on #{1} was liked by {2}
 
 knowledge.activity.type.13.inserted=#{1} was posted by {2}
 knowledge.activity.type.23.shown=#{1} was shown by {2}
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index 88abe79ad..cb2825e5c 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -856,10 +856,20 @@ knowledge.maintenance.migrate.message=DBのマイグレーションを実行し
 knowledge.activity.type.11.do.insert=#{1} の記事を投稿しました
 knowledge.activity.type.21.do.show=#{1} の記事を参照しました
 knowledge.activity.type.22.shown=このユーザが投稿した #{1} の記事を、{2} が参照しました
-knowledge.activity.type.31.do.like=#{1} の記事にいいねを押しました
+knowledge.activity.type.31.do.like=#{1} の記事にいいね！を押しました
 knowledge.activity.type.32.liked=このユーザが投稿した #{1} の記事を、{2} がいいね！を押しました
 knowledge.activity.type.41.do.stock=#{1} の記事をストックしました
-knowledge.activity.type.42.stocked=このユーザが投稿した #{1} の記事を、{2} ストックしました
+knowledge.activity.type.42.stocked=このユーザが投稿した #{1} の記事を、{2} がストックしました
+knowledge.activity.type.51.do.ansewer=#{1} のアンケートに回答しました
+knowledge.activity.type.52.answered=このユーザが投稿した #{1} の記事のアンケートに、{2} が回答しました
+knowledge.activity.type.61.do.join=#{1} のイベントに参加登録しました
+knowledge.activity.type.62.joined=このユーザが投稿した #{1} のイベントに、{2} が参加登録しました
+knowledge.activity.type.101.do.post.public=#{1} の記事を「公開」で投稿しました
+knowledge.activity.type.111.do.post.protect=#{1} の記事を「保護」で投稿しました
+knowledge.activity.type.121.do.post.private=#{1} の記事を「非公開」で投稿しました
+knowledge.activity.type.1011.do.comment.insert=#{1} の記事にコメントを登録しました
+knowledge.activity.type.1031.do.comment.like=#{1} の記事のコメントにいいね！を押しました
+knowledge.activity.type.1032.comment.liked=このユーザが投稿した #{1} の記事のコメントに、{2} がいいね！を押しました
 
 knowledge.activity.type.13.inserted=#{1} の記事が、{2} によって投稿されました
 knowledge.activity.type.23.shown=#{1} の記事を、{2} が参照しました

From 4e409398b7bc2bb25cca502c40a387a7aa21b0fc Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sat, 9 Sep 2017 07:13:58 +0900
Subject: [PATCH 060/138] Fix front-end library compresseion

---
 src/main/webapp/WEB-INF/views/commons/maintenance.jsp | 2 ++
 src/main/webapp/WEB-INF/views/commons/migrate.jsp     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/main/webapp/WEB-INF/views/commons/maintenance.jsp b/src/main/webapp/WEB-INF/views/commons/maintenance.jsp
index 721d8c3c9..d12710fcb 100644
--- a/src/main/webapp/WEB-INF/views/commons/maintenance.jsp
+++ b/src/main/webapp/WEB-INF/views/commons/maintenance.jsp
@@ -85,9 +85,11 @@
 <% } %>
 
 
+<!-- build:js(src/main/webapp) js/page-maintenance.js -->
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/jquery/dist/jquery.min.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/bootstrap/dist/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/bluebird/js/browser/bluebird.min.js"></script>
+<!-- endbuild -->
 
 </body>
 
diff --git a/src/main/webapp/WEB-INF/views/commons/migrate.jsp b/src/main/webapp/WEB-INF/views/commons/migrate.jsp
index 6e76ac028..d911fac18 100644
--- a/src/main/webapp/WEB-INF/views/commons/migrate.jsp
+++ b/src/main/webapp/WEB-INF/views/commons/migrate.jsp
@@ -75,9 +75,11 @@ latest database version: <%= InitDB.CURRENT %><br/>
 
 <a href="<%= request.getContextPath() %>/"><i class="fa fa-home" aria-hidden="true"></i>Back to knowledge top</a>
 
+<!-- build:js(src/main/webapp) js/page-migrate.js -->
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/jquery/dist/jquery.min.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/bootstrap/dist/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/bluebird/js/browser/bluebird.min.js"></script>
+<!-- endbuild -->
 
 <script>
 $('#startMigrate').click(function() {

From 152e4784b960cb87762122bf552b88e9f2b340ad Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 10 Sep 2017 08:15:36 +0900
Subject: [PATCH 061/138] #845 Add html escape for template information

---
 .../views/protect/knowledge/partials/partials-edit-meta.jsp  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-meta.jsp b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-meta.jsp
index d18a248bf..f603f260e 100644
--- a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-meta.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-meta.jsp
@@ -1,3 +1,4 @@
+<%@page import="org.support.project.common.util.HtmlUtils"%>
 <%@page pageEncoding="UTF-8" isELIgnored="false" session="false" errorPage="/WEB-INF/views/commons/errors/jsp_error.jsp"%>
 <%@page import="java.io.PrintWriter"%>
 <%@page import="org.support.project.common.util.StringUtils"%>
@@ -40,11 +41,11 @@
                         }
                         builder.append(" />");
                         if (!StringUtils.isEmpty(template.getTypeIcon())) {
-                            builder.append("<i class=\"fa ").append(template.getTypeIcon()).append("\" ></i>&nbsp;");
+                            builder.append("<i class=\"fa ").append(HtmlUtils.escapeHTML(template.getTypeIcon())).append("\" ></i>&nbsp;");
                         } else {
                             builder.append("<i class=\"fa fa-edit\"></i>&nbsp;");
                         }
-                        builder.append(template.getTypeName());
+                        builder.append(HtmlUtils.escapeHTML(template.getTypeName()));
                         %>
                         <%= builder.toString() %>
                     </label>

From b829256aa48d35f3b9495b2807364a09a0b1f742 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 10 Sep 2017 09:46:55 +0900
Subject: [PATCH 062/138] #840 Add display link for user information page

---
 .../control/open/AccountControl.java          |  1 +
 .../logic/activity/ActivityLogic.java         | 92 +++++++++++++++----
 src/main/resources/appresource.properties     | 40 ++++----
 src/main/resources/appresource_ja.properties  | 40 ++++----
 .../WEB-INF/views/open/account/account.jsp    |  2 +-
 .../open/knowledge/partials/common_list.jsp   |  3 +-
 .../partials/partials-view-comment-list.jsp   | 16 ++--
 src/main/webapp/js/account-page.js            |  9 ++
 8 files changed, 135 insertions(+), 68 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/open/AccountControl.java b/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
index 4d72f1cb7..3208f3bf2 100644
--- a/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/AccountControl.java
@@ -166,6 +166,7 @@ public Boundary activity() throws Exception {
             offset = getParam("offset", Integer.class);
         }
         List<ActivityHistory> list = ActivityLogic.get().getUserPointHistoriese(userId, limit, offset, getUserConfigs());
+        setSendEscapeHtml(false);
         return send(list);
     }
     
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index efd19d119..9b9cfa15a 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -10,10 +10,13 @@
 import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.HtmlUtils;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.SystemConfig;
 import org.support.project.knowledge.dao.ActivitiesDao;
 import org.support.project.knowledge.dao.CommentsDao;
 import org.support.project.knowledge.dao.PointUserHistoriesDao;
@@ -27,6 +30,8 @@
 import org.support.project.knowledge.vo.UserConfigs;
 import org.support.project.ormapping.config.Order;
 import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.SystemConfigsDao;
+import org.support.project.web.entity.SystemConfigsEntity;
 import org.support.project.web.logic.DateConvertLogic;
 
 @DI(instance = Instance.Singleton)
@@ -139,57 +144,94 @@ public List<ContributionPointHistory> getUserPointHistoriesByDate(Integer userId
     private String getDisplayDate(Date date, UserConfigs userConfigs) {
         return DateConvertLogic.get().convertDate(date, userConfigs.getLocale(), String.valueOf(userConfigs.getTimezoneOffset()));
     }
-    
-    private String getActivityMsg(PointUserHistoriesEntity history, Map<Long, ActivitiesEntity> activities, UserConfigs userConfigs) {
+    private String convKnowledgeLink(String systemUrl, String target) {
+        StringBuilder builder = new StringBuilder();
+        builder.append("<a href=\"");
+        builder.append(systemUrl);
+        builder.append("open.knowledge/view/");
+        builder.append(target);
+        builder.append("\">#");
+        builder.append(target);
+        builder.append("</a>");
+        return builder.toString();
+    }
+    private String convUserLink(String systemUrl, Integer userID, String userName) {
+        StringBuilder builder = new StringBuilder();
+        builder.append("<a href=\"");
+        builder.append(systemUrl);
+        builder.append("open.account/info/");
+        builder.append(userID);
+        builder.append("\">");
+        builder.append(HtmlUtils.escapeHTML(userName));
+        builder.append("</a>");
+        return builder.toString();
+    }
+    private String getActivityMsg(PointUserHistoriesEntity history, Map<Long, ActivitiesEntity> activities, UserConfigs userConfigs, String systemUrl) {
         Resources resources = Resources.getInstance(userConfigs.getLocale());
         ActivitiesEntity activity = activities.get(history.getActivityNo());
         if (activity == null) {
             return "";
         }
         if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_INSERT) {
-            return resources.getResource("knowledge.activity.type.11.do.insert", activity.getTarget());
+            return resources.getResource("knowledge.activity.type.11.do.insert", convKnowledgeLink(systemUrl, activity.getTarget()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_SHOW) {
-            return resources.getResource("knowledge.activity.type.21.do.show", activity.getTarget());
+            return resources.getResource("knowledge.activity.type.21.do.show", convKnowledgeLink(systemUrl, activity.getTarget()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_SHOWN_BY_OHER) {
-            return resources.getResource("knowledge.activity.type.22.shown", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.22.shown", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_LIKE) {
-            return resources.getResource("knowledge.activity.type.31.do.like", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.31.do.like", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_LIKED_BY_OHER) {
-            return resources.getResource("knowledge.activity.type.32.liked", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.32.liked", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_STOCK) {
-            return resources.getResource("knowledge.activity.type.41.do.stock", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.41.do.stock", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_STOCKED_BY_OHER) {
-            return resources.getResource("knowledge.activity.type.42.stocked", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.42.stocked", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_ANSWER) {
-            return resources.getResource("knowledge.activity.type.51.do.ansewer", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.51.do.ansewer", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_ANSWERD_BY_OHER) {
-            return resources.getResource("knowledge.activity.type.52.answered", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.52.answered", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_JOIN_EVENT) {
-            return resources.getResource("knowledge.activity.type.61.do.join", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.61.do.join", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_JOINED_BY_OHER) {
-            return resources.getResource("knowledge.activity.type.62.joined", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.62.joined", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
 
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_POST_PUBLIC) {
-            return resources.getResource("knowledge.activity.type.101.do.post.public", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.101.do.post.public", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_POST_PROTECT) {
-            return resources.getResource("knowledge.activity.type.111.do.post.protect", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.111.do.post.protect", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_POST_PRIVATE) {
-            return resources.getResource("knowledge.activity.type.121.do.post.private", activity.getTarget(), activity.getUserName());
+            return resources.getResource("knowledge.activity.type.121.do.post.private", convKnowledgeLink(systemUrl, activity.getTarget()),
+                    activity.getUserName());
 
         } else if (history.getType() >= ActivityProcessor.TYPE_COMMENT_DO_INSERT) {
             CommentsEntity comment = CommentsDao.get().selectOnKey(new Long(activity.getTarget()));
             if (comment != null) {
                 if (history.getType() == ActivityProcessor.TYPE_COMMENT_DO_INSERT) {
-                    return resources.getResource("knowledge.activity.type.1011.do.comment.insert", String.valueOf(comment.getKnowledgeId()), activity.getUserName());
+                    return resources.getResource("knowledge.activity.type.1011.do.comment.insert",
+                            convKnowledgeLink(systemUrl, String.valueOf(comment.getKnowledgeId())), activity.getUserName());
                 } else if (history.getType() == ActivityProcessor.TYPE_COMMENT_DO_LIKE) {
-                    return resources.getResource("knowledge.activity.type.1031.do.comment.like", String.valueOf(comment.getKnowledgeId()), activity.getUserName());
+                    return resources.getResource("knowledge.activity.type.1031.do.comment.like",
+                            convKnowledgeLink(systemUrl, String.valueOf(comment.getKnowledgeId())), activity.getUserName());
                 } else if (history.getType() == ActivityProcessor.TYPE_COMMENT_LIKED_BY_OHER) {
-                    return resources.getResource("knowledge.activity.type.1032.comment.liked", String.valueOf(comment.getKnowledgeId()), activity.getUserName());
+                    return resources.getResource("knowledge.activity.type.1032.comment.liked",
+                            convKnowledgeLink(systemUrl, String.valueOf(comment.getKnowledgeId())), activity.getUserName());
                 }
             }
         }
         return "";
     }
+
     public List<ActivityHistory> getUserPointHistoriese(Integer userId, int limit, int offset, UserConfigs userConfigs) {
         List<PointUserHistoriesEntity> histories = PointUserHistoriesDao.get().selectOnUser(userId, limit, offset, Order.DESC);
         List<Long> activityNos = new ArrayList<>();
@@ -201,9 +243,19 @@ public List<ActivityHistory> getUserPointHistoriese(Integer userId, int limit, i
         for (ActivitiesEntity activitiesEntity : activityList) {
             activities.put(activitiesEntity.getActivityNo(), activitiesEntity);
         }
+        
+        SystemConfigsDao dao = SystemConfigsDao.get();
+        SystemConfigsEntity config = dao.selectOnKey(SystemConfig.SYSTEM_URL, AppConfig.get().getSystemName());
+        StringBuilder builder = new StringBuilder();
+        if (config != null) {
+            builder.append(config.getConfigValue());
+            if (!config.getConfigValue().endsWith("/")) {
+                builder.append("/");
+            }
+        }
         List<ActivityHistory> list = new ArrayList<>();
         for (PointUserHistoriesEntity history : histories) {
-            String msg = getActivityMsg(history, activities, userConfigs);
+            String msg = getActivityMsg(history, activities, userConfigs, builder.toString());
             if (StringUtils.isNotEmpty(msg)) {
                 ActivityHistory activity = new ActivityHistory();
                 activity.setDate(history.getInsertDatetime());
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 45c895468..44183011f 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -853,23 +853,23 @@ knowledge.maintenance.do.migrate.no.login=Execute maintenance(only administrator
 knowledge.maintenance.migrate.title=Database migration
 knowledge.maintenance.migrate.message=You can execute database migration. recommend to backup database data.
 
-knowledge.activity.type.11.do.insert=This user posted #{1}
-knowledge.activity.type.21.do.show=This user showed #{1}
-knowledge.activity.type.22.shown=#{1} was shown by {2}
-knowledge.activity.type.31.do.like=This user liked #{1}
-knowledge.activity.type.32.liked=#{1} was liked by {2}
-knowledge.activity.type.41.do.stock=This user stocked #{1}
-knowledge.activity.type.42.stocked=#{1} was stocked by {2}
-knowledge.activity.type.51.do.ansewer=This user answered to survey on #{1}
-knowledge.activity.type.52.answered=#{1}'s survey was answered by {2}
-knowledge.activity.type.61.do.join=This user registration event to #{1}
-knowledge.activity.type.62.joined=#{1}'s event was registered by {2}
-knowledge.activity.type.101.do.post.public=This user posted #{1} to Public
-knowledge.activity.type.111.do.post.protect=This user posted #{1} to Protect
-knowledge.activity.type.121.do.post.private=This user posted #{1} to Private
-knowledge.activity.type.1011.do.comment.insert=This user posted comment to #{1}
-knowledge.activity.type.1031.do.comment.like=This user liked #{1}'s comment
-knowledge.activity.type.1032.comment.liked=This user's comment on #{1} was liked by {2}
-
-knowledge.activity.type.13.inserted=#{1} was posted by {2}
-knowledge.activity.type.23.shown=#{1} was shown by {2}
+knowledge.activity.type.11.do.insert=This user posted {1}
+knowledge.activity.type.21.do.show=This user showed {1}
+knowledge.activity.type.22.shown={1} was shown by {2}
+knowledge.activity.type.31.do.like=This user liked {1}
+knowledge.activity.type.32.liked={1} was liked by {2}
+knowledge.activity.type.41.do.stock=This user stocked {1}
+knowledge.activity.type.42.stocked={1} was stocked by {2}
+knowledge.activity.type.51.do.ansewer=This user answered to survey on {1}
+knowledge.activity.type.52.answered={1}'s survey was answered by {2}
+knowledge.activity.type.61.do.join=This user registration event to {1}
+knowledge.activity.type.62.joined={1}'s event was registered by {2}
+knowledge.activity.type.101.do.post.public=This user posted {1} to Public
+knowledge.activity.type.111.do.post.protect=This user posted {1} to Protect
+knowledge.activity.type.121.do.post.private=This user posted {1} to Private
+knowledge.activity.type.1011.do.comment.insert=This user posted comment to {1}
+knowledge.activity.type.1031.do.comment.like=This user liked {1}'s comment
+knowledge.activity.type.1032.comment.liked=This user's comment on {1} was liked by {2}
+
+knowledge.activity.type.13.inserted={1} was posted by {2}
+knowledge.activity.type.23.shown={1} was shown by {2}
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index cb2825e5c..c92532030 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -853,25 +853,25 @@ knowledge.maintenance.do.migrate.no.login=メンテナンス管理を実行(管
 knowledge.maintenance.migrate.title=Database migration
 knowledge.maintenance.migrate.message=DBのマイグレーションを実行します。事前にDBのバックアップを取ることをオススメします。
 
-knowledge.activity.type.11.do.insert=#{1} の記事を投稿しました
-knowledge.activity.type.21.do.show=#{1} の記事を参照しました
-knowledge.activity.type.22.shown=このユーザが投稿した #{1} の記事を、{2} が参照しました
-knowledge.activity.type.31.do.like=#{1} の記事にいいね！を押しました
-knowledge.activity.type.32.liked=このユーザが投稿した #{1} の記事を、{2} がいいね！を押しました
-knowledge.activity.type.41.do.stock=#{1} の記事をストックしました
-knowledge.activity.type.42.stocked=このユーザが投稿した #{1} の記事を、{2} がストックしました
-knowledge.activity.type.51.do.ansewer=#{1} のアンケートに回答しました
-knowledge.activity.type.52.answered=このユーザが投稿した #{1} の記事のアンケートに、{2} が回答しました
-knowledge.activity.type.61.do.join=#{1} のイベントに参加登録しました
-knowledge.activity.type.62.joined=このユーザが投稿した #{1} のイベントに、{2} が参加登録しました
-knowledge.activity.type.101.do.post.public=#{1} の記事を「公開」で投稿しました
-knowledge.activity.type.111.do.post.protect=#{1} の記事を「保護」で投稿しました
-knowledge.activity.type.121.do.post.private=#{1} の記事を「非公開」で投稿しました
-knowledge.activity.type.1011.do.comment.insert=#{1} の記事にコメントを登録しました
-knowledge.activity.type.1031.do.comment.like=#{1} の記事のコメントにいいね！を押しました
-knowledge.activity.type.1032.comment.liked=このユーザが投稿した #{1} の記事のコメントに、{2} がいいね！を押しました
-
-knowledge.activity.type.13.inserted=#{1} の記事が、{2} によって投稿されました
-knowledge.activity.type.23.shown=#{1} の記事を、{2} が参照しました
+knowledge.activity.type.11.do.insert={1} の記事を投稿しました
+knowledge.activity.type.21.do.show={1} の記事を参照しました
+knowledge.activity.type.22.shown=このユーザが投稿した {1} の記事を、{2} が参照しました
+knowledge.activity.type.31.do.like={1} の記事にいいね！を押しました
+knowledge.activity.type.32.liked=このユーザが投稿した {1} の記事を、{2} がいいね！を押しました
+knowledge.activity.type.41.do.stock={1} の記事をストックしました
+knowledge.activity.type.42.stocked=このユーザが投稿した {1} の記事を、{2} がストックしました
+knowledge.activity.type.51.do.ansewer={1} のアンケートに回答しました
+knowledge.activity.type.52.answered=このユーザが投稿した {1} の記事のアンケートに、{2} が回答しました
+knowledge.activity.type.61.do.join={1} のイベントに参加登録しました
+knowledge.activity.type.62.joined=このユーザが投稿した {1} のイベントに、{2} が参加登録しました
+knowledge.activity.type.101.do.post.public={1} の記事を「公開」で投稿しました
+knowledge.activity.type.111.do.post.protect={1} の記事を「保護」で投稿しました
+knowledge.activity.type.121.do.post.private={1} の記事を「非公開」で投稿しました
+knowledge.activity.type.1011.do.comment.insert={1} の記事にコメントを登録しました
+knowledge.activity.type.1031.do.comment.like={1} の記事のコメントにいいね！を押しました
+knowledge.activity.type.1032.comment.liked=このユーザが投稿した {1} の記事のコメントに、{2} がいいね！を押しました
+
+knowledge.activity.type.13.inserted={1} の記事が、{2} によって投稿されました
+knowledge.activity.type.23.shown={1} の記事を、{2} が参照しました
 
 
diff --git a/src/main/webapp/WEB-INF/views/open/account/account.jsp b/src/main/webapp/WEB-INF/views/open/account/account.jsp
index ceeb39227..0def7e749 100644
--- a/src/main/webapp/WEB-INF/views/open/account/account.jsp
+++ b/src/main/webapp/WEB-INF/views/open/account/account.jsp
@@ -128,7 +128,7 @@
     <br/><br/>
     <div class="list-group" id="activityList">
         <a class="list-group-item" v-for="activity in activities">
-            <h4 class="list-group-item-heading">{{ activity.msg }}</h4>
+            <h4 class="list-group-item-heading" v-html="activity.msg"></h4>
             <p class="list-group-item-text">{{ activity.dispDate }}</p>
         </a>
     </div>
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp
index e70d5a60e..47cb2b642 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp
@@ -100,9 +100,10 @@
             </div>
         
             <div class="item-info">
+                <i class="fa fa-heart-o" style="margin-left: 5px;"></i>&nbsp;× <%=jspUtil.out("knowledge.point")%>
                 <a class="text-primary btn-link"
                     href="<%=request.getContextPath()%>/open.knowledge/likes/<%=jspUtil.out("knowledge.knowledgeId")%><%=jspUtil.out("params")%>">
-                    <i class="fa fa-thumbs-o-up" style="margin-left: 5px;"></i>&nbsp;× <span id="like_count"><%=jspUtil.out("knowledge.likeCount")%></span>
+                    <i class="fa fa-thumbs-o-up"></i>&nbsp;× <span id="like_count"><%=jspUtil.out("knowledge.likeCount")%></span>
                 </a> &nbsp;
                 <a class="text-primary btn-link"
                     href="<%=request.getContextPath()%>/open.knowledge/view/<%=jspUtil.out("knowledge.knowledgeId")%><%=jspUtil.out("params")%>#comments">
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
index f007f8ebb..3ff2c5e8e 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
@@ -23,6 +23,10 @@
     <c:forEach var="comment" items="${comments}" varStatus="status">
         <%
             CommentsEntity comment = jspUtil.getValue("comment", CommentsEntity.class);
+            String insertLink = "<a href=\"" + request.getContextPath() + "/open.account/info/" + jspUtil.out("comment.insertUser") + "\" class=\"text-primary btn-link\" >"
+                            + jspUtil.out("comment.insertUserName", JspUtil.ESCAPE_CLEAR) + "</a>";
+            String updateLink = "<a href=\"" + request.getContextPath() + "/open.account/info/" + jspUtil.out("comment.updateUser") + "\" class=\"text-primary btn-link\">"
+                            + jspUtil.out("comment.updateUserName", JspUtil.ESCAPE_CLEAR) + "</a>";
         %>
         <%
             Integer knowledge = jspUtil.getValue("insertUser", Integer.class);
@@ -31,14 +35,14 @@
         <div class="row">
             <div class="col-sm-12">
                 [<%=jspUtil.label("label.registration")%>]
-                <%=jspUtil.date("comment.updateDatetime")%>
-                [<%=jspUtil.out("comment.insertUserName")%>]
+                <%=jspUtil.date("comment.insertDatetime")%>
+                [<%=insertLink%>]
                 <%
                 if (comment.isUpdate()) {
                 %>
                 <br />[<%=jspUtil.label("label.update")%>]
                 <%=jspUtil.date("comment.updateDatetime")%>
-                [<%=jspUtil.out("comment.updateUserName")%>]
+                [<%=updateLink%>]
                 <%
                     }
                 %>
@@ -139,14 +143,14 @@
                 %>
 
                 [<%=jspUtil.label("label.registration")%>]
-                <%=jspUtil.date("comment.updateDatetime")%>
-                [<%=jspUtil.out("comment.insertUserName")%>]
+                <%=jspUtil.date("comment.insertDatetime")%>
+                [<%=insertLink%>]
                 <%
                     if (comment.isUpdate()) {
                 %>
                 <br />[<%=jspUtil.label("label.update")%>]
                 <%=jspUtil.date("comment.updateDatetime")%>
-                [<%=jspUtil.out("comment.updateUserName")%>]
+                [<%=updateLink%>]
                 <%
                     }
                 %>
diff --git a/src/main/webapp/js/account-page.js b/src/main/webapp/js/account-page.js
index f336cf9b4..75a0df793 100644
--- a/src/main/webapp/js/account-page.js
+++ b/src/main/webapp/js/account-page.js
@@ -109,6 +109,15 @@ var loadAndShowActivity = function(userId, offset) {
         result.forEach(function(item) {
             activityList.activities.push(item);
         });
+        var target = $('.internallink');
+        target.each(function(i, block) {
+            var knowledgeNo = $(this).text().substring(1);
+            console.log(knowledgeNo);
+            var link = '<a href="' + _CONTEXT + '/open.knowledge/view/' + knowledgeNo + '">';
+            link += '#' + knowledgeNo;
+            link += '</a>';
+            $(this).html(link);
+        });
     }).fail(function(xhr, textStatus, error) {
         handleErrorResponse(xhr, textStatus, error);
     });

From 248d8f750f589c02ca6ffad7b142ca0c28a4fc4e Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 10 Sep 2017 13:44:50 +0900
Subject: [PATCH 063/138] #840 Change a order condition on popular list from
 liked count to contribution point

---
 .../knowledge/entity/KnowledgesEntity.java    | 26 +++++++++----------
 .../KnowledgesDao_selectPopularity.sql        | 16 +++++++-----
 ...sDao_selectPopularityWithAccessControl.sql | 10 +++----
 .../open/knowledge/partials/common_list.jsp   |  5 +++-
 .../knowledge/dao/KnowledgesDaoTest.java      |  4 +--
 5 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/entity/KnowledgesEntity.java b/src/main/java/org/support/project/knowledge/entity/KnowledgesEntity.java
index 327689271..1119ab852 100644
--- a/src/main/java/org/support/project/knowledge/entity/KnowledgesEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/KnowledgesEntity.java
@@ -41,7 +41,7 @@ public static KnowledgesEntity get() {
     /** スコア(検索した際のスコア) */
     private Float score;
     /** 指定期間内のイイネ件数 */
-    private Integer likeCountOnTerm;
+    private Integer pointOnTerm;
 
     /** 開催日     UTC(Eventの場合のみ） */
     private Timestamp startDateTime;
@@ -169,31 +169,31 @@ public void setScore(Float score) {
     }
 
     /**
-     * @return the likeCountOnTerm
+     * @return the startDateTime
      */
-    public Integer getLikeCountOnTerm() {
-        return likeCountOnTerm;
+    public Timestamp getStartDateTime() {
+        return startDateTime;
     }
 
     /**
-     * @param likeCountOnTerm the likeCountOnTerm to set
+     * @param startDateTime the startDateTime to set
      */
-    public void setLikeCountOnTerm(Integer likeCountOnTerm) {
-        this.likeCountOnTerm = likeCountOnTerm;
+    public void setStartDateTime(Timestamp startDateTime) {
+        this.startDateTime = startDateTime;
     }
 
     /**
-     * @return the startDateTime
+     * @return the pointOnTerm
      */
-    public Timestamp getStartDateTime() {
-        return startDateTime;
+    public Integer getPointOnTerm() {
+        return pointOnTerm;
     }
 
     /**
-     * @param startDateTime the startDateTime to set
+     * @param pointOnTerm the pointOnTerm to set
      */
-    public void setStartDateTime(Timestamp startDateTime) {
-        this.startDateTime = startDateTime;
+    public void setPointOnTerm(Integer pointOnTerm) {
+        this.pointOnTerm = pointOnTerm;
     }
 
 }
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectPopularity.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectPopularity.sql
index 7dc7e59f1..63db2a9be 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectPopularity.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectPopularity.sql
@@ -2,13 +2,13 @@ SELECT
         KNOWLEDGES.*
         ,USERS.USER_NAME AS INSERT_USER_NAME
         ,UP_USER.USER_NAME AS UPDATE_USER_NAME
-        ,COUNT(LIKES.NO) AS LIKE_COUNT_ON_TERM
+        ,COALESCE(SUM(POINT_KNOWLEDGE_HISTORIES.POINT), 0) AS POINT_ON_TERM
     FROM
         KNOWLEDGES
-            LEFT OUTER JOIN LIKES
+            LEFT OUTER JOIN POINT_KNOWLEDGE_HISTORIES
                 ON (
-                    KNOWLEDGES.KNOWLEDGE_ID = LIKES.KNOWLEDGE_ID
-                    AND LIKES.INSERT_DATETIME BETWEEN ? AND ?
+                    KNOWLEDGES.KNOWLEDGE_ID = POINT_KNOWLEDGE_HISTORIES.KNOWLEDGE_ID
+                    AND POINT_KNOWLEDGE_HISTORIES.INSERT_DATETIME BETWEEN ? AND ?
                 )
             LEFT OUTER JOIN USERS
                 ON USERS.USER_ID = KNOWLEDGES.INSERT_USER
@@ -17,8 +17,10 @@ SELECT
     WHERE
         KNOWLEDGES.DELETE_FLAG = 0
     GROUP BY
-        KNOWLEDGES.KNOWLEDGE_ID, USERS.USER_NAME, UP_USER.USER_NAME
+        KNOWLEDGES.KNOWLEDGE_ID
+        ,USERS.USER_NAME
+        ,UP_USER.USER_NAME
     ORDER BY
-        COUNT(LIKES.NO) DESC
+        POINT_ON_TERM DESC
         ,KNOWLEDGES.UPDATE_DATETIME DESC 
-    LIMIT ? OFFSET ?;
+    LIMIT ? OFFSET ?
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectPopularityWithAccessControl.sql b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectPopularityWithAccessControl.sql
index db9f27ca7..71cf4835b 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectPopularityWithAccessControl.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/KnowledgesDao/KnowledgesDao_selectPopularityWithAccessControl.sql
@@ -2,13 +2,13 @@ SELECT
         KNOWLEDGES.*
         ,USERS.USER_NAME AS INSERT_USER_NAME
         ,UP_USER.USER_NAME AS UPDATE_USER_NAME
-        ,COUNT(LIKES.NO) AS LIKE_COUNT_ON_TERM
+        ,COALESCE(SUM(POINT_KNOWLEDGE_HISTORIES.POINT), 0) AS POINT_ON_TERM
     FROM
         KNOWLEDGES
-            LEFT OUTER JOIN LIKES
+            LEFT OUTER JOIN POINT_KNOWLEDGE_HISTORIES
                 ON (
-                    KNOWLEDGES.KNOWLEDGE_ID = LIKES.KNOWLEDGE_ID
-                    AND LIKES.INSERT_DATETIME BETWEEN ? AND ?
+                    KNOWLEDGES.KNOWLEDGE_ID = POINT_KNOWLEDGE_HISTORIES.KNOWLEDGE_ID
+                    AND POINT_KNOWLEDGE_HISTORIES.INSERT_DATETIME BETWEEN ? AND ?
                 )
             LEFT OUTER JOIN USERS
                 ON USERS.USER_ID = KNOWLEDGES.INSERT_USER
@@ -50,6 +50,6 @@ SELECT
     GROUP BY
         KNOWLEDGES.KNOWLEDGE_ID, USERS.USER_NAME, UP_USER.USER_NAME
     ORDER BY
-        COUNT(LIKES.NO) DESC
+        POINT_ON_TERM DESC
         ,KNOWLEDGES.UPDATE_DATETIME DESC 
     LIMIT ? OFFSET ?;
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp
index 47cb2b642..bdbeed895 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/common_list.jsp
@@ -100,7 +100,10 @@
             </div>
         
             <div class="item-info">
-                <i class="fa fa-heart-o" style="margin-left: 5px;"></i>&nbsp;× <%=jspUtil.out("knowledge.point")%>
+                <i class="fa fa-heart-o" style="margin-left: 5px;"></i>&nbsp;× <%=jspUtil.out("knowledge.point")%> &nbsp;
+                <% if (knowledge.getPointOnTerm() != null && knowledge.getPointOnTerm().intValue() > 0) {  %>
+                (<i class="fa fa-line-chart" aria-hidden="true"></i>&nbsp;× <%=jspUtil.out("knowledge.pointOnTerm")%>) &nbsp;
+                <% } %>
                 <a class="text-primary btn-link"
                     href="<%=request.getContextPath()%>/open.knowledge/likes/<%=jspUtil.out("knowledge.knowledgeId")%><%=jspUtil.out("params")%>">
                     <i class="fa fa-thumbs-o-up"></i>&nbsp;× <span id="like_count"><%=jspUtil.out("knowledge.likeCount")%></span>
diff --git a/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java b/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java
index ad9ed547b..f17311f4a 100644
--- a/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java
+++ b/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java
@@ -86,7 +86,7 @@ public void testSelectPopularity() throws Exception {
         List<KnowledgesEntity> list = KnowledgesDao.get().selectPopularity(start, end, 0, 20);
 
         for (KnowledgesEntity knowledgesEntity : list) {
-            LOG.info(knowledgesEntity.getTitle() + ":" + knowledgesEntity.getLikeCountOnTerm());
+            LOG.info(knowledgesEntity.getTitle() + ":" + knowledgesEntity.getPointOnTerm());
         }
         Assert.assertEquals("Test-29", list.get(0).getTitle());
     }
@@ -128,7 +128,7 @@ public void testSelectPopularityWithAccessControl() throws Exception {
         List<KnowledgesEntity> list = KnowledgesDao.get().selectPopularityWithAccessControl(loginedUser, start, end, 0, 20);
 
         for (KnowledgesEntity knowledgesEntity : list) {
-            LOG.info(knowledgesEntity.getTitle() + ":" + knowledgesEntity.getLikeCountOnTerm());
+            LOG.info(knowledgesEntity.getTitle() + ":" + knowledgesEntity.getPointOnTerm());
         }
         Assert.assertEquals("Test-29", list.get(0).getTitle());
     }

From 6d007b6d3f129c96b52bb5e620796625b1db3740 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 10 Sep 2017 19:26:43 +0900
Subject: [PATCH 064/138] #840 Change layout knowledge view page

---
 .../open/knowledge/partials/partials-view-count.jsp  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp
index daf3f8086..533df4be8 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-count.jsp
@@ -12,7 +12,7 @@
 <% JspUtil jspUtil = new JspUtil(request, pageContext); %>
 
 <div class="row">
-    <div class="col-xs-4">
+    <div class="col-xs-6 col-sm-3">
         <%-- 
         <a href="<%=request.getContextPath()%>/open.knowledge/activities/<%=jspUtil.out("knowledgeId")%><%=jspUtil.out("params")%>" class="text-primary btn-link">
         <i class="fa fa-heart-o" aria-hidden="true"></i>&nbsp;CP × <%= jspUtil.out("point") %>
@@ -20,20 +20,18 @@
         --%>
         <i class="fa fa-heart-o" aria-hidden="true"></i>&nbsp;CP × <%= jspUtil.out("point") %>
     </div>
-    <div class="col-xs-4">
+    <div class="col-xs-6 col-sm-3">
         <a href="<%=request.getContextPath()%>/open.knowledge/likes/<%=jspUtil.out("knowledgeId")%><%=jspUtil.out("params")%>" class="text-primary btn-link">
             <i class="fa fa-thumbs-o-up"></i>&nbsp;<%=jspUtil.label("knowledge.view.like")%> × <span id="like_count"><%=jspUtil.out("like_count")%></span>
         </a>
     </div>
-    <div class="col-xs-4">
+    <div class="col-xs-6 col-sm-3">
         <a href="#comments" id="commentsLink" class="text-primary btn-link inner-page-link">
             <i class="fa fa-comments-o"></i>&nbsp;<%=jspUtil.label("knowledge.view.comment.label")%>
             × <%=jspUtil.out("comments.size()")%>
         </a>
     </div>
-</div>
-<div class="row">
-    <div class="col-xs-4">
+    <div class="col-xs-6 col-sm-3">
         <%
             int num = 0;
             List<UploadFile> attachs = jspUtil.getValue("files", List.class);
@@ -57,7 +55,5 @@
         </a>
         <% } %>
     </div>
-    <div class="col-xs-4">
-    </div>
 </div>
 

From 0acc2ebfd2e15c04dc19f222facb984c3c3174a1 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 12 Sep 2017 07:48:59 +0900
Subject: [PATCH 065/138] #840 Change call batch process with WebSocket

---
 .../deploy/v1_11_0/Migrate_1_11_2.java        | 41 +++++++++++--
 .../AbstractAddPointForCommentProcessor.java  | 10 ++--
 ...AbstractAddPointForKnowledgeProcessor.java |  8 +--
 .../logic/activity/KnowledgesaveActivity.java |  2 +-
 .../websocket/DataExportEndpoint.java         |  5 +-
 .../knowledge/websocket/MigrateEndpoint.java  | 43 +++++++++-----
 .../webapp/WEB-INF/views/commons/migrate.jsp  | 58 +++++++++++--------
 7 files changed, 113 insertions(+), 54 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 8e12180a0..85035aa94 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -37,7 +37,7 @@
 import org.support.project.web.entity.UsersEntity;
 
 public class Migrate_1_11_2 implements Migrate {
-    private static final int _WAIT = 50;
+    private static final int _WAIT = 100;
     /** ログ */
     private static final Log LOG = LogFactory.getLog(Migrate_1_11_2.class);
 
@@ -48,6 +48,9 @@ public static Migrate_1_11_2 get() {
     
     private int calcTotal = 0; // トータルポイントの再計算に使う内部保持変数（シーケンシャルに1件づつ処理をすること）
     
+    private int processCount = 0;
+    
+    
     @Override
     public boolean doMigrate() throws Exception {
         InitializeDao initializeDao = InitializeDao.get();
@@ -85,9 +88,12 @@ public boolean doMigrate() throws Exception {
     }
     
     private void reCalcPointUserHistory() throws InterruptedException {
+        LOG.info("Recalc user cp");
+        processCount = 0;
         List<UsersEntity> list;
         int offset = 0;
         do {
+            logging("Recalc user cp");
             list = reCalcPointUserHistory(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -99,7 +105,7 @@ private List<UsersEntity> reCalcPointUserHistory(int offset) throws InterruptedE
         List<UsersEntity> list;
         list = UsersDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (UsersEntity item : list) {
-            LOG.info("Recalculation total point. [user]" + item.getUserId());
+            LOG.debug("Recalculation total point. [user]" + item.getUserId());
             int offset2 = 0;
             calcTotal = 0; // ユーザ毎にトータルポイントを初期化
             List<PointUserHistoriesEntity> histories;
@@ -121,7 +127,7 @@ private List<PointUserHistoriesEntity> reCalcPointUserHistoryOnUser(Integer user
             item.setBeforeTotal(calcTotal);
             calcTotal += item.getPoint();
             item.setTotal(calcTotal); // 日付毎に処理してトータルを再計算
-            LOG.info("\t" + DateUtils.getSimpleFormat().format(item.getInsertDatetime()) + " [total]" + calcTotal);
+            LOG.debug("\t" + DateUtils.getSimpleFormat().format(item.getInsertDatetime()) + " [total]" + calcTotal);
             PointUserHistoriesDao.get().physicalUpdate(item);
         }
         return list;
@@ -129,9 +135,11 @@ private List<PointUserHistoriesEntity> reCalcPointUserHistoryOnUser(Integer user
 
     private void doAddPointByCommentLike() throws InterruptedException {
         LOG.info("Aggregate point by comment like");
+        processCount = 0;
         List<LikeCommentsEntity> list;
         int offset = 0;
         do {
+            logging("Aggregate point by comment like");
             list = doAddPointByCommentLike(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -165,9 +173,11 @@ private List<LikeCommentsEntity> doAddPointByCommentLike(int offset) {
 
     private void doAddPointByCommentInsert() throws InterruptedException {
         LOG.info("Aggregate point by comment insert");
+        processCount = 0;
         List<CommentsEntity> list;
         int offset = 0;
         do {
+            logging("Aggregate point by comment insert");
             list = doAddPointByKnowledgeComment(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -195,9 +205,11 @@ public List<CommentsEntity> doAddPointByKnowledgeComment(int offset) {
 
     private void doAddPointByKnowledgeJoinEvent() throws InterruptedException {
         LOG.info("Aggregate point by knowledge join event");
+        processCount = 0;
         List<ParticipantsEntity> list;
         int offset = 0;
         do {
+            logging("Aggregate point by knowledge join event");
             list = doAddPointByKnowledgeJoinEvent(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -230,9 +242,11 @@ public List<ParticipantsEntity> doAddPointByKnowledgeJoinEvent(int offset) {
 
     private void doAddPointByKnowledgeAnswer() throws InterruptedException {
         LOG.info("Aggregate point by knowledge answer");
+        processCount = 0;
         List<SurveyAnswersEntity> list;
         int offset = 0;
         do {
+            logging("Aggregate point by knowledge answer");
             list = doAddPointByKnowledgeAnswer(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -266,9 +280,11 @@ public List<SurveyAnswersEntity> doAddPointByKnowledgeAnswer(int offset) {
 
     private void doAddPointByKnowledgeStock() throws InterruptedException {
         LOG.info("Aggregate point by knowledge stock");
+        processCount = 0;
         List<StockKnowledgesEntity> list;
         int offset = 0;
         do {
+            logging("Aggregate point by knowledge stock");
             list = doAddPointByKnowledgeStock(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -302,9 +318,11 @@ public List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset) {
 
     private void doAddPointByKnowledgeLike() throws InterruptedException {
         LOG.info("Aggregate point by knowledge like");
+        processCount = 0;
         List<LikesEntity> list;
         int offset = 0;
         do {
+            logging("Aggregate point by knowledge like");
             list = doAddPointByKnowledgeLike(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -337,9 +355,11 @@ public List<LikesEntity> doAddPointByKnowledgeLike(int offset) {
     
     private void doAddPointByKnowledgeShow() throws InterruptedException {
         LOG.info("Aggregate point by knowledge show");
+        processCount = 0;
         List<ViewHistoriesEntity> list;
         int offset = 0;
         do {
+            logging("Aggregate point by knowledge show");
             list = doAddPointByKnowledgeShow(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -372,9 +392,11 @@ public List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset) {
 
     public void doAddPointByKnowledge() throws InterruptedException {
         LOG.info("Aggregate point by knowledge insert");
+        processCount = 0;
         List<KnowledgesEntity> knowledges;
         int offset = 0;
         do {
+            logging("Aggregate point by knowledge insert");
             knowledges = doAddPointByKnowledge(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -402,9 +424,11 @@ public List<KnowledgesEntity> doAddPointByKnowledge(int offset) {
     
     private void doSetViewCountToKnowledge() throws InterruptedException {
         LOG.info("Set view count to Knowledge");
+        processCount = 0;
         List<KnowledgesEntity> knowledges;
         int offset = 0;
         do {
+            logging("Set view count to Knowledge");
             knowledges = doSetViewCountToKnowledge(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -412,6 +436,7 @@ private void doSetViewCountToKnowledge() throws InterruptedException {
             }
         } while (knowledges.size() > 0);
     }
+
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public List<KnowledgesEntity> doSetViewCountToKnowledge(int offset) {
         List<KnowledgesEntity> knowledges;
@@ -421,7 +446,7 @@ public List<KnowledgesEntity> doSetViewCountToKnowledge(int offset) {
             KnowledgesDao.get().updateViewCount(count, knowledge.getKnowledgeId());
             //ついでにポイントも初期化
             KnowledgesDao.get().updatePoint(knowledge.getKnowledgeId(), 0);
-            LOG.info("    knowledge [" + knowledge.getKnowledgeId() + "] is updated. view count : " + count);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] is updated. view count : " + count);
         }
         return knowledges;
     }
@@ -429,4 +454,12 @@ public List<KnowledgesEntity> doSetViewCountToKnowledge(int offset) {
     public void clearUserPoint() {
         UserConfigsDao.get().removeAllUserConfig(AppConfig.get().getSystemName(), UserConfig.POINT);
     }
+    
+    private void logging(String string) {
+        processCount++;
+        if (processCount % 100 == 0) {
+            LOG.info("\t During execution of the " + string + ". [count]" + processCount);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
index 3290bcca2..55bf571d1 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForCommentProcessor.java
@@ -45,12 +45,12 @@ public void execute() throws Exception {
             return;
         }
         if (isExistsActivity(eventUser.getUserId(), getActivity(), String.valueOf(getComment().getCommentNo()))) {
-            LOG.info("This activity is already exists. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+            LOG.debug("This activity is already exists. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
                     + " [comment]" + getComment().getCommentNo());
             return;
         }
         if (parentKnowledge == null) {
-            LOG.info("Knowledge is not found. [comment] " + getComment().getCommentNo() + " [knowledge]" + getComment().getKnowledgeId());
+            LOG.debug("Knowledge is not found. [comment] " + getComment().getCommentNo() + " [knowledge]" + getComment().getKnowledgeId());
             return;
         }
         
@@ -59,13 +59,13 @@ public void execute() throws Exception {
         TypeAndPoint knowledge = getTypeAndPointForKnowledge();
         if (exec == null && owner == null && knowledge == null) {
             // ポイントをつける対象が無いので、処理終了
-            LOG.info("This activity is not add point. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+            LOG.debug("This activity is not add point. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
             + " [comment]" + getComment().getCommentNo());
             return;
         }
 
         
-        LOG.info("activity process started. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+        LOG.debug("activity process started. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
         + " [comment]" + getComment().getCommentNo());
         
         StringBuilder logmsg = new StringBuilder();
@@ -103,7 +103,7 @@ public void execute() throws Exception {
                     knowledge.point);
             logmsg.append("\n\tAdd knowledge: [id]" + parentKnowledge.getKnowledgeId() + " [type]" + knowledge.type + " [add]" + knowledge.point + " [result]" + point);
         }
-        LOG.info(logmsg.toString());
+        LOG.debug(logmsg.toString());
     }
     
     
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
index 34be1160e..1f8d8b5e5 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
@@ -38,7 +38,7 @@ public void execute() throws Exception {
             return;
         }
         if (isExistsActivity(eventUser.getUserId(), getActivity(), String.valueOf(getKnowledge().getKnowledgeId()))) {
-            LOG.info("This activity is already exists. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+            LOG.debug("This activity is already exists. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
                     + " [knowledge]" + getKnowledge().getKnowledgeId());
             // 既に指定のKnowledge登録済
             return;
@@ -48,11 +48,11 @@ public void execute() throws Exception {
         TypeAndPoint knowledge = getTypeAndPointForKnowledge();
         if (exec == null && owner == null && knowledge == null) {
             // ポイントをつける対象が無いので、処理終了
-            LOG.info("This activity is not add point. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+            LOG.debug("This activity is not add point. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
             + " [knowledge]" + getKnowledge().getKnowledgeId());
             return;
         }
-        LOG.info("activity process started. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+        LOG.debug("activity process started. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
         + " [knowledge]" + getKnowledge().getKnowledgeId());
         
         StringBuilder logmsg = new StringBuilder();
@@ -89,7 +89,7 @@ public void execute() throws Exception {
                     knowledge.point);
             logmsg.append("\n\tAdd knowledge: [id]" + getKnowledge().getKnowledgeId() + " [type]" + knowledge.type + " [add]" + knowledge.point + " [result]" + point);
         }
-        LOG.info(logmsg.toString());
+        LOG.debug(logmsg.toString());
     }
 
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
index 2f5a85ff7..44188c66e 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
@@ -34,7 +34,7 @@ public void setActivity(Activity activity) {
     }
     @Override
     protected Activity getActivity() {
-        LOG.info("Activity process start. " + activity.toString());
+        LOG.debug("Activity process start. " + activity.toString());
         return activity;
     }
     private int point = 0;
diff --git a/src/main/java/org/support/project/knowledge/websocket/DataExportEndpoint.java b/src/main/java/org/support/project/knowledge/websocket/DataExportEndpoint.java
index 23711655c..e46ea98d6 100644
--- a/src/main/java/org/support/project/knowledge/websocket/DataExportEndpoint.java
+++ b/src/main/java/org/support/project/knowledge/websocket/DataExportEndpoint.java
@@ -1,6 +1,7 @@
 package org.support.project.knowledge.websocket;
 
 import java.io.IOException;
+import java.util.List;
 
 import javax.websocket.OnClose;
 import javax.websocket.OnError;
@@ -35,7 +36,7 @@ public void onClose(Session session) {
     }
 
     @OnMessage
-    public void onMessage(String text) throws JSONException, IOException {
+    public void onMessage(String text, Session session) throws JSONException, IOException {
     }
 
     @OnError
@@ -47,6 +48,6 @@ public void onError(Throwable t) {
     }
 
     @Override
-    protected void finishJob(JobResult result, Session session) {
+    public void finishJob(JobResult result, Class<?> batch, List<Session> sessions) {
     }
 }
diff --git a/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java b/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java
index e277484b7..3abbc6f59 100644
--- a/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java
+++ b/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java
@@ -1,6 +1,7 @@
 package org.support.project.knowledge.websocket;
 
 import java.io.IOException;
+import java.util.List;
 
 import javax.websocket.OnClose;
 import javax.websocket.OnError;
@@ -25,12 +26,12 @@
 public class MigrateEndpoint extends CallBatchEndpoint {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(ReindexingEndpoint.class);
-
+    
     @OnOpen
     public void onOpen(Session session) throws IOException {
-        if (super.isAdmin(session)) {
-            this.setSendPlefix("");
-            call(session, InitDB.class);
+        LOG.info("Endpoint instance: " + this.hashCode());
+        if (!super.isAdmin(session)) {
+            session.close();
         }
     }
     
@@ -39,9 +40,15 @@ public void onClose(Session session) {
     }
 
     @OnMessage
-    public void onMessage(String text) throws JSONException, IOException {
+    public void onMessage(String text, Session session) throws JSONException, IOException {
+        LOG.info(text);
+        if (text.equals("START_MIGRATE") && super.isAdmin(session)) {
+            setSendPlefix("");
+            call(session, InitDB.class);
+        }
     }
 
+
     @OnError
     public void onError(Throwable t) {
         LOG.warn("websocket on error." + t.getClass().getName() + " : " + t.getMessage());
@@ -51,17 +58,23 @@ public void onError(Throwable t) {
     }
 
     @Override
-    protected void finishJob(JobResult result, Session session) {
-        SystemsEntity entity = SystemsDao.get().selectOnKey(AppConfig.get().getSystemName());
-        if (entity != null) {
-            if (InitDB.CURRENT.equals(entity.getVersion())) {
-                AppConfig.get().setMaintenanceMode(false);
+    public void finishJob(JobResult result, Class<?> batch, List<Session> sessions) {
+        super.finishJob(result, batch, sessions);
+        for (Session session : sessions) {
+            if (!super.isAdmin(session)) {
+                return;
+            }
+            SystemsEntity entity = SystemsDao.get().selectOnKey(AppConfig.get().getSystemName());
+            if (entity != null) {
+                if (InitDB.CURRENT.equals(entity.getVersion())) {
+                    AppConfig.get().setMaintenanceMode(false);
+                }
+            }
+            try {
+                session.close();
+            } catch (IOException e) {
+                LOG.warn("websocket on error." + e.getClass().getName() + " : " + e.getMessage());
             }
-        }
-        try {
-            session.close();
-        } catch (IOException e) {
-            LOG.warn("websocket on error." + e.getClass().getName() + " : " + e.getMessage());
         }
     }
 }
diff --git a/src/main/webapp/WEB-INF/views/commons/migrate.jsp b/src/main/webapp/WEB-INF/views/commons/migrate.jsp
index d911fac18..11c6a8b85 100644
--- a/src/main/webapp/WEB-INF/views/commons/migrate.jsp
+++ b/src/main/webapp/WEB-INF/views/commons/migrate.jsp
@@ -82,30 +82,42 @@ latest database version: <%= InitDB.CURRENT %><br/>
 <!-- endbuild -->
 
 <script>
-$('#startMigrate').click(function() {
-    $('#log').val('');
-    var forRtoA = document.createElement('a');
-    forRtoA.href = '<%= request.getContextPath() %>/migrate';
-    console.log(forRtoA.href.replace("http://", "ws://").replace("https://", "wss://"));
-    webSocket = new WebSocket(forRtoA.href.replace("http://", "ws://").replace("https://", "wss://"));
-    webSocket.onopen = function() {
-        console.log('onopen');
-    }
-    webSocket.onclose = function() {
-        console.log('onclose');
-    }
-    webSocket.onmessage = function(message) {
-        var result = JSON.parse(message.data);
-        console.log(result);
-        $('#log').val($('#log').val() + result.message + "\n");
-        var psconsole = $('#log');
-        psconsole.scrollTop(
-            psconsole[0].scrollHeight - psconsole.height()
-        );
-    }
-    webSocket.onerror = function(message) {
-        console.log(message);
+$('#log').val('');
+var msgs = [];
+var appendMsg = function(msg) {
+    msgs.push(msg);
+    if (msgs.length > 100) {
+        msgs.shift();
     }
+    $('#log').val(msgs.join("\n"));
+    var psconsole = $('#log');
+    psconsole.scrollTop(
+        psconsole[0].scrollHeight - psconsole.height()
+    );
+};
+
+var forRtoA = document.createElement('a');
+forRtoA.href = '<%= request.getContextPath() %>/migrate';
+console.log(forRtoA.href.replace("http://", "ws://").replace("https://", "wss://"));
+webSocket = new WebSocket(forRtoA.href.replace("http://", "ws://").replace("https://", "wss://"));
+webSocket.onopen = function() {
+    console.log('onopen');
+    appendMsg('start websocket.');
+}
+webSocket.onclose = function() {
+    console.log('onclose');
+}
+webSocket.onmessage = function(message) {
+    console.log(message);
+    var obj = JSON.parse(message.data);
+    console.log(obj.message);
+    appendMsg(obj.message);
+}
+webSocket.onerror = function(message) {
+    console.log(message);
+}
+$('#startMigrate').click(function() {
+    webSocket.send('START_MIGRATE');
 });
 
 </script>

From fd287b6b7ccc93f5ef375523aee0f6cba7b72d5b Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 12 Sep 2017 22:55:42 +0900
Subject: [PATCH 066/138] #840 Change call batch process with WebSocket

---
 .../knowledge/deploy/v1_11_0/Migrate_1_11_2.java    |  6 +++---
 .../knowledge/websocket/MigrateEndpoint.java        | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 85035aa94..35fe10803 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -89,11 +89,9 @@ public boolean doMigrate() throws Exception {
     
     private void reCalcPointUserHistory() throws InterruptedException {
         LOG.info("Recalc user cp");
-        processCount = 0;
         List<UsersEntity> list;
         int offset = 0;
         do {
-            logging("Recalc user cp");
             list = reCalcPointUserHistory(offset);
             offset = offset + limit;
             synchronized (this) {
@@ -105,11 +103,13 @@ private List<UsersEntity> reCalcPointUserHistory(int offset) throws InterruptedE
         List<UsersEntity> list;
         list = UsersDao.get().selectAllWidthPager(limit, offset, Order.ASC);
         for (UsersEntity item : list) {
-            LOG.debug("Recalculation total point. [user]" + item.getUserId());
+            processCount = 0;
+            LOG.info("  Recalculation total point. [user]" + item.getUserId());
             int offset2 = 0;
             calcTotal = 0; // ユーザ毎にトータルポイントを初期化
             List<PointUserHistoriesEntity> histories;
             do {
+                logging(" Recalculation... ");
                 histories = reCalcPointUserHistoryOnUser(item.getUserId(), offset2);
                 offset2 = offset2 + limit;
                 synchronized (this) {
diff --git a/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java b/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java
index 3abbc6f59..d9f27555b 100644
--- a/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java
+++ b/src/main/java/org/support/project/knowledge/websocket/MigrateEndpoint.java
@@ -37,6 +37,7 @@ public void onOpen(Session session) throws IOException {
     
     @OnClose
     public void onClose(Session session) {
+        super.onClose(session);
     }
 
     @OnMessage
@@ -60,16 +61,16 @@ public void onError(Throwable t) {
     @Override
     public void finishJob(JobResult result, Class<?> batch, List<Session> sessions) {
         super.finishJob(result, batch, sessions);
+        SystemsEntity entity = SystemsDao.get().selectOnKey(AppConfig.get().getSystemName());
+        if (entity != null) {
+            if (InitDB.CURRENT.equals(entity.getVersion())) {
+                AppConfig.get().setMaintenanceMode(false);
+            }
+        }
         for (Session session : sessions) {
             if (!super.isAdmin(session)) {
                 return;
             }
-            SystemsEntity entity = SystemsDao.get().selectOnKey(AppConfig.get().getSystemName());
-            if (entity != null) {
-                if (InitDB.CURRENT.equals(entity.getVersion())) {
-                    AppConfig.get().setMaintenanceMode(false);
-                }
-            }
             try {
                 session.close();
             } catch (IOException e) {

From b757853ac6a0be5b1d5a26f9cfef26eb9be3853a Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 13 Sep 2017 20:02:11 +0900
Subject: [PATCH 067/138] #832 change update sequence process

---
 .../project/knowledge/dao/gen/GenAccountImagesDao.java   | 9 +++++++--
 .../project/knowledge/dao/gen/GenActivitiesDao.java      | 9 +++++++--
 .../support/project/knowledge/dao/gen/GenBadgesDao.java  | 9 +++++++--
 .../project/knowledge/dao/gen/GenCommentsDao.java        | 9 +++++++--
 .../project/knowledge/dao/gen/GenDraftKnowledgesDao.java | 9 +++++++--
 .../project/knowledge/dao/gen/GenKnowledgeFilesDao.java  | 9 +++++++--
 .../project/knowledge/dao/gen/GenKnowledgesDao.java      | 9 +++++++--
 .../project/knowledge/dao/gen/GenLikeCommentsDao.java    | 9 +++++++--
 .../support/project/knowledge/dao/gen/GenLikesDao.java   | 9 +++++++--
 .../project/knowledge/dao/gen/GenMailHooksDao.java       | 9 +++++++--
 .../support/project/knowledge/dao/gen/GenPinsDao.java    | 9 +++++++--
 .../support/project/knowledge/dao/gen/GenStocksDao.java  | 9 +++++++--
 .../support/project/knowledge/dao/gen/GenTagsDao.java    | 9 +++++++--
 .../project/knowledge/dao/gen/GenTemplateMastersDao.java | 9 +++++++--
 .../project/knowledge/dao/gen/GenViewHistoriesDao.java   | 9 +++++++--
 .../support/project/knowledge/dao/gen/GenVotesDao.java   | 9 +++++++--
 .../project/knowledge/dao/gen/GenWebhookConfigsDao.java  | 9 +++++++--
 17 files changed, 119 insertions(+), 34 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
index 0827f862c..ee7583c36 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
@@ -187,8 +187,13 @@ public AccountImagesEntity rawPhysicalInsert(AccountImagesEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('ACCOUNT_IMAGES_IMAGE_ID_seq', (select max(IMAGE_ID) from ACCOUNT_IMAGES));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(IMAGE_ID) from ACCOUNT_IMAGES;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('ACCOUNT_IMAGES_IMAGE_ID_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
index 77bcf0065..229f24c1a 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
@@ -183,8 +183,13 @@ public ActivitiesEntity rawPhysicalInsert(ActivitiesEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('ACTIVITIES_ACTIVITY_NO_seq', (select max(ACTIVITY_NO) from ACTIVITIES));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(ACTIVITY_NO) from ACTIVITIES;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('ACTIVITIES_ACTIVITY_NO_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
index 8c159b812..29f69fb35 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
@@ -185,8 +185,13 @@ public BadgesEntity rawPhysicalInsert(BadgesEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('BADGES_NO_seq', (select max(NO) from BADGES));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(NO) from BADGES;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('BADGES_NO_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
index f8f48dfd7..0b0a097ec 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
@@ -183,8 +183,13 @@ public CommentsEntity rawPhysicalInsert(CommentsEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('COMMENTS_COMMENT_NO_seq', (select max(COMMENT_NO) from COMMENTS));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(COMMENT_NO) from COMMENTS;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('COMMENTS_COMMENT_NO_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
index 943943414..d04f0e8cd 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
@@ -188,8 +188,13 @@ public DraftKnowledgesEntity rawPhysicalInsert(DraftKnowledgesEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('DRAFT_KNOWLEDGES_DRAFT_ID_seq', (select max(DRAFT_ID) from DRAFT_KNOWLEDGES));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(DRAFT_ID) from DRAFT_KNOWLEDGES;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('DRAFT_KNOWLEDGES_DRAFT_ID_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
index a996f7a7c..4d72c4c5e 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
@@ -188,8 +188,13 @@ public KnowledgeFilesEntity rawPhysicalInsert(KnowledgeFilesEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('KNOWLEDGE_FILES_FILE_NO_seq', (select max(FILE_NO) from KNOWLEDGE_FILES));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(FILE_NO) from KNOWLEDGE_FILES;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('KNOWLEDGE_FILES_FILE_NO_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
index 96d323737..5a3da55df 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
@@ -191,8 +191,13 @@ public KnowledgesEntity rawPhysicalInsert(KnowledgesEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('KNOWLEDGES_KNOWLEDGE_ID_seq', (select max(KNOWLEDGE_ID) from KNOWLEDGES));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(KNOWLEDGE_ID) from KNOWLEDGES;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('KNOWLEDGES_KNOWLEDGE_ID_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
index 95dc16aae..013583b20 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
@@ -182,8 +182,13 @@ public LikeCommentsEntity rawPhysicalInsert(LikeCommentsEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('LIKE_COMMENTS_NO_seq', (select max(NO) from LIKE_COMMENTS));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(NO) from LIKE_COMMENTS;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('LIKE_COMMENTS_NO_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
index 2b8a4a564..bef04434c 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
@@ -182,8 +182,13 @@ public LikesEntity rawPhysicalInsert(LikesEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('LIKES_NO_seq', (select max(NO) from LIKES));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(NO) from LIKES;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('LIKES_NO_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
index a34ab4d24..ddd6a8620 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
@@ -187,8 +187,13 @@ public MailHooksEntity rawPhysicalInsert(MailHooksEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('MAIL_HOOKS_HOOK_ID_seq', (select max(HOOK_ID) from MAIL_HOOKS));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(HOOK_ID) from MAIL_HOOKS;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('MAIL_HOOKS_HOOK_ID_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
index 689df893e..b47f2cf99 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
@@ -182,8 +182,13 @@ public PinsEntity rawPhysicalInsert(PinsEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('PINS_NO_seq', (select max(NO) from PINS));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(NO) from PINS;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('PINS_NO_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
index 6c30ac221..e18d4a1d9 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
@@ -183,8 +183,13 @@ public StocksEntity rawPhysicalInsert(StocksEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('STOCKS_STOCK_ID_seq', (select max(STOCK_ID) from STOCKS));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(STOCK_ID) from STOCKS;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('STOCKS_STOCK_ID_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
index e1c181ce2..4cdba1926 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
@@ -181,8 +181,13 @@ public TagsEntity rawPhysicalInsert(TagsEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('TAGS_TAG_ID_seq', (select max(TAG_ID) from TAGS));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(TAG_ID) from TAGS;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('TAGS_TAG_ID_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
index e32d8a4a8..dbce0f8ea 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
@@ -183,8 +183,13 @@ public TemplateMastersEntity rawPhysicalInsert(TemplateMastersEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('TEMPLATE_MASTERS_TYPE_ID_seq', (select max(TYPE_ID) from TEMPLATE_MASTERS));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(TYPE_ID) from TEMPLATE_MASTERS;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('TEMPLATE_MASTERS_TYPE_ID_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
index a3c0cc933..41085af99 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
@@ -182,8 +182,13 @@ public ViewHistoriesEntity rawPhysicalInsert(ViewHistoriesEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('VIEW_HISTORIES_HISTORY_NO_seq', (select max(HISTORY_NO) from VIEW_HISTORIES));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(HISTORY_NO) from VIEW_HISTORIES;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('VIEW_HISTORIES_HISTORY_NO_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
index 18f5d4148..66422d11b 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
@@ -182,8 +182,13 @@ public VotesEntity rawPhysicalInsert(VotesEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('VOTES_VOTE_NO_seq', (select max(VOTE_NO) from VOTES));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(VOTE_NO) from VOTES;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('VOTES_VOTE_NO_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
index 9900d3901..4c7d0648b 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
@@ -182,8 +182,13 @@ public WebhookConfigsEntity rawPhysicalInsert(WebhookConfigsEntity entity) {
             entity.getDeleteFlag());
         String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName());
         if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) {
-            String setValSql = "select setval('WEBHOOK_CONFIGS_HOOK_ID_seq', (select max(HOOK_ID) from WEBHOOK_CONFIGS));";
-            executeQuerySingle(setValSql, Long.class);
+            String maxSql = "SELECT MAX(HOOK_ID) from WEBHOOK_CONFIGS;";
+            long max = executeQuerySingle(maxSql, Long.class);
+            if (max < 1) {
+                max = 1;
+            }
+            String setValSql = "SELECT SETVAL('WEBHOOK_CONFIGS_HOOK_ID_seq', ?);";
+            executeQuerySingle(setValSql, Long.class, max);
         }
         return entity;
     }

From c93f3cd8259b39d412629d7d42a9f8c575d4ae11 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 14 Sep 2017 04:17:19 +0900
Subject: [PATCH 068/138] #845 escape link url for bookmark type

---
 src/main/webapp/js/common.js             | 11 +++++++++++
 src/main/webapp/js/template-item-view.js |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/js/common.js b/src/main/webapp/js/common.js
index 971dbbf55..925488e43 100644
--- a/src/main/webapp/js/common.js
+++ b/src/main/webapp/js/common.js
@@ -113,6 +113,17 @@ function unescapeHTML(str) {
     return div.textContent || div.innerText;
 };
 
+function escapeLink(url) {
+    if (url.toLowerCase().indexOf('javascript:') != -1) {
+        var conv = '';
+        conv += url.substring(0, url.toLowerCase().indexOf('javascript:'));
+        conv += encodeURIComponent(url.substring(url.toLowerCase().indexOf('javascript:')));
+        return conv;
+    } else {
+        return url;
+    }
+}
+
 var handleErrorResponse = function(xhr, textStatus, error) {
     console.log(error);
     console.log(xhr);
diff --git a/src/main/webapp/js/template-item-view.js b/src/main/webapp/js/template-item-view.js
index d121ba922..f19eb31d9 100644
--- a/src/main/webapp/js/template-item-view.js
+++ b/src/main/webapp/js/template-item-view.js
@@ -21,7 +21,7 @@ $(document).ready(function() {
             url = item.itemValue;
         }
         tag += '<h4>' + item.itemName + ': ';
-        tag += '<a href="' + url + '" target="_blank" >' + url + '</a></h4>';
+        tag += '<a href="' + escapeLink(url) + '" target="_blank" >' + url + '</a></h4>';
         return tag;
     };
     var createRadioItem = function(item) {

From eb1f6f58ce6403d164ad8918d3db41dbda0ce6e3 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 14 Sep 2017 21:52:14 +0900
Subject: [PATCH 069/138] Update version label and add third party license

---
 Third_party_license.txt                              | 3 +++
 src/main/resources/appresource.properties            | 2 +-
 src/main/resources/appresource_ja.properties         | 2 +-
 src/main/webapp/WEB-INF/views/open/license/index.jsp | 4 +++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Third_party_license.txt b/Third_party_license.txt
index cf50d436c..d8fc9e003 100644
--- a/Third_party_license.txt
+++ b/Third_party_license.txt
@@ -206,4 +206,7 @@
    - License: [MIT License] https://github.com/chartjs/Chart.js/blob/master/LICENSE.md
    - project-url: https://github.com/chartjs/Chart.js
    
+- Vue.js
+   - License: [MIT License] https://github.com/vuejs/vue/blob/master/LICENSE
+   - project-url: https://jp.vuejs.org/index.html
    
\ No newline at end of file
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 44183011f..6ce949b2a 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -59,7 +59,7 @@ message.allready.started=Already started.
 message.confirm.delete=Are you sure you want to delete?
 
 # Common Label
-label.version=v1.11.0 dev
+label.version=v1.11.0 pre1
 label.login=Sign in
 label.previous= Previous
 label.next=Next
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index c92532030..d346a4b3e 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -59,7 +59,7 @@ message.allready.started=すでに開始済です
 message.confirm.delete=本当に削除しますか?
 
 # Common Label
-label.version=v1.11.0 dev
+label.version=v1.11.0 pre1
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ
diff --git a/src/main/webapp/WEB-INF/views/open/license/index.jsp b/src/main/webapp/WEB-INF/views/open/license/index.jsp
index b7cfc6527..71acd037e 100644
--- a/src/main/webapp/WEB-INF/views/open/license/index.jsp
+++ b/src/main/webapp/WEB-INF/views/open/license/index.jsp
@@ -251,8 +251,10 @@ $(document).ready(function(){
    - License: [MIT License] https://github.com/chartjs/Chart.js/blob/master/LICENSE.md
    - project-url: https://github.com/chartjs/Chart.js
    
+- Vue.js
+   - License: [MIT License] https://github.com/vuejs/vue/blob/master/LICENSE
+   - project-url: https://jp.vuejs.org/index.html
    
-
    
 </div>
 

From 162026cd0c9df1ca2e9cd01d975829fe0a4619f2 Mon Sep 17 00:00:00 2001
From: nyoron <nyoron.jp@live.jp>
Date: Thu, 14 Sep 2017 22:10:48 +0900
Subject: [PATCH 070/138] Improve print stylesheet

---
 src/main/webapp/css/common.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/webapp/css/common.css b/src/main/webapp/css/common.css
index 5b1c021fc..735931de5 100644
--- a/src/main/webapp/css/common.css
+++ b/src/main/webapp/css/common.css
@@ -216,3 +216,12 @@ body {
     font-size: 18px;
 }
 
+
+@media print {
+    a[href]:after {
+        content: ""!important;
+    }
+    abbr[title]:after {
+        content: ""!important;
+    }
+}

From e778bbad02cd0f5f71482f140e25a6534b3c28ec Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 15 Sep 2017 19:46:18 +0900
Subject: [PATCH 071/138] #853 Add a feature to set initial value of content to
 template

---
 document/database/A5M2_knowledge.pdf          | Bin 75858 -> 76362 bytes
 document/database/knowledge.a5er              |  42 +++++++++---------
 .../dao/gen/GenTemplateItemsDao.java          |   3 ++
 .../dao/gen/GenTemplateMastersDao.java        |   3 ++
 .../project/knowledge/deploy/InitDB.java      |   4 +-
 .../deploy/v1_12/Migrate_1_12_0.java          |  21 +++++++++
 .../entity/gen/GenTemplateItemsEntity.java    |  19 ++++++++
 .../entity/gen/GenTemplateMastersEntity.java  |  19 ++++++++
 .../knowledge/logic/TemplateLogic.java        |   1 +
 src/main/resources/appresource.properties     |   1 +
 src/main/resources/appresource_ja.properties  |   1 +
 .../TemplateItemsDao_insert.sql               |   2 +
 .../TemplateItemsDao_raw_insert.sql           |   2 +
 .../TemplateItemsDao_update.sql               |   1 +
 .../TemplateMastersDao_insert.sql             |   2 +
 .../TemplateMastersDao_raw_insert.sql         |   2 +
 .../TemplateMastersDao_update.sql             |   1 +
 .../project/knowledge/database/ddl.sql        |   4 ++
 .../deploy/v1_12/migrate_v1_12_0.sql          |  11 +++++
 .../WEB-INF/views/admin/template/edit.jsp     |   4 ++
 src/main/webapp/js/template-item-edit.js      |   1 +
 src/main/webapp/js/template-item-input.js     |  12 ++++-
 22 files changed, 134 insertions(+), 22 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java
 create mode 100644 src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql

diff --git a/document/database/A5M2_knowledge.pdf b/document/database/A5M2_knowledge.pdf
index 6b165d63912930f7d4c9f57d076cebbc1b60c744..ac92566ced4c9390d7f6670b37b835e6357b89fc 100755
GIT binary patch
delta 55587
zcmV)FK)=7z&;-iV1dzoCF*PwaF*Y-i%o+zVH8D3aHZzg!a(^-~K0b4Fa%Ev{3V57d
zm&tBkHw=aMehR;VHBkc)Xp?TTXi>C%0gZ(hu?@#r^zBO?GDVRe@CV#u4TltUrTg^x
z%P(JEo<AO+et&;mf1Z!W`~0%s&$rj_@9R9y^Y`=1gAb4Ud41RuxW10Jho{fKj<>)5
zc{`8X;9PzFZ7_U2Pk;Cd#cQASy3e<_vCjK=`TIP4a{TL`F8}(&dD%bx+dHS-=Kaxr
zrrnL{a9@)T0vmtH@F2O6MA{*DBe}64CD)DQ)`iq&H<C}7aZhv<lF!<4wr(U}Fymfm
zwa}`PNXMOSB!6J_gxZZ1oJuiuBL!bn%H7D)hLq4Mp;gq5B$)syByCkCY>>i0R?m<a
zK?-b`rRzpFQj7yqmfV9BSAbL?6-XPtE`|pw9^~sb>PCNxS6g95kdj*}`EF!Mta_h#
zU?t^!AkpeZ$``G|;DMFYyoBxJV&6)d<RER=jU@HMQgWOYCCxTeO5MoPgydyLkS3Dj
z6UkU0%?n?t$&4VaEKBP%+=FzZN>!|abgN2DOn`J7eAUL)pv<A6RYi;-OPH~4-;Ft-
zqJ2G~8*_hjCgpBq3BwQK%2H-3NY2PIJea9!t14rGnWnaCyBjlYZ3SOorUR>Ep`$Qo
z2dm>q3c;L{RF0osT7fy|3n`0Lkd>rT>qeF;Bq=s!E)L5vE2Ij^>sa-6V=iGqnwU|T
zOGa|$mVm%q8d@Ea0s!+YFmamr0`pu5=pLC7%=>>znFO}fjm2k4P6(S9Ras(@utN;I
zsLGPCw?mZam4!luB$-kciWojgrj&*9fW&VjW61@r_<hlhC7%On`fe-*D-^P9VP$F9
z+acG{jiqIn$VbKkOS@74p~wqdSw=W2-EJ%+UPz0&u}qQ_2HBRzvaugSlTDy3`(VZa
z39Nt4!Rk1W4y1t;jw{IlE5E%(nqEwR)#0TO=8#rk^#?KDCK6a{LdPrBpsW>P^B&=)
zSJpNPB&m319XN*~A1>WkN7#^7>&7~w3?DtOu(6JcR$f+6SqC;UKkRO-V`#@M!-I99
zR%1L|M#_2-V~kvR#^$`l7*pa*DVr+@D0_eD2(}mlq$4qcjq1d4{NvcIKOe)f@DXQh
z8H*RW1iP{Ej)v64GT8Ex%8oUQ1h$IxjCGuD<fWJJ$u&9X!02!k@I&iHmNuj@x-q(x
zR9bdSi<BWv9MeLUhDyF0S(++^Ze&SkoUt2O(iw4bgVFH;3TbvDOQaI64-*xFV}*ZE
z6=W4c4U%jIB}-SO(v8t!iTMFBF2tBMM!lUZ44-xQb?qu5k`9kk4P;5f-Uxdm?5tsL
z#JCY-));r{MwWCrHmq(~&1&^v#)BEF&Ui8W#qd>!zsTxER;y<9Vregywn^!ccQQN}
z-S8^mK7_rZdz>FiH?kB}s@=#^QfYs5BTHGO+l?&2m-k{7WNE7uyOE`<QtHO&aNO|&
zta@0TYSqK4ht;W8J*;|IoodzN&gW4%lT?CL535tH;zj|oR8`vD7#*$}{D7OGkfos#
zV)Xh3(inr}9%SjLgcw7#_Y@>p4Y0b@YJjf*UrT)j+-n1hd=-^oHNfgps{wyj!?t%G
zBv=iwy3}e!?jv%)H21i~f>A0K5)vJe=&gy4uo_`?tJR1Ch$w)q1rU+wh(vEqbcFi|
z_gmdZSdFl{)oO&*2&-GICRk0dy47kzRui(iHLJK>gOP9TD#1NoyzZ#`1YZfhj`~VS
zbV8z!COW}ag0G{#5_~22I_6djtDUggM^_scPmrah65JEqA9asQKN#K70w83SkkzYM
z%@`|VEIw2Je-y|^ntbv7_`rKy-{0TQ%LhIS@!2Pzd(SWDzc0tP*Ei|)$bS$20*%3a
zMw3AZ6O#r9RRIE%TnFI<LLw7?lR*eNe=;;MK0b4Fa%Ev{3V58Hy?2x)*;ywT-uoNo
zc^A*;Gnvn(dFf4MWtPeErfs#UZgorTrIu+Lsb!IYfe`{B#L}Q)V8n1r8ug+P%m^Wj
z3`jyc47+F9VRivIkPwJDGjq<KQ~TW;@v^e2HT%a#Rm6)I_44I4-}n1|pSiavf108w
znR+Y5Qr3fSc&<SGHT75U<QL)m*!8C#dEF<EfAtDQ(Q6dNJpRaQ-*lZK2Y*0OKk=zY
zAHMd`fBzrn>J;<R4R|<u6dq82bLkrt#r`I|FF*Ra=iW#@PA|78dix!(ee%I;(a--B
zM^V33eciP;K6Tey*#vz4Yw)n}f7CM%KlP<&2H%DEKY$;)pQ5S%e+QymxVn@FSDy;t
z8c^_CD2uY;YEuqeHA;u8L78wBDT$1Na(F%R4L5I+?^NL@;`^i58&s=U*uGJ?|9asD
zb^dbk#%lToeeKG_TkRWk>(dmo9q!z}+rGiTJ-a>MzQMwc6hGwPUd9i3f4Je}hXULS
z_@M|lYWz@wdksI7;U<V5DsZ2`4^_Bv<A)mDd-$OaH>voc0rzSA(1aT!erUnHi67c<
zW5*92xOebF)Ve|Y_ON}!ZPC{6wQqPW3cvU*x?qO|XD8gbaCsqJywbiAw5U5DC0d0Y
zJR~;?*Wf#o(Yr^Ycd1t4e@0^FMge|D8g7#_pT7BD;6BqTPz&@z`$o1^Y~RSWK0#-;
zw?4sS;lk$N!sX$@7vLfk;UbpcB86~~%WzRDa8avp(Q0tf>u@m|a50;3v1Z_6x8UNm
z;etAFal3HwX5r$`!6oRyCDDgVasZdq5H9J_Hq2rknli>sna538f51&y#7$YkO_|`P
zEaRrE;HIqNrmW$ntmCF^;HGTirflJ+Y~!Zv;HDhIP1(gwIgXpMhnupGn{om-<s@#(
zDcqFPxG4v?DQBQ56w!yjy!n^-=B9A-Z>gJiYRH*u_{k-Q{x)?o(mZl4P!u<n<NZ%l
zYiBOQ)jo6i)AY@ENZz16kS4G62d<=VQ1865|7n^!clic=gZ{}YpBxUTnNRlS;L`2D
zr8NVWMjbBI3S7bxTnc%(WHZ#vXQ&*Nr83*$_WfI*p_9A|FabQ1?F(ED`TtP=h58*p
zRFTTx$dgtKA2Iv*XFvPvAO0}<Y&2^wb(#7W^#pu}j=zC=g@!L?SonN6{MI*~@O^lT
zZvG?nUFx@!rVJu~>2}u2HWF9=;`&R;tdmW>^@i_b@W#LC=J%+7q`nB4Sfc9GJZZVX
zvjS@(3*}J(3Apu!Zw6*6lg<>(qAAeLHC+^>TsF`6$wZ0{n$3~ui_l6ztc}KjF9yRt
zyvM)V4Z~W$H-v@+q)BHqMRHZun$bN@ya!2QqhaOvG<UUsU>mMs{YsJ%KKO#AI*m1n
zV_FL|-$yT4h<iP1dnrAOpv?@W-TW@~Pt>1+<aMZJ(qe}ZSiur(!4*8AkT2#X+-gUr
z6<Svf)m9zVqkUR}mMf)VNc(}Gh??C$Y$-lNJYd6c+70nmj|34eKhEc&#dCAp+wR_8
zMKSCwo8ZKM6<1WPs_2O@CLGKEhBv19In+aE&Y)h}vMRFzNB_|ay6&_#Ifg9;G|N)N
z{wUCoe}H}%V4G6Vn-XYAlUj*-geTH;9T!=?8@MTp^eBaAC9o5AI+M%f3#CFOtcHzR
zv!>C_PwARL`^|CO+;~0$=opbT=-e2Dp@vU*KZa9(sfqz7@{%gMqW15uTzTEw+$*l|
z^wUqj=jE4!r=PyJy&-T+HlT%He9<tf+1V4ac0WQPLPIo0lt8IB{|@HiYta4zXnP%W
zc|_eEwH`~5XZmK+OquPu&K$IU%|S)C7}{mKX4mZ*yJbr@7A-U3CxS#FG3X6@ShO6c
ziJC=!t87(D^-`nSs!C?_Q!up9w>zZ_&l#St;dB<^93GyBGrOtCf-4GENr3J?Fn3R4
zcNeB{{q7}vydG}f``+Ko)51qyP(`h=!*g^6z2OZAWoX_<q2rWnyNJ-iFVp;sNT#6Q
z(#`KsKcK!s%>j69Q^x@kE>KUCey4E1RZ}y6ZO`!nFX44s-PX!vb)rH4jm^SV;aFj}
zuwOV)5OCj{jKV4jC8^}Ig=|<X7i*PzWv0<;Y*n@^yT#+h6WNp5Q_2O!H9_TOyK`%+
z>x>VmfMpjZ8VfAx<dG}PG?v_{MBkF^+ax)XjcDk|StI|_A8!;5!G$5I!P$h<ty`Rb
zsI4u|!m<8lS5r5uiYvhZ;O6S`wK_Q%n-e7_uU|+s_%6-6b($}wXui%#9F44i{1Klp
zq(W<rXZXBN)BH!@5h(lQUuH#)w%G!qm@u~ArT!cB4Pa>d)M@G*AmWt><v5XJ@E~SR
zWKWztICXHQeYTAU@s;(>jZFsR#!sJr$eie$=$<&$I^8<kI@h{Xy<Amb;CxAx309?&
z>1YhkU%tQ*?GJ93CvsCG*IQ3vP~rgvr3&z)8omK6^9i;^pRd6f;_<A)$HQYf;DD>B
zYD@Gv@m#*mcambUAk@-LMHib6;zYK}I)dVkCcLOf3EQLvJ4l6E9*J3(vrV>t+~fO|
ze!afXXtazOtNu|RVB<qCn2Ot7g+YCHVA_T!yRxOYO<8o(4G>$NlX)h+$nhdTfypzn
zQZSI6UP7h3?bwC2R4P@lg2>i5pu2xheF?1Y$q4hY)K-FO&^2dGg83;*aTKIr^eLsn
zRMoAyEw}B?DjFW_a#*3UBo+&QCAh8E8Z*rnkEQaKnB5MoZol6fj{{K%!xESS7d}QL
zZ%?(%yoh9(<*>|cZ{K@NEJ`%vF|0GNvzO)l-G_e4(als{U|C7Ul7*^hR}v8iIC%Dc
z)t649DzRn8%^y%dr2Zq=(G*}QPi&}Pt4$GcT&=}sF@A}k4_K+-n+Zugb<hO`x#@(@
zitl>LowwJlcXZM|ucSMclwbxuiDg?ef}N1F9Zk}VKiEin)$O|~%O+2cYe2RT*wViT
zllu`mI$rPf>RE?VQ&s(=V3I?_{@+(yEf~HYK6|G}&z3Bn&UtRlEF12<2#wGjL-P%C
zK_i&|EbxfGp}qi<ZxTNOFQk*O5*id#$O!3Qa((WdrkTq55jW95M*k6$-V$*E=95qp
zB!4<x%-MGJ%8T5TgMF9!uhf^p|4ajeE)uz2Q?O5py;eN<KqPtS)~6Vn1?V4RC8}X{
z3PsX-K&#Od!-$ao0mr0sY*MGWF)i+z>mpMPhSnf~1nGrw3MGb*ooV{^x-{;fN<%~G
z8B|`-IQqWAacM0>VaLI|`S-vx{}8NQ3V&Ehi&~FHKb@=Quz@0@?@*55sJf<`x}_Jx
zQi%DL4`WS`0pvrGRoilakHyG<;WI{8kYZN^K_O#5#u5|DON~JCDMs>4f!VgSwpf1s
zGCyGM(|fj@{vgP=mSbG50H*0Jf}?1DVpT!qO@#R5o9mum)U2mz{y&<Cdzt3n@qb>z
z7Y(r2-=V$^{>YfxiF8sDWMGSqQ0~rDT9t7((n-TIt#YT*X?5D2-k?9g{Xx))W@BbF
z9J4;a>fCIPiTEytkg4%FlzNx~FcXoL7*7QV_crd`vx=e^CUQ+jX{A>~=nWEdPSSl-
zlN?&OQs35B@=untY}&gBW(!2>p-hKN!z(rsnAL`$i|M4SsRqw%ES;{S{Kg7;;W+3s
z#=gI!z7M*hf}^ueT_?RPVOFf$h8?EMX+pYS=Gu10p0j)QWNmrP!o4nGL35L#6c>NO
zqW}{M#F@di6!dA(A7ZT!K)t6^SGyhVkLZ6yKBq+Eb{FBR91MXG@b3=bwcTD>=^7>{
zb7?o>wpLg3f@qnB!-<c>ztY_2Y5tE4^zo49vnYkoo`JZ|l`Gqq5lX3w>Xm?J|H9AG
z{7+$y7WoKYBmS62C8-L`{ke#vQ6_(Fa;9j?ref-h!T3QkNar(ojaWU}U<?k3h$5&0
zux}U4TRCRfYnJ56sY;shL8`&<VL=!}-!R8^qmIVi#_Za^H8%aKNSG?o%|7Y=11)^G
z=Pj3a2Ch2-F|&LQ1@eh+ZV8g3sudNJ^J}h)yhXM=`K9;S=pD~m?0XpDoi=~^w1JSJ
zC~ANZkO7P#D&YCI0YkFT(*|`A_tX}_=TT{m&f2-Km@nlkVLji7dg@RLtw@TjlxktE
znrq}h+F!v`9OI`h@FGAv<9n`8$mS7Qp5pryg+Mi?4hER0$8&Rbr&7Uo2o&C8EQRGN
zm)%*{oqeBuerOJkS*T6(wfleSrtQm0=5-&}tY3W7n=toNK~MjV`YOy;7iMc6T=2-d
zGboW2IWZ|Ntxi@We-tP%<1mPsUtCzkxUU(yf!nQsX`+1<I0|X>w6S6=jMHw2qlgR~
zWpiKvBGIfJ`8o2b-w3dDc9<Z?rW7W1MmhFNWna^EO_L;-7DU++Z9#uag}J1ewLy#b
z-a3NMk1Q=|CX5#mb_d^;^Ytg3D^0I(=@~z%siv%GE~v3(n5w1ddH40U<pvheH&mhd
z{DB<+NMP*B0;l;7a2lD)$NoN^(#YSZBpRG#p27b9l;!t@*!_#TREs<MfBoB6UJ3qS
zRd;1Y_7Vj<lTOSTE#H4D>G|}pf6zC+GM`pi&P|yaFX<&g{d^07kW<7K$i(0I8fX%p
zmsP43St!FpK1!nuDxwm?o|^$)HE?Xe2Y`GqwtlSYwU~L;FewDZz)cIMxH$rA2H=4|
z=ZCk*BYyqq`}pf~2CqDE!qAL-($>a2|MZ66<5x5J)Q&W9k6(Wf*cE}{>RBXdIi=c>
z=96YYnVILuHN#~Qzhv<A3#=+BuCHmFBB6xpn)Ryd8VMvztgP5Ak!PMLX^xfC@^n>2
zQeC4kek7pJ-v@ni3Hzv1^VBjmjBFrSgT`nu9$*{z%6Mje274b0%`)r)yUcRnaj29_
zFD@)imX-k}M>T)w<(-ofjYy3=n2Mc9MkAumksAl{d0Drf0y`xK2_QII<<^*AOxu#?
zYVuh_bS3?sYs_;Ei&KBu{Rva^fgo!G_umX;&ox_VOOScG=prrvD+vH^y~frR1*L!^
znHpjpPDYaOSTB(T%4Au+d>L7$3s_>`{0HiL)bCO{LC$~JVydjhnuY}qg=_mp(vXM<
zS_wOWJp>L<KLbB2NTP(J>;hIsFr75!i9{K1iv|U;O%OqD?Z3=BB`(YT+B<@A@Nh65
z|E~Wr<Z~Z=hm0OaJ%Vi*%fCP+s0>x6)*?(uhnX-N0;(lTNrDMJgClI<CVH|jCrg=9
zE|pIyxLto>yTEJ#kb-=ISdL@<0mCeaLYE1A{6r9kfL>mV;yqhh`_{kUxaTE9^3!x)
z;TiEEutSf#|FW1%BBaR^q%f?{(kh=<w2u^vOQL*mD$<u6_yK=SeU|tECLr=2X|d19
ztjx(c?V!q*hsQDNDFn?hYqeb41?@>;MFP!c0oQ+d8Vi#GID8ne!U!AbxfhZ!&Jm;2
z8$LKc@80j;^R~DB^he!4G%}peU1&5G%*zKqhT5O~`scu2626Im+x<Ck1)fB0BB?eM
zNtJLrDpFmFFqY0Ud9|k1Dq>Y6tpYAh`xH-;$Qf`?kWVp2{^22uzRhWd+5K5}!}RTH
z`yPMyE;pByx-B{3CiJlnbeh{_JWdquy6XcePc!J!qq26!mIFOhETmhRWpHU_&gAIp
z3(>fyf#duQ_51O-2GlsRa<sxIoWd&-fTZplzUA9K<};C%!=uiFLK~jx*_xxpepV1q
zw0PwHq4{|{fNy&l4)=@O!?TKd{o%~7epY`r{^INS_a{LPzeW8)?B7+W)o5NR9OtD)
zUgA|c3B)9ea)``p4!AofF*4(1P=-YDGHHyBg;F6b7&HOx!`K{wf(XWkhjAH9q`vWM
zzxJ80xWDGU6Nt8A)Ml4IFlo0(FU`+>;$MH}Kgs%&imvObQA4N(zZqqTKk<F=o4$Vp
z*oB$<OoUp=AQj|;LO@Wft~YdyT6#K_A)%34s~*Rc?wmv7H$$5UU=ge62URlp$zsyg
zMa?NH9xrlL&R}_S_jj{~i%d%fXn`;I09TcCm-E_=WE*;8Ti{s4X)OC#Z{q6LUY|&5
zmbOjv7mZvu;Y&97r6$<Bf22MKp3r|JYBv&HF%T1A|DoL!ou+ZSBWVS;?n<77p+<LX
zL}Pvq_9voceH?4JGX@PF^l04t84d~M%tH@ZSw7$%c?5aZ#}SLzf))6ufP`)NZC1Cy
z_FB-E?^9m^46ISdBNW8Yh7*d}bS{ng6!;CVgsF0h7-T>LkONtgb=shj=X!rr1X3^|
z@qtpsDtu>~#>7I1Q(1`E$NL|6z)JH8?$Jk;%>B=CwlKQK{SEgX>_6*h(L!7wr5J=b
zn;G}=#X*`8Fki55ew+Gx;7}Q=8GFozWXMJ#SIm`5l@e(7E7fc*8?{#k+Dzi(reor0
zWieaIlJ=5tYaH4SMmRPI^F4nRNH`B&=kaY#w&&=8<#{u)^>eE`JEpn8tt?i|^ka8}
z_}&E#=W`nz%a$Ge8bTE`%b{k`{?f2i9%rHP*oXNZ_`zR?;a#BCsPmC_CHtv<x|XTo
z5NWYes?0Td4WeDX4-R{#kS!2zE!9sg!VlrrCxHVJ-ygUu+|D#xON)P#)s;2kgu1um
z6!>b>kW~M+=*5v4ib7Yl$bEgwU2@ZQ49V210@755`H;slXwy0Mara&j`D>1z<Q%Rp
z&MNeWS;4Sm`p2)gJTGZVs%{s?EX%3v1A=GzFJ$t)9L*<sr*y;(9+KpHR1j$|z)%I;
z<G;cj0^(3bz?m5sk0^gD;A@JmScYwslu&7nyY1Qb!Wc&5mAPSWNaobgOGYVV%WP}5
zJqxJ)DWVu8KGUyFeb%GlU=jtxJ}W#O5eypNHV!|Zb_>sq=9Y!L;ojrAj(jQ&p#8dR
z#uSu7^4<45Rh7f6*8DdhnUZ*~d%BSIH+n`O%O?b7-{8I60uCGRDtQC!<fSlt!F2Vc
zX=Z1WG><w_{KJ8H{{fRj9wZrafQ->3<bZ9`?VNWy!Q{>O)d{Ivo$No2lYkx`0lJf)
z9vgq+l+{~7J>O)a8Je%)QUfxl-=_YV`XaFBW7G-ifI3fIrrr=CT$n9qFIFy9I2_*A
zI(p~S?CIIFv*%_7x%mpF2@K8^`07dR<lM>L$=&{m{^>IZXU=uccNMj{=438pFH|qo
zF0^MlGndMj%My@=q@kN2{@}8+pm!?3{PBO?z5TrtI0WV&Q2`<cw_@O<@vWfOG>s6Q
zM+j`qpQ=v~#l1=X0L~A$xSB0V$l=SHD+q#Z<Jfi}2I^Jca{lnF%8AT{d*pL-Qk~N{
zK{xy&-}KixaFUgTH4!zNnVZ0I&qqIMNj9$tiosi&HxL9d@!)|dI%Y-i6L-y)?c{&p
ztz8a`tEDZe@Kv;~h^)<PKPk|@W*OcaB}oxNRnxXjisVfH7WC<lfa|PL7a|-N4AD>w
z)##50<Aw3!n8bgY1iNEA#Li7pPRUidCO4X$Np~_(hw5T)skhd2LGtjJg4_YF0LRC+
zrdAtAB6WM_1w;>X`^f3>#9<V+tBrqS`#yxR1pxYOc8g&I({Zk!-G$@YIxDA5T1cUc
zwx$`6xhl<vG*VilJvYUVB*r%!OXLFPIC>P}oS=maJurF3adp4Ev=bm@EOX~VbRgEx
zxlugtJJb)smWg1%=BSl8Lg0r%Ij9BoV8(2jIPyO~S{Oy##j)bdV<Md(QK5fCB~f=9
zZp&(02Br=mTj1j`KDc`kA&mUCNZm$9BSE)YyTgo~h(A9Sy*bC0l%Sx#Sw&_bdE#KO
zKT|GS0eC5wFW<G)>7acat8fif4HLgn0)?x%=mREDQvDS^2~KDRZGqA)le_#13l7cO
z9x+8f(T{SiI`sdap#K{2=w^SZ0eEy1>VXJraO4~N65Vh%6tEV~EesZh3-b$0y-AN`
z>ik>8t(vK2nys1EY=$@&bK~B4xG-8+>@W2NoTdX?-)VOlzfo_}hXH5dXr2jY;D{pK
zB6&x~2y;Nd;y#Z3>(!LWiMrsbCZ9(ZCkEO3fa;iL>iWaKR4JE@fU|!&9ZQV;*!g5f
zV;N6+$CIjd#VvqVl$|SbV0gNXYy^K7OvKGycY0Rg>{-I6Z5We(20tJGmN-Y9rd|_A
zjbt2RFm1~Y<jww8|9F3|f3kn7uSJ|zq9x3(!%Df*uFO?N%$QkOTV2~@_8BY}KruuB
zAKwc$);BpHIWF9StiXSmfKgtatO!TLNqu5mhr_@lG54cUi$kxuhH<7E2^1*W;XoZx
zxlh*0YWlRObFP<k(lx1(%r&J(!q?3EI8&6>psm}s{G6E2yJFgMS(EdDnTKJBUU3_?
zqvy&?66f-+V?VFDx*e#lV)=Q*={#Ks`hjf+Z{@3KAUWy@5VC(28B|YQL@mNuz6E3W
zRp2ZhjN!$21XaugZPlecy6BhuieL2`e$$U4j2z;Tf>h+dj{y75VVgEvpR3~tBY5C;
zAzx%LS(GIOFounN=V2T-i3Se)f#TRZG8ogLh|Js*uXnTbx^kS()%Bu#@+WdR3$X^5
z=gWCq!jQ{-{$YP{(g=Ec>8-q-?LRs{e_2M#K6GwX_N4(D(0m6)IhgMNAO8w8wNGtQ
zyAf*OKGpoXKjXLj#lg}5$C4vYw%%+sd(D1xu(Y{^<8ruvB%TPJT9{vCeCSbBcrls=
zg#<E>5f}NNOmEbu@l<Bw2ft;g71}|85^%LT3(kiv_=11%e3HxBh%q>i=EPzqLwdUu
z>X{+jO_qDKpw`4jQ*uO!=K^}N!m(UdcGOe0&#j6uu~Hw+(tH!ir{_Z_)w_>m9OFC<
zu6Ot<6_VKGBV;UcY?@1pX(_EDjUaJtSRb~Bogro}2C*ufzzZ0=aE#J70t08%aNeo}
zUxazg{Oo_i>>7L}wkj4wv(-wC@r#8Lm=^5H1g`>4|3`!Cs|IYUEfKBz6^lE2_R=CC
zDNYe?*Tc|q-vh(Mv0_MsBAZR}Im>xWw-m!<xCN93hq6TT8F)#fH7xj|A|rW;#Bb41
zwzYk0**10Eh;sKPjL#3LuK{ZvQ%fK%(=jS}luv)<TKQJFRcX~*jn@2RVFE}nSzp{(
z+?pJlkUWHgv(2e=rB<zVYqPa+8uL42VPkP)WoLC~Ykqqk!z*%;2Ns8f;NcdhWu_nt
zl5|Iw8OA~U{~VeqdVebv_3m6p<CT6v+?Ht8<vDcDhJksQweT=WQ{Bn&q4jec7u^l_
zF?WAs<KJ>1c#O)Kl4$a-<?PY?{|SajR1{ZUL>-#1qk)QyJ!>zMIi_f@pJcH;GGpA}
zs62R=9pHoyQIApgMvU;}!CeP;A3SuxVbi0~83tGTWN?hlpBc0UI5o9ASQ(r<bN<Y=
zGY_1>MGmEV?!K4yDUN0tj?W7~i`%Wv+-!djgy_Qgi}&AmO^$*#*fbwS*(2$CFRV`A
z1SBAK7@<8<|8Rt1$3uB%A}mttFR&%n2z@K77xZ9O8Q3-hgfJ&~g3R(;_Jfioi4G_B
zREf`WykRLywI#5K6NLqn2W62}In@$to~r8b$$nD}fR))+M$fyQL8w}qV4WS0({6v&
z1yh4k$o2eU(UkPoI?pkVgNll*+cHQ0G%q`{oRmQ|b(!aA&2kM+0Pd6$9M0jnPtg2~
zrE9k0B#>)aR$w_`z;!j^jo+jG0XTbt%0{{TS7cq$BR31jIf0}~DJd<H*f-A!;A$na
zsZ2UMjeQd%HWj&e^vE2X8Op<EsLg-g59It>S1N^za(^}}o)SXVN|@zp4^<f<hq{ft
zna~?s<x(}OZ}<+88JAiH?K*!es)+NiU}e3$SMX|HJ&G!ph_9&F3dZ0<saPskE7eZ5
zTkVzlrBQC2!+AZOrWlgVk8wEwe2oa}v>pyXH$0N%#8&x8rw;3kNZ+EVf3$z$jZ8*f
zJ)Lv2y_{<yGlQD#{*JnbD->F~QJ8DBj3mHeOGIFHIe+*pXS)KY&7dFqvFcKGk}@4P
z2mHGn)nJw3R)$X)(xW<f4FblR$S!@2+M`ZUXQ_+SRqEZ5?%)Z@mGUL*O=XyUc7M5h
ze1C8MWcO6}pnIl!p?k4=xqE-5tCQL@F)L+t(=gN7Ocu{#hoX_}%D8H)NB3zQ<;RM)
zGdMQbqxVmrI(_E++4JY<i}aP&)s_!xXW<};uc`X{cwu{MhmAr{B+Cio5@*PUKO%c}
zOX+So3M2p+_=l+xU`4o46n-jxeGc(JK?-$_c6`PWSU2xvlX;}bg+PD9s>45!4T56F
zPRm(Ot*Wf#<mH0X$=S8|c#Gv~HYz<4Ao+^E-Y~+2RaB$-qUlsXH!RU|t;?1!;b@(~
znX)5U*5xhNwd@cf%f&L-yZPTh0zVB1hGVcZafJ&g3$A>VSeeyWos}XL(L_yV6h@Z}
ztRg||?-0y|^LX&l;7Nac$e;TU#)AtB2g}R2+TiAQsc%xBr!0{2L|hYjS7d1^71wiG
zs*^=oKO1DzcE--rCAv&kXkuw|*wQLRwTNSHK_-z&+BrKP7QzaAi9zzWqHG!#;{!;-
zoG}r#I&@A*35ysTT91T;qY&*deCIVg$@=U9yQM5&iZZtkE#QCS^Pjg7I~rzuYozti
z%-ijM{h`zKr5fSaLChC;V1`3#fqE>iJ*dldt*+M-g=7K8uSjhq4(hm$=k$$%F*fE6
zQXAPM0lL5l?2$7{rc-H>$j9!Q+ETm1tT6C~-h6MN=N<;_fMyeZMKm#(GKXo9&ikJ;
zh#GM^hT+=*)O3HR#+^TZpIx%ImS<)_Y5V=1GEhj5`>_%nMOl+w-Qbo`>ORT&^yH8w
zq|k<iUf+M~V&rp0I{Ibc#z|7y+M#;jb-gyyQ-x8PbSXphG(}mog_94tTE5mOGz&9@
zPN8e{EDaa<@t`M|Lzd||W=@^c<}&SUJJ&9@OYKUknyP>0oB5e~tB&1Q8|O=aH`6}H
z@^qY@KU#>;_k`Hw;r<>vUvXN6aDd2x{dCLn!0gZ2|MFomRgvqSed+O1;X`ZJ|90`Y
z=bmGpe!A8Q%v2>SG%cSih)atu<LaJi+mC2_dzy7o*R%SbyQ_PKD`C8{!QTIX`Xiux
zHEM?H0-Jw+kc>mY$m3`OO1eoLQ?4d!$!2;c-A;GXv&p%nNovP&?G>)hzziT|w9FPE
zQ%=pPJ2OtF(gioHSJANZNos)Mf_(@K=eNhh4$Cm2UJr>)s^P*>>`uVHh%iXsJKavM
ziAzY=9Z+0);2wYYf4gtb9n)&*;J1eE2o86c5R-qN<|(FXiwd^T*FA*1$21qY;=c&s
zSiu(@_tFU`{4+p~Myv(P)RUy=9cG4|;Z#wT)U29Qi)u-&0BAMTCWRwebJSpFI5X16
z`b1yWeLM~$s>u>Ijg`eIqw-;V!p)O9jjB;II{j|HM-S<-FfS|`%SOtK>g|t2`><h~
z%Km>5UX3~6kwOL#oh;KI?mWA>vx5s0i^c8Z$6xc!*Bn27?AXH(Z+*ml)^(p{=H|+Z
z@;=L<c`a>aG)uEAjr@7)IM3%5<rh@oDjF5nCw`auKG>|NTKZIk1_>)^Wm4Hxh%270
zYFy`yv&k4qF_I-qsZtTV?W$QbiH{ig36g)bp$as3+Q2&4h}+#p)ow4q0V#k!Ei(YS
z_U10jq&Sg(;|m=BpcU{gcganpwR4v)Jv=~K0t`V48S*=U@27`PBthwYAGt0ilNjc=
zs6PeGP8?RNW1Zfk-WDU9Wyq$Su<};P3ZuTPrE0_Ga0VQrE;vL>^+|oTzE<BJ?hJo5
zVu7WiT+CMrmC!8Xg$1wR4r66c)!OwouFdN9XZr(~x_M*4nDm$XSj>U2;aUR*hc==6
zMAD~4o)L=Q%85oL9MhnR7{A5=mOBf`$<+>U;L`Fw5i+wzYv1x1le<r|Oh-K(!tvUu
z<hhy5ysMB(S&CeTlSLVor&HdUVZnb+w_o}KfC2;Vo~}Juy}#D?=F!k8SywIii=h&q
z6isTBehA~4k8@oH&J}8m&UlQ^L@{q{Rb^ITaV1j5&AQkpg0D4c?EhdPz!(Sg`_|%x
z+w0LVt@!qGsnKw2wd}gOmA!Ny$nyPHO6zuYX%&q|XmzdXRgOh2-Ey6p^2~o9QeUS6
zK&kmS^Po_gq{&*KMXOmbCYvJAXqd7=Vm`r`QH>Y@UTE5IFdC2Mxx<3s+Zsgth4HKF
zRAOJmWH44eTkUI;@|la!+{*{0C279mF7gH|B)!V2xL=xYDZLq8bu)U?^FWws)pE>Q
z#rCZVO3}QFN@if!xBe4vfH;2}h)zh!yzDB0Zlx^S?Ft+X!b&_>p5)B_f%*cl{35BI
zYE$>e^>Z4l;feyBZ49)8R?v!CS*vJOsUbC`wiMORQ8b(9@@ihoo3uq|>0DS0OCrvi
z*TiNx6B3?Hcp?l8E~=W6L@#DUukxZWBokPUVG2FicVBjU*Y2(^%Bz1_H?yLy=R18c
z$~`!ikuN{~8qr4;D@YVK)~m?3Y6q@c_dE}g*e_n=^F!(nDMYoXE#S+qkE^O!TpNhk
z?cGzmIO^%+6kxVg@QPk{&>Qtf>!Xd4LbP-`2*<W}x5*lfY(AH-<?H!wem1|5U(Dm2
zLk9W?-2(=)xv_Qf#3_H?kKQdUPNE>zE!HuWh96Nu8Tk^yj}jUDNkUh!hQAL4V`1U^
z@0H-Sq*=C<RMKX#1Qaiw23L;-RL#O05Q(guFu`6t^Oetdmc0c)jf)3yIptkyrKo$3
zleT=Cw=9WM9NJD;0SywI)RFGj%Z~nL^ro4jnahJMv%r@91Mq*jG+FBs#gNycTBs&v
zV#A~hhCq@Bfghwzyf~*R&&VC2EA)kdFqY?Kk~#qT=_0RIt>e_e)XT2*53?=P^4=q^
zxgZ9(I2q19IACKqw|HL`YE6NDKV7acl^V^U5|fc=`d6A(0Q1Fv;OCvhWwy?h_y)fM
z)|P3~b;aXyP1JuD2jEnxE)s+{<ni((MZ$6OVsTt9mr;?TB=CK|2{QA?q(-C#7>|>y
zC&1GpNcGD4)`=~K0MyYMuw%z}kCPJM{k;>UV&$+HY-jrzf5=L!(=`G(^!Mt5FboQ{
zD7|!~NI&u|gWC#)@xTANZrh3<(#b5dGEo>gNHP3D*QkFhZSYuT)w<qaT-9s<1lRhY
zYx$=2q^(%+dz}zmA<v$G^jIdZaaTOk1Qv#*ASeARouLt}BcA10+eSGs!JV0c7v#}F
zy(F`CrenB8CG=W;T4Gr*eYdT8iVdi95^U!0DYkEGWKFR_<mC@Y1zDAh;t0lZh1!YZ
zJh`b_4Yz+rTk~5BTT9%8Tix2|Z}xY#jHu4hrg7NA#sY;E&li`ZrT*q<b78PJn6S(2
z>UeF8<3B1xvtSoMtguXl!eL>~;iyJ3B@SR5y|@T1ayg@1M9cuOXC}tT^o^EWyzZ{M
zie8nfFY=6CV0@W=Bj<}f$qp>#SzSu<>Q+MY4CjCSc{pBPU(dV8+)s4OZBf|~94ka!
z4@tj~b{H#HPkXAHpv{bwbR{RHCDDi5?Z?{PT+T3l{%5evX~2>HJMbe8`0)Yt5cMea
z6!jeSM(XVm8cUW8yh;bIh3MA9?T4=y9w|Idzm|Tw@J!+Lg*Ox|>?~kkAM=OYolB}7
z$v%IYeWv(q@eP&dD~1XqNnc^EVE-zqrqoMUE?;@A`Z^VlB*HFK97)?fcKqUnOWZVc
zhNbcjvOo;)ovW>eLR7&xxIG(<7v)WBW^4YDEXQGH6((RjCgn&ZACJ%9@)ivBd`4Ev
zWq`8~&Q?nm78lxZth}4o+OCq(I2kFnp#p#7P-Pe<!%=zPWHp5onB}rq&zNfR4XiGC
zmeu21m0GP<7vxYA@SSJq{JmbD0m4J`CO$3A&{XoLC(AQ|pASq`H;`t#wr<(FqXyRQ
zR?*k}nQH<P6xFc6QL-hGN1Xi@RYQ!d868y(RF&}mf2RH!bRZx;4~`43#`Z@MEYW{b
zEY-puV5yV{6V*g5(X7wZarkAn)o%@2<JNp)Au&m;Ch+90<;V)xc)<Y<)TEP{B$?=B
zIf)(oRH9ew)qCCE>}YO;{fC8_#hJ-yc?7I+EZm9$-^#jy7ToCy#AbO)6T`T|`@vd?
zWyLU^&K=~^X~{b?Kfm$6oEVMD_6vV@1&$G5XSrs`5+8_TG{mbUd$gF#qCA4XS^X`~
z%bnb*LZM*g;#m1#Q=cPIjtub#?u(-w8qOUlyvn;;Kqu%louTu<JVIa|Mzk)=2bSgY
zzLx@kRWoWfRY(=pvI@SzD;O)V_*>uvBgZ9qB!C4b%DIKZJK6D+X$0}>SJ!{t36r(b
z|K7^*N$#g7lZm^&zP@te#2^nE{MOF`uYIginV<fRY8xyPC;c2{0>cQvI${s^o|t2B
zG&e;#%rR1yXM1iw$S3m2e9<X6p;z|mUc-yL0bCrJsb;G<R7v2@PB;lS;U$u}RIXqZ
ztwyey10@|#mpaA^AhDZID1LwZI-N}H&wdrJVtg5|Y23}929SF6(b=bGum9DX^7{K|
z{$rZ{n>7EfDojgZHk;kgz3z26bZ<6G`lSLd#PN&vq360yJrrTlv`?up9d@`b*W>!!
zC|n2^!=-Q|+zbgbR4m7KT29*`k$V8mUUy}7rQaEJMxAkIX=Sp4@y37BRDEl68{D}z
zje}FuLYAX-I)`EP{%~3>OxBvzF!D^1qBb3Xm@ECxNOUFl8CP-De)a4~7HnBE>Su&!
z7Qjw!BG2I^YjQd}H#g@3mb^Kga}ycx2L<6CMZZT7kXb^yC`!6eWGqIpd6o}Dg{M7q
z-gV2aOD<(KQ!1tODF1(>-TVQGch$*=EmP}pg{Fe@gDbt&UbJQlHQWYXEi|5;pCxsr
zot5s&YHzK_naxiDS->lt;;M-wwG+2$OruanlpQ7kjvx%MGZ(F~07S)u@jgM#+N_wD
zLyMC_zaW*fXEGJF<QtZ0o2I_B&Dnwso}Lyg_N7waRX6@*O-6rD-}AewmeYAAE#qqf
z$$_3Rw6qDfOO+AeAPADm(W_QEf$q;<UB)Gs%WW($9MuDz{xbFZacmS({U}0z7##&l
zFs&a{qS{nIPFYX{93hQsQxCII@ucGO%kI<ehux>~VQbc3EY@mE_4;b7g?%+#qxenm
zA&bOsiPmzujLm=AMH|=q)vJwav(zrh5pn=W;0zLK#F=Tj(yF$arI`|0+k!_P7i;@o
z0JldY*|*24-CI7}a2yLM#z%Xg%a)nbTtVi<)oQQDcv&N(t94`WvfFf5n$63o;TUFe
zPGDILqyXu<SwNu?rkv#R#ZOu2x6z9vZtC9rC%}{60f~RYc#@}P3Fp)t-66Rbhm`4<
zhKZTB>jj>~9+p_5sKhdA;jN+*XgOZ^J|&Z%c0;=uByC(F{lH(`d->=8ea3So)h=Et
zCQ-V2#pmwz{p&CL{`=jA$}{B@MfjW**P-JYn)G2D58JdTvYYb^-w1o<UZqiO)N%b<
zv0I#N%r$=o`C&eaP-8^EYivl=DwEIPVv>5Mk-_U&umN*Qov?!o+~x|s!muzZV8==U
zR!94Q4N>1BQW0@C(LLJ9+7U~Jea9d+U;QY}*}uq%iGrF-{;V&h8)nmTID>omKR^8J
z*S5!>8f`tF&yU0KvC@V7gCF~t%hRrdj6{a_#iD;%2Vz@A=$8>1kAYX?;9k%p^#Nv_
zlNwPI@GVJI(I=2F1IXXed4u=)fFE_D`h04Jp5Z*+!yz6L;p_MMq+Szx=GZ6^B!`0$
z=L3<2ceC9&B7#vS<yDLAZg~*5=TfHYd<aTR)0w}XkQ^;-BTds>1F3nnQga+(l2ka^
z)U#F49u9u`Y}fEWJ4PUxmVO-`YDkoR#)KgdY*&-6U(dT<X$BR*HQ*&j;#nrt-7)x1
zmWh7OK%Cc0OW8TUtQKcQjv@9#2K#|)t{P;IfHTwu>I(Itli@fR0w?B^`#4#D$z)?r
zG`$fH_r!SBEX1=EuSDvT%n3-|W5+^`l^kz=zSHUTRzI}a>jgn)anVn<ZPhmNO0i_>
z!VFA?q^bG5YiNpgcNUI0eEBS^nF7PHmSvu{ET8;6ZCVCH|MA1Az^OK@5=+~Hf<MGm
zt)!wSOttE0wrzJE2O}|wW&J6CXl(nCe;%h^iq<@5?VKIjRl8<y>}>9cBom?08ct2j
zcIG<6-l(^*vbZvtU!ITn2@ZSVEKTT?oyc?z`h(Hjcn(j7gBRK@E-x)l=2z#}){n1a
z-SvTp<#GBo#0!vdbPO+}!~x6U(FkqzwlRFQqz8nQ*5X1-aY#1uh#ioB*SuYGc!Rs<
zDT)d_S_X-5bxX-hrIKZGa|vnD-s}~N`r@K}_j3!tgErj9?$r^ub@h)qhAE@K(tOo?
z=>9bFYvBDew8M$UC#6wG^S9mdV6bkbY2LG@b*$e7eg8VxH@vzas`EG<alN?f%WKP<
z^H}3wQNdlq)%q!%*}$oPt46w+?xttc^OL2?+QRw*j^*0X=v2y85O;9B_#iHsyEPKG
ztx32QE*Kx)PycbcuMU_bW6}*cF|#k0gNG7@4|=|lI-W2<)5VpFAb7l>YW7Q~x)Sg4
zk}cbY<Z|Mb*S__G?rYuic8}xe0`g_u&~2rtCLDX#Yl5m9mTC%rj*&3Oma0p(X(@gN
z9{*w(TBlTljE_QMx_GTzByX#r_e+t^;~iZFli_4>v^2tdf^4tttQ}w5TO(Cr{%~ou
zG(T7!Y^-gr?d%@gJ=i_73+OoZMI7z|q{qHIUMWW?&|z`&?Ry(U?tFkV7m*WFyCcBu
zg)LD8$B90fa4R%_#|4sTJBox<#7T;4Seh+JMzP9^wyC)?Cpjv2@5Ft`^*c|r1_O|t
z;c$)NN+~&;OR-PBmc{i_vH?C^CID9CCe^@KI67Hj6j?O#@_ODAP*Lo5k@4XD>W^bb
zs7&)Y6xmam?0<vD3L_-m?c)-47j+-?AoUhv@$sSsyyr)MwF4gAWUxF~TUlS(+SuOM
z-8sH<c5rTRapls=)s4G0?w!4F*1_KY{SRDw083nT?w;N~<Kg^p`OM0h^)nl1w$JRG
zIq0A3pYLDlU+&-4zq@;1*TLkwc^ntY;1Hz`ct}#G!zkbsk8#XF50@}brvV=L(@N<d
zvDz7*HQ&R36LKr#KwK=W)hU+~XxZjvV11mFHB&Yxw@Qp?>%7CdZV{ZOz_Gojl1A~V
z`ySOaR%A_Evvs?oShV~$v!yll)T!i4FXhV&!<Pf;7x`pTXX&O|H#vI3D2m{u1(kX2
zV=zO0U?@MH(#o^Pht30*#g;m73{D!RBOpV|lH-_v=M@p=UeQ{+uTssJ+eG{Mq{z}f
z@Oe<$O$X^jdXDOWOEjXQHCC9_;2b4RNVfd8Pb#<A0XOKucZ_Dov$%2#C*KK+Y1ErD
z-4?O#M|~Wey}Dgik48Un^0F_+Bl#!pRX3FrGoj&`uerRk0&+R4X@)2xw0+gps%8fb
zuEKGD?Kwri%a9z=5j71ZP=e+iTeoDM4s2wL12b_ky_b(`*S<sYltn-_Tp7F;uc23_
zJ;qTAr#<eBhuu+kX*?O@$Q#Mhm!{p%`FX$OR2^IdiG7-d(PXr|xVDHB0DfzxJ?IY^
zJOE*-3~*PQuao@9Vf5!#-Rtd1`e@sPTdPrjVyUae`yBnb&FPs`L9C?;c{!g71b2>T
z>SR(};T_9-o#8M#S1=59V-CFB=XI`B^b}uDCQVlh@>x_POOD|s;aj<95w{SOQjS;q
zz?XizUSF!!Zq@ev0PLtwvVM4kqWpD<mjxNK*+Qb2AT{FS#+cMZ186Odm&U{sHW<Wz
zBJA_wwK}9+sxfMUaqTZG)h0Dk*9Vr7EZPBY32tZRBLO+A<MU##mlXI_r&<`-^kKR1
zZ_DyyEBOP~UU6U`s>q<lb)hXW4~y<P%}J*=H&OM;C*N-SEMlK@f9~y1KKZi+XNTs~
znv6uwRz+*TpEqrh^MKqX-eo<8Shw|m!eh<Y21YsUuf{bhRceL07)NhXIFFBabiu1q
zE5Ix!_2v5M`awOa{I%g<JtyJdimZ|!`U`W5b0@Y=Zejl`15Ovf(5aKBSzL@YKVE=$
z`+Fzg0Ux_GwZoOt;<z^5=4yN!^x#;?t#P_l2swK7Bl6M5kcp%#05@qj3C=-(*Q|8A
zUDvW%o$b2s6BiU(To&pg&3YVbEIDXhToCF4-kpcB7x3Wrwa<7-Rg*<7F#=QAWZga6
zF5C9_MGLXn!B5rslm`Q8Wkk{D0?R(X%UKCgayTE^S7<);<2B~po8P1UJl?NCrIJ(M
znR0-Qfc{F3>|o-RV3JJaJJT9}qv3rTu>b5yzJ%9x#*sR_h<7|?3uIV6_aZ);a)J}p
z3+{{Vn~FtLny*w|4tcOv|3TJ%FUphQdYvyp3!-_AcEiK<BvK_?%|?5k;5xfx3TNzb
zO<grbGP2-&mct6;1DA=an-5oX-=fGE?8M>Gg59N*mdTjBXt;{2&*UtB9#HCMUaP*Z
zX{Wga_cNwrRdj*=)5lcZO?BbUGS4G)4k7SPxQEDE$^RSd=U1r3xGvkVL|aT&Qk85a
zSHWxLqFMstZ^kQ6>xD+4m1$>Y6LSeHb<w&>&-HtA{lmx;z^#X))kMLLR{s5{;-SM$
z6h7ZlPI-c&F0i8k%VIcxQhMRRwcXtd7eG!fT-e>cc0n)@+3E_}mY+IrsPn3=E3%N_
zXB^cv%E*B~7^KM!@+@TXjHOeQLLst#<IiHhdx1okwqw8QBN6{x>8y4(TAQt%*0Gi#
z1MTGNLOqZZazkv2xRh^C+y^J?v`DIorb|hC+$sK)bV@#zIF&qq)f8rg)|f=;<_2>M
z<JI<Bdvm-sKDM&EvR^+@KfQObmjJ3y;wL!1vItBT!<P?YLF2NrXuU%!nXXo9SZ@Oy
z?T;c5ckF;Agok?(;aXc9`ac|3`~%owuVG0(5(&bm$GAPZ^0QT;A+oH)^48F)2<vyd
zstx3J_q43<Jo~JFQ?0hH*pEDT>eO@FI5G2+&p!KXfYRsBdx8XJ*m9DcPkDKeeQ>4p
z1@)RyGBn|CZQarp#W##u!`RWZq^?inyWgh1PxiGE<CWLxSU-)a-<bfvQxM}A6U}o1
zhqXr63=O5+6s~d6uzo_XaJ1;iIgK7IzPI_GKlR@CzW0NF!PCKeo__j&#S2zYnfwh;
zspeUfjX0x8)<%92G_-k`Purk&sD0|0NL#%!M%HGTtfm8_JA*yB&6%AUvW}-j(Jq}&
z7LqvbOv*~e3**Vs^3vMs`syxyoW{0VX>WJ7H|MtI@bdd)u}}iW!r+xGxojTZ9oygC
zJHF3PR~a9F*+7KY?^?X3B@mA8A|=LgJ&Xe5qhkPlC%L6(?`8oCOwVWuEkBb}atTvs
z_e4>0K|h@mcp(|PVeiZL9&F%a)Mz{|&q?Mf#Hu`9PN=$PTE2=T7_T?ZONcMp-9*K)
z<iZU>IrBIf$YaswjkTelaH1M??5lkFa9;8LQ*+dReuTVElGri}W;WSqH`_SVPms4s
z;+ZhR(;WjWAXcvJ**Km>7D$zA<=M<!#-*EwJ&grBII?}g`1UYElu`@t-9CG_vJHn*
zD!F@Z_4#I_(SJ7r1W7J@IhF_ul}e?dcK*ztL6`OsdV%KO@UL(W$lifp1nYro>br5w
zKEjC=yQ0YbD_2k4b%N|8IBn@};drzeW0O-vPJh#4KUh)HVuESDk)hpy@dT#ECS+G{
zJulggFMPx<*(XHCWjI>u7zPsUH%%r0nLuX0`o)VnUQwx+PD`TTgW+~L)~wq1D_PZ+
z6X;?R37ZAoQ7igE&X>}O(MeG~vz9C{G*<|&%f4zj&jUqp;4D?Eh~~SZVDX;mECVLv
zwNE%6%94{HMF;|iBa<pcWPklXw!(Lq-1|Z)Ti}0u86WFAcDY<W^BSD^vO^~KF;up!
zOy9CXD}&H3(V+*=o)ooAb?vUJikfRS?+Yo4j0cv#ug3dRM7gjL!KYp7`N%?NW^=3g
z)lR8f8qKa3Hc0L7VRel!1riyPI^N!hs1{gCyeUX#ExVRmE3TE+W`Dev*Ik=kTg`9e
z5f(_!Q$4&x0ue}XWru?i<44Osn0OB)(YqB4z+)iBUT6>=F-*6^)pXS&38@eny}G*E
zvya>BmoMw9y_&kZ+Sj#b^P(&P7xYpN>Zy&Ytaz-T3(Nb*H3ez%Q|KqvgMHx>7<fvR
z%KOoar%$g)DWPWXCVzSXvKvpCNgORu{6=G2b5&2J;=Sj-4H*AtvF4td?)YMCnwuNP
zwu$;hi!${sW2?AT+S<r(=6CYP@_WhsBu=U6WTz5M)lcl7B&;Uh)bq}*J%w9)dq!J(
zx`$hP;_a;fC_#Zq5`R36XyVF>t22DFFU^Nyxhu^V7Zh9RCVv7BtnobOa3WgXvo$G|
zu>?OT%&Ofi7bvbOYs}25{NQMGaxxh%Nz%k=$R!!68PQW5)ho!dn{41E%`C5SwBJ`G
zO?7OZ(bRMR-(x5Zp5Z+%rSLV!e?LNKAd|Y{C?59>%8u(XXXBkJe6oMAXo)y`8uDen
zCf8+x-zgy!Lw~KN*Kkb<j?9(03RjmJ5>_~zG^VFCb~-lRlt%Z#4JVm~Tl+subB_ew
zegQ^7AK&$`d&Ui44D8a#t~|%SC3HOW@ndJsOdQ+vtZ#sqfVSOzQU0}0it0K#>mb*a
zKAg{A&gCBUbzAr2^}3O5vJRuRn;;9%#o1RyRB-hfu7B&mdmxPR<NRV{sWEA+Hr7BE
zBA*kdiLhIaD}!-qDJ~iyrKR<i#!73Yy)wv+bMv{S++?^sTpO+rNogrqHnISZvgmk=
zw>aT)tK+1eG|E4M;{Ax7?y9vQ4)`2K!iiL!PiaX>4f1`r@B;UOkrdJ0&+w+8)^x3H
z__WSd-G8#X*OUg;djWzLtJPmkE4Jl03ByRT<~lm(_`ff(1~K_5L3_qP9IDl3-exm^
zNd%bCOL$$J5%D&O=n>xAdl$3_uaUVws-<}a7hPj3Sjx{A=EM2&Jg$<#R({c2@|L$(
zwpTaTHm`VBJu6y)1{NQ$V8nUsrfYg8E=DIVkbhtF%Vx#I>!CaKZhft_-rA~f*Dv{3
zeY|Hef}sR<#l*}Q-Vq~-WhY*+3L`p>z~|1CL$oEwQGmi=R6Y7M($#9bW$O44tNtth
z&JrpZVRp`_-y`6S;!?$8=j9gs5_=ZVQ%DMo&6*XhH`wk8Od=&_Q%jD@igs3+ue=)>
zwttRjl*k3{20H7#S7VdY+=E@vt+pztOoFy7MlX?fmn;E^h&D`t(G?qffyZ^%a!e98
z(Qkf}`XAt<;r-fs)P2;$@tVk#S-0w_?$+1l*XMWVkI$btfAajn`7`IEM8neZWEqz-
zUE06AkK-jN5@V`(6;jURw49T8G19rS=YO!wqSckPjrGlAJG(6QL-4Bns4SQ)#E)a+
zapB8hAU&q6QxZmYFo@X5p*#~0aCBHPLx!CUd=wHT-=Aj$TVzJO&GLxlFICEA3s_Xv
zbUBeuxQdqM^=_hE&anFobHh(*MOSlJjdKH<Q%Z@!!RF@9rR;*7H8|;BUbigHOMm(T
z${?RJiVVwcNvEx}ETIgp*kx4TF+I%#Ut?diU6I?%+O}VtfEwgYOOwD~TmYxhwT`0%
zW5QR`1q%qViEGOefG2+kx}Xu9Y#r_Z@Ln<-Evk>#7HNGmYh}}3#w%q*fV3vil(yIL
z=I9<hqQ~@NZK>wr%m%LY#LnYD8GounZKxY$dT@NgNE#U<3;t9{l_|UyxZ`vk90na%
z<||8;NhOIV416#QE?6xhpMt$(DH2Zc9H~;mtG}^Xu0=^*Y`bF~gK-A?jvu(!O0bBl
zRL<3lFQ$Myr<tx2a=o6r<6h0DuZ>2d*Y|o~{1Xdt&+G!Jhrg3a%R_qceSgl}`~T{F
ziNtFhr)b+YS+|7OrsDmhq8RY<tv%gS?R0xK)6Wbt<BSyTx+btfc9a{nM(xpTdM=H(
zaaZW(Z-Wh)X|@==|6R211SIUR{;d}8mvJ<H5HD{ZPZNlzeYfOJXqQc-7$)#}q|^5w
zu&kJQU7wW`ro$<AU{tkD!+&k2vBPjzdie|g2dA^^VW#XkE4IibxX(R}|5E`&U`*X}
zy!`2t(ywMwI$E3cU9!hc8Eobn;N$Kse|BbeGP^vxHcPVBq~r{*>jpyA#<m6r2F45X
z3(IpWb7UWkrNs%^+X+Zhv@>i?^rsU!IP818(N3&)@%|65-uxkqw|~U|wR=xj6WqWC
z2H*vGcbPGG5p{wj=v8`FolAAiq~)VR^{(RlylrzPyS(g*vYs$g>QCj6nJhF=A}FkU
z@h{;A>9*fvL4Rt<587|@0o4nu2qn;#jo4LG<(Z^!dTGMFjCkMFsm*;NViP4bRPmy-
zMRiGCQCHOsbyLOr4u5s#yYpmw8U@FI>xo7J+laD4t2E}X)9?V^IK1P|TT9kNTh-R+
zO&YJ%vdUqF#C$X9Y^_?4M(@@dmOFFNuS$)EM|LralPmZ<C(Vg0;E!~0ZWE5HS06Z4
z=!x?+H@_wJ!-I#yP}bF|iGZpN@$tKorQrRVE#L>1X_+X%v45zg#e$3UBr=aFijl7X
z{M==lS-h-E$Na<~x&1#PwIIpET9D0XwCtwS#QDy;*@*X5>6_7-T&rjIrmMM9)ifz|
zYZy(VRd3gEpaOi%c-PE$BbC~rTLT<5hUv(12GeLKoNve|xsu8&XY-!nWwv`yG}-xg
zEu1bExP69~N`JX?kL-}cl3d9(1v&{mw3Ls&^il%E;F^pQitJ0*(Y!+<Z;>zaP0$a#
z?*q<bE>Xwg{rIm?*W&-{pde~^2OYexTqy{HoxNjwyIaS%PHvsrI<s|l%Op~<yt=Zw
zzPhoBrJ{sY3A=Fsc*RDsS=>I@IXFJqo1EG`y^AXvEPo7*ph@Xeh7>LWGy;UMN7k_&
zU3u&WKXUZ|UOW(Qu1SpDYLp2j?qLuECO#vkF!jS9H*LAB)wt%2C5fF5?Yo|Bn<*vb
zRNJ`Zw(8sZn^T_d23w4nOe$HQ6IxGol+NAzi}-k66C6?5QY2fHMVYhItmA-%Crb%r
z(Y>Ywu73}#BCzIZzGq3udRB4_T@pE4bS3lMDTGq*d}q~%Szk@ON3m2Lh_EGbw4qZp
zRiJXz<KPeRlt<Vb`EOx}8De;bp_`F(4BY*3?%yH&|Hy!B-ba1p@bfrKPCk!Ul`&CN
zra!!I|Nm|8%%dc$>O214t5<K|*V?PAs=KQ9t$%u%rDvvRVHI#dMGg=#1Q1b>fD!_l
z5TYhgj3S5#N`R07@vw}{0v@(OM;W3VFv5vwJUQf_98LlVhtXp^XY#xEy{fLB=~<cS
z>TZ7X<ulMt)w}z>zkA=kzdL#RBkrB>tkfRjnQ99oLrspn=1+u;^V~wT5L~T|!GHKc
z_<x|LCBlTNneG{yBk77+Vw0iB8efG$Oe~Zto_1TWk<&Gf|M19YVrX;~z3YUdzTCe8
z{jJF4XNLhLMJHRN7$=~^q?>jo>dVs^GnpSxo@{8g*QeENGxR4Q7gOeQNr81a!<)8^
zY&Dg$eE4m#Gr^@uInwh>_8#I*jGR*&g@2kGuT*xWs?a<2rY2I8DcZ9u#P13*T1nm1
z#wS=0x}#;2%VGB1+Y&di5x2>ST3MuCkE86EXt;Z#+lWJ9a<oP)CjVbdQ#Aav###>R
zStX^ct1LI-Tasj%GT0b;(BJQkj@sdwy1|-K@@~Ua?3`<@HH=Kr){`!;$xe;s>wmtc
zvx?&So~w?!y}fQ<lD&XU_bQgIMtQ2!awG36`r<sDjEhaElRPa$0;qpx$kj?YN(Q-F
zV3O`d|5nNL1Wh%&<zkoR%epQnlYBxHGHTJvsE*0&*#zse{Jq^%ayFZ`lkCvttm*36
zOfitf#3?J);gdKHrlbWfA2QMV6My1OD0+uuLa*V(_aMdZj)^ym#v5PpFe3UhTd}1>
zjO+{KlzY!1#h7LMJ#Ry;Cwtet=)NVgp^&)QCzIf?H`=jJ;|ay;MN{7DI4SwjaQ30K
zmL2}#?LP0pgw3=CJLu|}NDdb))3GyYQ<3Y{MCV{K*^}Zj6`uEaKI<l&RDV+Vq7Wn#
zp<_#2lI4o2K-JQrp|PT7$qAp6RYPDsHfg{UZTMP(*EL%H&YnLq_cEL5`dcQxHGodl
zJlW$Dy<0_?vvEFc?g7ND1{IgKVlNCP>)*QOk~|ycx~5pwfzSC}n}gsEKIB;ztU^V%
z3_i)ydqRH8+(Y;D#;vxQDSu^=KB*3+N9JG?^<dU%<1YsZyX5B0uo^0|=`ZKkWo(vp
ztRQC@W`CZ`)kJ7o;wIkZ`C86(IaStNNeetkyJfM0pBGu5OM1SLCVg7hp54rY%nunm
zDyywzI!gMq#?3%v3Q5`}*;Pdy`rgb3`nnEXV?9~U1=?syIfJ##&VMg`DXqvX>yrE<
z>&3gEzLsE&tH$0VxGY!Tid=Nckz{6;$uW?bTj&8kl9ztq3ytoIc8#QKs0Z=E5MQ7@
z1+B*6t_=y86_%8YYABYXSsaw5qsix=?~Umu$CAxt94p)#461fHNa?m>nt{r)vKH8?
z4*hD-({nMzRTst3On*jah!tpKkJC2hLcIH9Puz_qdEyL@EOq!^;E|;cRV1E=)G$bq
zQ$f+IhZ)D)P?Dif>NIU<P?Xy~+`rB&IC;Ihk7ole@u{^w#FNuZh2^rJaorL3)G2-9
zc-QxN*Zp>&Xs%_chGx*StZy?9LA<I=F0P4<*Wl2-ZiiWErGMN>CIeB2TB+^T+8gnS
z_j-KIGTCgpSLpLBS+!HHYC9QmxXy79spC!(^f32v$f^#Q{TZ5L$f_<m`f$~?)4XrH
z`I5uYJ8o1M_nu@nwT@~KS`>I~tVY{)G}_!^ha6YP)sriHi&YiJE1Es>h?(~`nO;vX
z#6D#ee5gyTDt|c8uSii@s8A<&G23W=my7Q0nBCiLCC*4-z}*tLQf+j8lcWO8w4E{P
zka`#Na`_>ce0n{?P$pz`GxPBqNN?8bvFTK~WLsb|R)bX5r2B4V2zx8_MJ$4KFjv^b
z_9mSf**rWGb~K)gLcJc9d==~_80@w}=v@QCx}wjrBY$hxu1|m+nr1m(dAbUJR_Q4{
zw4JVCtS6IO*<reBJXd%FEZ`TQulHdD8jrkzYz@M`kc+OoW67l2WO?EMj5_L6i4!a{
zJ^(vY;LWpWVcn0{C4@#_TOWm%U54(L)EKKTk?<3Vo&mk!W{vlE6vblE@hnSIRL<0V
zU)K%Qvwv*E&gOJk`g-8{yyFBXt<lC#Gz7yph1|5P!tC2uWkvB^O%`<DlO?m^hx8rh
zDP|{eBMr?y9oJ*xBA2>2hrA@W3xr^ej>rAzByI3vOMVtK-Bs1{1)tPSk>m3xtSsmz
zs}7D$PD(>#^`2XU;4FunqYj`|l0Ha=Jp4KHuYb%iGsSepo=-FROes^&5a$+jA0=79
zBqd3A=r^t&5u%0**+Ux=t;_Lozqlu&HVYV60@*T18XDy7GYLi3cv<V{<P)ZDKr<7F
z*Gbd!iiTF|>G5pSvhzAj(p=Hj6d}p-t4u+51+kRz3{6yw5`2d>wcMqr_gnf<F_<_b
zP=6F?n10`hY*rCPuxV-A+w%v=$;V)3)NFfAD-W7Ise_~e#6x_X7)Z{oDPOm{ttl?y
z+r@(CL;NI5Rpme>uG3Tp%0J)tXf|Ex2=mYnjrTex8>Tx`x?0Sy<IX9ER=QTsb;fq!
zZphhPP?lZHNPHWUMy}K${>XZmB(0?6WPg3e%Tf>as%6^UwH~OdiJ)<apxMKZhBNkF
z)o-pmPL58-210me04AH8tYmbBWhKosjP>iiYV|K!)rVeP_r}!}r)#Ptipx~rv9xZE
zzT{C1{&;s}#MK9f$EAT~{i~&|Y&pro@F2@cQb*D-2HyvE9yyEKYUh!L8_Zazbbm;u
zlSk5pPSnSGYf^grTrecSHlE~19UY#jc+f5AUNY%(yk<DwbG+`$$_bY4*K8~4Ck#1o
zWevvZFwt=`m+mnXCAQz+U>;z0fE_T}u$IXF7g8;ww*{ng4PxV%W>`3@gO7afL&WMr
zNOKHw@N1^QvVmVL+K@ep?DVODqJKg!rw2wZS1>+!xmVNOZc9-FKh27taqL{q_gPah
zYz<86F*6&gsv&30T%lkGzF!lrV7V%n2xTF<<BYVee}fv(7taA4rCaT899SlITap#5
zri(&DmK06Zqhrf_K=y%>cR-{YY9^$)SFzc`pa^^++~L5?PnKn#mrNLuJb!X)O?F_w
zGd0)GLas|gLRr^YnErlDPYQ;X|ML%KJj?G%1uIVRWrO3oKc=!Y&eopSnMYyXJ;sc-
z-g^gQJTXoqr<;Ra#N~OkpAt;fa;Y*jI2`!^3FA0M!%NgBQH!-X*v%ekA^JDx#S+Y`
zWK|N}>FJCC<9U@cT!XjVP=But3LIErr+!dUtRNIFQ9@Z7?p7s5wfRIK%WlfBEjN+S
z`LvO*1hz%I`ubqJaK&hjBJX*N`6_cGqd>E(&=ir&ILVUHR&wtU@f#7{D?m~cErP~X
zx)R1)9px{uy6&kJ{?jLps{J>rDbH7+kMIU2Qby1_(3lJT7RJNv<bNuoI2>2?R66UW
z;gEM*bgxr0oW{hCh7%o&)bC>rJ8kxhH=S*o9s1;UJ00W<GaN}T&!@ANlO0=5$|wo*
z%j=l$5MQ!0WdteOLQABj6yWLSnU0>a^97}p{hOTPhktQV#<1*ETtDAr?q;5y{hZ|7
z&$-s|t%6tW)O#zN%71z`ck^{++w(i<bBNFU`<b7RI|*VxBIKl*qASEhzR;2dv9TOE
z(wv-#H%mfAzW>kEAuqhrTkqXI@X>;+r!xJSW$z;=%ou9h?FK9AS?EVs$9F}5X+>|0
z($ZQqmnIiwlU|kh18MkcGGMmr(f5h5GbS2vyZ{`(Xr7rxZ+}vhbSjz2vtt{KlA&``
zQ{L^LfWb59Jj?!2ukGd1UA8+g5Vesv!SZ<yEa12|49OM?u{KGW49U+=^CugDv5`Mr
zUd^wO0&$w3mM-+Qjr>O4*M}8f8A$ZQ-^0;Z^#*enj8;Khb4c=N%^|6xHHW&CBEFTv
zI1!EfiwCs2Cx6~m$c$L^bow+YXZfPQ2JC&M<=tJ5>vWVxjp3Z-Wy31j%a)+wJ;A&b
z+iub6HnQo2ypfx2!?}_t(FoX<!#3|?YV0AIJ0eejDQE2ynU{zuIWTvONFL}ACt~}g
zqT7A85;rtla}uO8<Rot|7*8;tY8*tPo;c!gTO;t)h<{_&%qo0pN=cak2|jVFTN%ox
zEnD~fzDjp!`GugG_NY(QH|QD$$%_tVjE3z&!R(V4(LPMF)00NT^;oZYCrTqf_7fpu
zT9@aD)N{nP9i2O7QM>vBb34px<mQdeBtFd>oynzq<iIi?t*AwB$Zq$pzWVBiw(9Qn
zZZlth41aAi8};YY4#`UDB81$I%VZcS+8<5a?tmffK&2*L`(Yp=4Yl5qr1<@EWP*&>
zzthuW*@If2ZXV}VD&BG4SKRzSDr0(@>vrc?tZ*kLR?z%?lX)>-lc~fvmN+CA$+~Sm
zEQBSgEJ^!hw$a#+68pELvxuOX)#3pn_9EoA+<)6^+XGs+X>A~p+u+f4nRRYqFeJOq
z9k;s>$B?`u&Fp!*xo)I0A(KD&%25zaW5}Kk`ZHN0I=|>!e(oy8H#$3~#p&{eMb8S;
zG-TayUC%gk+*(<#=z(56#k9RZkNUPZn5UV|jdcZPD>+z7tQt}RVQ;ImRC-^j|IM&m
zuzxD4u4P)i+;QQxpQ&|J-MT-X_WYr~9<rO6_)LDCt}BrAr01NQk*ybV%+2-*jMQ9V
zc7QZJ=hli<5A2UrGt{WA?S?k|47B0yC`?;)L?5g&dglun5a<<Ybhsrxr05n88k*>P
zlkxHv^(0;Qw<>mr(<%Rnb9VA{U)E}TpMUpH!EnyVm)!HnL0j252O8tb$;LczC-V!M
zUK?uq0ZLD3mRq&C#Jm#{DRKdu&aKv0q&7-=BH+Q6@_s>@=jF#Gj_VtNuCI2XUy;C^
z3W+y0mQf&&zYQ&`5ck={DJ1Q)-JF-(r^}q}^OmgD#a$-p9_s$BmL{3Jnj0}k(|<)<
z@$%YQwP5wIA$R%(Wm)o)O21=!-C4!b{9HvG$(hxYEF%-G$Gpk>BXbKmApry6EbF{B
zyNaG@sII0S$GWWNjp!rJX|f4F-x6fyqC2&MTUF@{Y`c7_-X#~k$fhwNUmpi0$ZfJT
zm1IK?O(n@&no5$v7H{)pc1rz%(SJ@uY`96Ht+RIRwW$YAnAEeXa>nECa8OzWHoj%1
zN_4N)OkE}W?k8wCp_wxG9gRqzKm#SS7BcpeK<UQkSsladz)2Op>axq45uo+gk7FU(
zBo?GRr@(&uF7%Tsqeq^0iNyjbZLDY$LuKQ5r>=&f>v@0e_<^LV;#Dt`GJlwcGI#*$
z0!f1#-;!rb&c5U6-mA~#p$|a(2AU6koWyRm?T3x0M|F*OxA+M>J6<IugQLaSEvtm_
z0J(*pLZ3A>#!g@T9UD!nWOV5I2R`6^-p$lfS;Nsix14d;ucvpE5>G+9pdO_gtydFt
zArw*qZN21T`zY^8Ax8_;y?@Q!qce75{4VSt3VAD2lt=6iucM;(m5S!2>%FtBw4HW8
z5M;6!o*A01n}#I!()Rni<``i^|9gP;8_c{Is=@TAMmqZ>7?~k&nXdC8HmJL_fL9L<
z4Jt#!qeb=7OZm%BapQXgf5-fsc^O&?*`YhsvN9k<6D>N=7G{DVGk-8Th{y9UI;nXI
z%t}epbV(u;E5$JFWSBG|^fMvwNBAVm^P<4RpXAGu3?GwWYN;ubv~Fmuw>3(4@w`Ak
zNB*Yk1^%9QpdRg{`4Gl-88M;vZ3$#^9W9N9zs*)VM4)d9#_9Z!Sn#BVon@TIpIh<<
z>T314og{;vaJ%l^Ab&ZYscxiUdl2>yXx@;ViTX5p87J-2$R#i&IMSUp`?S6DZLeVW
z&bNDK=i8OW`N?xD-Vns-gwO6j*M2q=&#%wUFqYo8eK+%9WBwA`%g`r~d;dbx5j7Xe
zE5^-iu{ddt<~lz2V6dXUKk)5x_cA8FpZ9;6C!uC!m|muXJb&r?wkY;7TW!~IXGSdY
zSCnkB=+V-^$c8&Q#|@%2WwH!HK2(1|7Fbr6)D8%EELZs4)f~)Q8!1S#Y=Relu81;m
z*|QvC<k?-diGUYXSz`O5RI*^<2??IsQG1|uK11t9@qi;-qxwcG294F3`eRTFdXqiN
ztV}j#@(GS*Ie#zX>yDxG+B2j^1oG*tf>LjHPULuQXwY@?VMeBPLxNuMrx3cybTQ*C
zZ%^ap7Mk`(u(JaVT2|Rfj@%#RhyqE5QeH0BmfOqA2|-B6x~p43Nf49C(_kz~(!@jR
zle-jAF`&voHfoSBRc-BrKeb8_oS?&S{V4@L3t7b{$$vj$f~WQznV;>Vb=hZ1OpTdr
z*w5J@7ZihzAnG^iCc+?3yxNkw97L;tbUnV|4$E&^mO^Z)G}A*%csoQ15~7hhElG-=
zwgW3joqDPV|D41HT-LvfPd1A?A-pV$kPN8SIu!CHrEzt6N8P>YCU^K7V~MeD{Z^<E
zB54DHK!1}$=K#BzN0{$H-`{vg2sS#Y<56{_OZkoABz8>mi0HbhQ1Q)FCZmVBapB9~
z3$xjrA6iyAl{IZGJJJ(G?dNSM*Joztu?-_7UKJ&_%FR_LNC@YwNosmQ54}`<%y2(a
zA5>J`OorTt&*3jRftPaGc%J?i^Uq+-HlDYy)qgV?e%Xe(juz%7t;uXLrxr5?7yexj
z^eIj-QFL<?8Ow3JuEAt9?(Jc|!~8AGf1G$Nym7-PA8oylHl|$Nb<;WgDd(A%b%7Px
zq44)kX472XV_UxWjp0YHNS=3<>$=yu@fzdn5dZDOt4(wDoqW>-3x^D@k<A+0H_e$|
zrGIe670x$<%$PnLdhB)E-7dGgqiXqTDN~917Z0BM1sGk)uKaZDeHwlsRt%|$Tj=b5
z*1Vn!r(bZbKC@;yCwV{mR4tV;T-8r!KP6pxWxTHS4$N70K!=xVJd<p13H6jtpBb4&
z6S28VJLOtS01umnmQJTMn5~_qs%gWQw0{$F9;q<i_V0@R=gz35(vEAn`S6UW9+LN;
zk3p_#v3*1WBi?Xkg>ai`IpxZ*9(Ly6-{n;^Im3D45j7p<!T&M$z+9GCd6j4tr_p;6
zQ!84<Nl3gza;7n(r6+gBEBAO8d)~ztKeWa3wtVH9C_X8uYxgtTAV*94=4f*u*nc-?
z$usXyIlV@&YhU7RTUYPMdcKuQclW>VPosC*@4!>HQG0rpHQk&zbd<qP?)<#!Tjk0I
zX>EC%8~V`Zm#fpIvJq(ID1H|6AsACWL3-|}-O^1n37W1aAN)i>cA1w^C=?2XLZMJ7
z6bgkxp-?Ck3Wb_ijm@ERQL(lij(^w;>Zs|OdD8C1ChnfYSK_Qisb`KvJV$lbes%xC
zQnGLax_Cc&KKZ;beE>asAc@m$(A|e3secLTvPG-^KCtAA4nq&lmLkllGnMb7P^hD#
zw+>b6@hH@S(mg2DQPFEN(l*SC?$)b^sXOLJhP43oJPL(6`Z71RQ7`OY)_>V36bdy<
ze{7Zg$z!Cq4kqXNNaS)q6lzK9wf)H(Jz_n2B=SGKm+m=I1<EndmyVu7Ymw*%qLgz0
zU2$NgGkfWxqoUs&3uR72p-`yzgx+euvKOOJ3t2e@g+eV@-Hk#WzVbILMio-1W2nD6
zpk6zADqfFjk2<&ouPM|)w0{XTZ+h!!sPx&zqq6cY_0t2X@@dq3sgp;c7PM|#%IdlR
z^`6#$E^bvXKP>G&8miri+K*mEp-?Ck3boYKz2Y$RFsj|^x$LNG%ez<a*>mWbcB${0
zxz*3jsZFSMYhVh6LcQm8-{EQS<b|gp4TVB2NWFks*c!fQiRj<=uMd$67My;MTF4r`
zxSgsGqLW=_A(L=s2Y+gdj<0{@p!yo<$C1WXj9owW%J_;FeG>FA=#}wTCdOKH9q2i#
zKM+kW16?!u>arZ@@0UHdeDDZ#Iq10+oh`ayzj}Jb?v<I9t3j7FwGH%}mA{z^ran6L
z?WxyRX`oY9-2wXbYGL)d)qh3x=;}X4TGLB)?wUK-Jh|re=}Qi(k5GMm`qk-I*LJME
zX6+rIH`l(oZgAZfss3ku2DEPdC9%G^{%)%0*Z+RQ@P>^Wt_Ix`>)Czu3JQfnp-?Ck
z3WYkFVi=ZTN|RA(9)AdeAWInU5OEP?FZ5%Gh9C<NWr?98#~cY+ayavd(ZZ38(|P28
z%-7g)xHga(W3+*GkF)bdyT=A({%LoA^Ik-Lm!ysn_CYwDdR1WCKPN{J1VNBivd4fl
zf*=U8UykKFG6X@8!^PYW))IoO-Lzxfd@(bh@3a;(?Jg$-L4ObgIaJ!c{@5<|XX_q}
zcH8I(f*=TjENl+6f2iGd-{EpB_PHLZ4Tc~Hf-GLzG3Q@M<K<`@$Se}V1xmZmq%1XB
z?cpP}vD@8_=aY8N0S<?Qou5Du1VIo4K^70~URPfzw0kcrf*{CZrrrC%5ClOGWHHk2
zb$$dv-aEAW9e?P1iFU7VA;^*PZuW+?dre}0wA()^g3LGV9s`#G?bz#yEG^nS_94iz
z;85=wn-AKZ7fY3PpEY?m{^i?ke<8@Rpxx_;2!bGsnRegNh#WcZ_TC``K^8CVw!h!&
zw0lipzG(M*SY+`rgdhllAP9mW2!bHUg6CMR3z!Ikv_k#N?V-@_J$DOb@7+?O-TMs?
zWU<liHj5w#f*?ryIo9?@yZ3G^79<2g5ClOEnRbuc2(s8oAq$Fj->bNkY4`d&lQC&N
zlVE8Je=KO2>zEF}d)K_kq$uBFv{}5!*nrNw1ngk^IoZrOvv`c@qWqFE=VTY7P<{x{
zZ?KC|o4gqF1S2!Qf;8@eXA=GkekQ;F6~t*i*vzCUBz`39x!A#2hs`bYdpdI?lZ1Sd
zDNjPa?9FxvcRMWui?SKgzLVyWPRnF7e1^~{f1ij9^CS8ljsCvD&mbQ+L!P&Ca|=JB
z&oP;;%oN0D8a}Tyc@e(b;FrKl5MRPpDElX%?mPg$BkYKY!jxJd={6}Z(s*dI_%01&
zCa&anx6nFC@`=<XkFo>mXDd%Zoj4dIY-lJ<GJV_ThadXEdFIqROqTqDVRqj5@vF$c
z8-Fo$<LP^ZJ^#V%VSWuirWua@Z|462u2)#ClR*d*vzltaNCP-EF_T@h9)Ik;U8t?u
zaTw^tv7$K=-J|ZdEVbOykvnRg)6(5q|33&1aY&Pl!PdRG%_xu#2u>Vz!nq#Y6Y%?h
z2?R_YhJ=Y{;zSR63BimNa0nq70?sf2lLUL-CXAV}XI=~;la~R{!&I%R_4|E$@9&(w
zzkSX<ebk_PYVGw?YgK(~Re#m0RrL$!Vx!Et!2j|eS1-=K@fZC0cmJESRDAx?ch8jG
zczdqw#!0WvUodQi*l6d^ug{#>v|w->WzUTdSiiuz`SsafefLamtb?*&<T3ujpW8de
z^GS`d+vh`@7b9NJhbAv3m_8p$X1YiP_4jEHLxo8P^8CAJzi?(Y(tkN9!P&QeU%fd0
zGw%Zd!nxZRb^iWeg%y$;0sk}SPb5^3cH_gjR2v<FJb(Yi*<ZT&W0z{<qBQ2>k6%7f
z8?Rir_~A>jiOwjeF8;(NEQ^RCUi`?V!N07$_yjhw#+i#hc_{(Y5H3EM|M<kERqijp
z|I=shy?^!$(8d3N34bJXi_05S*aW~<3z(R463agNIV7rBG&3n-YQoJ-O^XOPpUW6G
z-UXW5v(4ob7|EHaFP=Sx>4l9n-d#NVD*SCXQQLU&?8h&IR){gKo88#Cb>q&J3>z)D
z^ZyK&O9^Gd#Rors`9#Kzw9a093RXh6Xf8etD;I-x@#2GzpnuG!MSSJ*iP%VOwbmD}
zLZeOe(T0ov{PGFRHY(>YJ_E}vWzhcOwbDWJ^Xs_w-UM~=#-$Ew6JwZLZCC}>thN*9
zE;Nh1y8^HoP8i9h5gC6j1=hCsf9dywi6#BUoGYO>)*PKy)VER_5xDOkg_SfWItQ!!
z#M%guXF|bRP7*2QmC2NXHIFx=6n-zp$cxVclLxjRe>r~*BoldUe+*G^vBjjKTsf+l
z+vi{%jE%5N*d%Hn)y3zb%uAzGyB_^lpf(n2#)~&`@w{{f`mgIe!?9Yg%V)}L+`wmV
zBgVoY#?L-^i32(%{l&Ad1385a8j8Pl8Km3CX4JKXZOvHf`U^;WBRwo-UA3mLV<YS2
znoN+ef9sgw#}N?=D{e2|Lh=M5b<hn}E6u+M*el>teeosS*M;(awq8T=bNtJAI7Yr)
z{`!gX*W2Z<DGwY>V=XtKr|}0L{i`>A{8B=leMF?TiHO{`&b`?TJ`KEKypFadXY;wV
zzXJ>5GOtP8gmp*UKZQ&kjQ~de1mL1zV~-bKe?bJJ4^qSL8a}aZ<2iWQ<GAR*;eP+s
z4}SiY4=$E1ee4(h9b8!r`*yteD$pQUEo9xfns29WVn{0&f{D#$+ipFnk%_R2H|+b`
zB}{Tv>cq*1hf6P=Y*63HF^7`IfLuA<^$dK<F!;r@H!i&cc_zkvB%*#KN`>VleWFm%
zfAM^lQ4f1j0lCR#q3lyXBmTxB2BD_I1`AxSqIDfT^GeR2xcQKN{nA>OXT28f6V4xx
zZP)6F2-h>&6JQ)^g1dP2d++?-VyaWOx1xIerfNOdjBr1IgWZ~5jy?f5q`BPnKJCOP
z0zLglz>^l33D&3k`*(n5Ah%cpYRrFnfAcRcq8D}FZsfCDb(I2VMdaC2w;ls0K3~(E
zI=X#uiIdVw0&BkuLL*F8O9g80T<IUjW6AsAS0Se#rJZL#1}h5uZVYHn?=^pa8<-9D
zBjb~F`^0X7(efsw^^1g~?i1Vgy>${){+#bE{rxCko&F3*YgJ3-SHJt^f4Z1*f63I<
zY@u%<pTbt-OoM(yomYT)wY4_f-)|E7xTjwv9IT_X^={f!WBT&iukf3VU8A*ed?(pB
ztd*|&QlI{AE&u8dL3!M02Qv%5wulP|F%vh|%^5<Rgi}YW_JjNye!MVTG_IA$?}Jq%
zP3C6bWYN?PGg2JRAaRtG^dD7Xe}3iHFQ3Fsa1xIHXKx{+g2*P3hsvMdK_S-Sm)Kb^
z-U2y(ubF}dZ#VJ5+!dp>qv?XyGA)n-8ASx*4B@l`L>ne}9V$zwp+YC6<<)MwtsBQl
zM6WdM!?tjk*Sf~3=qARgpQ@B@ZBySygsl+~w+Ao$KB804TeRzDH(z*`e;uDZ3Bd!&
zqg7|aeo;!Kg^r!#3zKXU7ZGNCE(81%(gg&bD0C}voEr!@NH;JWpwlK~%k!81@A{#C
z>VIoK^q5YCXr#G#_9O5&NF3TGizF)8#=vJpX2`s+?pVz{aDe?hFX!CtMBshSD`9yT
z5IW2ly?um}lErwV{4S$6e|9i?Jkah6+zaPhCFp#o%Puv5ybS??+!9vM*AjqLB0tDE
z8{NQBq~EX3#**t&0_)_7Wp<TB*zDAK9v9$LgAvQ%)!9&RJyW2q+6nrmy40>8zrZ06
zIFwwMl4hpcOY(Zruw^+BsSI3=%g;zx5O0+pDRie4>IpI-*mEi(lbyO8f7+{mXNkPa
zI9OrudYf=qvI|Z3u5NFH<F*$EkA50v#O;zRJH%@Hm7Oy_j8}F7H~^+>BFgCIXksnM
zh4@29^4UvVtEQK@GB4?_W#Iw5hl6ZRfziRcjkG5`)K07O@B(yvk=0(jmQD(;)lSB&
z_70___JR=E+8tRk0Bv}xe+<!wQrGkN%8&xVT#a0l4OoD3F<{}}S#`F$sKv&q<r@Nx
z)olo9)ByDszKt0Rmau4DZ-LQ*1?rEPw_u%m&)~T|DBgfm&J4Wqsc+Xq<O_eT9wJZw
z$>l!kb8p^OalG3;jFh0vwO>DOp%HXc(`=li1Z#~pm|4P~cu$~Ne?2I=YfypRxF_6D
zNO<*o`}l!JIf{6YcY?|$!>+NicLz_!?zm_4(FyMw46A%l_rT$vaj4g@LcLS`dim?g
znzxIf!H@DJumni2PQZr>905YDgTH$_$+wdEL;+=<eZKzL*7)K=othCi0=HCQt+v?!
zaxMsvl2&IGo`;<`f3?)TZ`Q^?x?j*FJB$w|beKw!CYcRk$Mrq&Hb{U7J31`uv!A`R
z0Vyf>QZkKj1WL}x<a1j=Jw?8DY2oy->(Vz&WJJW%+8|tSwe4M(^7KA`X=6n1)W)!8
zR?-qR=l~Pp&jK!Jw!<6C@6cs5s48gPeuA=}^A--c&wk<Ge=oZ7paD8szk_F6&_?Ll
zO|H|W=Dyx725uQWu;kqtxOt{qzUw&-oiU-p2Fdn?VzIH=lHrR974O4+HLJd;B|*qZ
zEiQvv&`DpVEhxV?<_YZ`*>6=cci=$AZfZeq&@E^gS<tGWMB6TcI<QHGL7lB7TmaGp
zRj=dJt_e=Ie-*cBD_G5#a_bD&?n?=e&m9!(I^?gC{p?}Q=)+2KpXoUv`S`omt-)}%
ziZd<G_EjV?7GugK0J9m=t7JDTFf16E=W2;bt5JG@Nu?HP00OYOF<d?WEV(*2FK`(k
zmt+)j4;jT~2E+^xZBEDz!KUjoC-Fi}@g<B@f$!9ge{l%|dlWu#v3Th%N53?koFDyO
z!vS@IKGfx%468_*?^DtVmhaBtc!=zCCT;Pp7m5!TCrL!s(@Tv2vRPgY2Xl?GF2&a0
zU>zfVdd}gyAUdFrb}Na#niAj9Y*aX40aGVHSW~F**>nq~qG3T8M2?7RxU#6*#cfO3
zyZJe*f4kP~g1VNnP16Wy)X&qXB%Rn^mDFr|jmkEYNVeC4CNx-$b|4h!-Lxa8Os|tu
z<{~2+^=Z+RU`^|hxqwuoM<&)AJjB*je;E6Yf~+aK?2ijNyKnHTv>g3$@&0|T9_h&e
zRBHCeH9l+1_}4eeU;QQ!W&OTiB*=pBRbTq`e;3#No@tah`o(p>XR;+9cd_cKq^l+0
zS+wLo0o4IMMRW1=2kG+$rA=Ra?*B+4y>(h%JpI>Dj&_`2Zn2FJViqJ4v1K3L`|1w<
zo_lo{;0vAH09Y@#zvUtl?%MFnW2zk+KHth!y63yfT$1lH9ltZpu$Q!9)H~8#Qtv-O
zfBQ(T5W7oUdR&^vMR6^8w-90(EO(^2;CikAM&AYcP1}DM#t$8aIAECI940f}R#Mk1
z4O^EJPfrG}#^q<ED_C!_A1QQK6zT{vAy~b|Ugrp<yV(8+UA7nQf11jjYmYY)vbmDT
zvXIol!$!s1S@1gVXF?r)KRdZFMUw}~e>IlL=bH<(@{_x6bUNgli=mWmE}XUb=0e*3
zG{}eW)Uh*8_G9T*<RQAZJy3+EPF{Kunx@fFo$XXcxdxGm<8C~Nyu9T!n>cS>W%q-P
z#0ZS9&^QoMfk*!v*VV~I*pU-soxZ5l>Bd5jRP<JqI+fvIN))h{_!zIIs-Wlze_SGs
zOp^&BrV%TgwpiRnOG(;>&vOqxdTv3}Vh|gM<lb5;03+1a1eDGR%wto-id%;~*)kr~
zgg&e!M?0_HO7dwPZ`%WXOC@6`jLMa~%IgQ*pL*gFfZ+>tfzRy(nA9O2s0kFgA~m%6
zj4#9UQoxpxhA$Ot+9+!W8Ls{3f08^r_fT<bktc?DP!mFihz9p+!*N@rP-u$H1&M}z
zQBy}u>xfb(%C1Iqs0(T#c-;tAE*8Bpy0p)zsF<Om*P9AQPo9y1_PhcbUanFgxO!>~
z0vnE(`(_YoyY@%9X&N$A`em4hbqz*6!ihg#{z;@wLeTfVgPz-}I9m+?e_N_VTMr<R
z6%$&#g$OwEGMJjvBti>{{C#kNcey&W^}O|^etq8f0Hi2N^=Cm#ncFhlbe>D{=-fj=
zu0fo3h6gg0NBTd~UtypQlu=-Fz)n)oE8~wC^a_OejR@y5ShSF_rtt~%jKy1F&{kh>
zo&$fWd1TmJuD|-r)x+*<e_sN1OK3REg1>nBZ<7m_wAx%e`|0{jJm1o%zu#P-_A-_V
z_1;@Y&pL8UruMdeXZ)i@Z&P4uXr;)6#sG9c!wf2R<M*CKj0#5<R>zX-QX<o;?JF@F
zujtaC0HmK8r3_x34F%UT1%__zwt}9n>v#a8`q2xl^N2&qbt!4)f4QTCSBu9jtBGi3
z;A&iYM!SOWl|54D?x@ofV?wOwROG2c+E<gTeKcbXis|$&rn&?jE!G@&uF&0E&G{IE
zW*OEB33%7f6Y}Jp-v~9hBH#E`{^*K)%eUIfh$C>*jw#2DADD?w5(|q?M}_a74Ujh=
zoT;Pvt*}T?5{-8UfA+Jk8ILF4(fY<OcFW#TH{!ZW`QpsuEWP42+LP~#(viG^xP-Qi
zzO1R$^_8lCK2Ppc1gh#dR7`Fzq}|pS!;Ww+koOFiNEZcRWn^-PDKL!>0%9#8cbL)x
zdsO8i2*d_HP=j2-x2=8Oxo^kL4Kr>X@+3z;s0n@8Qd~Jrf39G26rZVOMBG<J`>@&8
z5BwB(v`|3kG`%KQpmFFHlr+6k;2a(IsV$5L%hHXX7EYmY*ftgL2C6hoK<Su48aB6M
zqz0U?NcedO6G;pJJItU?p_LA(dn9EF<HEXAC{u5wyP#n4`NFrFj@mFV-@NqJ>=Qo-
zW7tK}y=DKyfB%z2yRAPr5$on27c?O$mMK{#ikANPX@^$w4Cxl82&N1cDZVeb&IPUf
zyR9J0(4iHuqi8putFy7>daeYo&eh%$+llhlbXa7t2=aZwbuMUTy0w7UibpI<$vCxg
ze82V;?_Se-B+=cGXhM)F(Qp%uvXPFDsAxGMHo>f<e`s;%A5TRqPySvhT2>vzM>{5q
z$8FC>!;wNxmzA(pbK<u?&V{Yo7EFC(C#Tc_U7mveX-N)LzIZ>WJ9F8yW>hclNMlk~
zq(>fHkam#1sMeY4UFB5~flg-aZK`(#!|xo5l0hX^2??TCTWI)JP4SA9iQIz=oigEA
zmaN)Ff3D!$*1qrDw`1pq8MhAkUhjGk6Z){Bch#1r^q#4s<U}=_RKl}pwnkA^@X1-D
z2moxV(!fAgC<tU_qcmhqq#2tu6)V{Cz!fk&if<I10#{9_l<@Gmhm2c?JSkrfYC`Ew
zGq78Y6wRGh3QKexEetILXs-n<O$m$lR#Kise+q{9^&~ntgNjruMu2uE;Y>%bvZwz7
zcE^Y+S-5!mTd->ftI$XDSkegNsHCf*HMd-7(fd*BHM_MbQPm+lXzCjSJZ-J@&Nb)E
zO4ngGi@O$#EaZm$ENHxB%>@9Gj43T$q-IzZr{SUGx|9HGDtgwrvm|W~JS;F{vgIYD
ze==}&)`8a(FiO$1oiA|A`qX_?{pb}|{CsjKxh^HmJhzwR)#7o>Y7$}@yy_RfAYKdb
z#CfF89nxnc$Uv~?sern$Yureni4@ab!4|HvY<ROhC+#oI?lo1b4%@>{cS*r(0kQ|I
z^gYp&Wbj8I|BmAlCMyT}AMc#w&e0k>e;Y!&f3I+;;=S~_!pRgbp8vgKsKXg1rZ=J;
z!~9qiRr<Z=?;FM)=DyKNQzG_FqR1mh+&E<bX|rp-6wSD|w7##oTV!CvUUTYaGiE+A
zt2Q5fspX9*V5-s<;O`g;rmuneVgv=0{j?Kk8}GzHlaIc*?y=gMOR`!Uv(c!)f8{XE
zC5~OSa}SQ4^mqtYy!cputrdLR+V`FNc5H4~aO;q7HTefJp`^R{U`B?R5`1f=mg-w8
zF{e-^@A?Jw$yQ%*gih)N2q=?FV4gU)%ZtMO)>ZRfb*ttntaokCaMOJ*$)j@*1+@-!
z;)e$`okwnX<c5J8oYIpR14qlve;aMG=^qqepyWcic=fwAzQC9NY5n_+U#Wk8@%=^d
z!U!>pD5T~C4EPPOGDvcqK?h{!=FQ?HgN};IH_|GK0wC6g_Q547Q^vH<9Gj=TeI${|
zF#F>RIC4vGUOqaTj)wBy8Zb*W@^fs4o9F98$#p3~hXdAgca%gvf_Pk^fBA@F%ox5p
z8%wU|O1#F$JG%>F9mJa+i302Lb(j%xE@`H_wWKUs8Z@scqg3Cp4@9U~cYy{TNp%lM
zH4<h@JKP+dX`YH7*MK7w=4zL)2qteqv~K|Rc@s!Zp?miY(1*OrF&{zpwAokG%h(4J
zc;ZppQ6Z0HZ?-{^A1V)|lOM<#Nao_R?1<h}lU?WNO}>lf2uph?JM7TU1^G^{5`cm`
z-yVPhhzUw}m<FI&A)wBwLlNYaZMo&{0#JChA`eNo2?Gzk`TaNlaFc+@8h^IvO8NIX
z&`AS^<)v$xq={Ftd{T|6yc#WcOa(Odi8K&~6BbS)kbgH_$O<a(#*cM!5vnG_k9GQ@
zQl}qFr^}BfY=d>lelZ`lf>CQ~TiezKm_lIWKnn#faTrPohiTv*N(={{Sq<`FVFIeH
zKxcpLAj5TtT#}KX9vURuS$~kO_b_MnVdVoSV^L$Ld@!wpy5i0nE~-|bY%6I~SWYG%
zkz6A2jszQNo??cTFS>9pQMm>6AS3I-1&=I23QYoasUVux38<YTSjOgt1-A})HUT`O
z2_<fb-naS(U-70mzen=!2qJ|>YApeu`_=3-fAP-WT69EFCo1{n?|%%>+8kV*>(Wg&
z?8U0J5+YPZLcoD7(+5W@v*Xw2@T0^BCTpn>!Nd7ND#Xl@%`^9uz$DGw%;YzkDhc#b
z$}U>PsbF_XJ%ARV3o>;CJzyHewbujSa6g=?JHC}@HhwKdAoaaf4`4wYIM`^=b<*ed
z{$Ig#JP$B19j=8NxPRx)^a3UPnmlDee26_yeePG^`CG4k@bj;LY`S3Y#SVh$!vWuJ
ze<%yk#(>K#vHE*fn#Rq-($OV!bvXEi9h?67x8FVg`7>mIMxsxkWwSiWM9-?rwTgzl
zVufSZSt?16u|rv{)%Hfdy_(eA>~*bt-0F3$g&Lfcxum!ttA7~iC1-&R`&ZQx!LGy9
zg9@&F9Liwhq+BZawzcm&_wCr+u;A7q-+5g>j0t_%P~65G>T8bTbG5wRTg9M2H&@BA
zHjzei1q2`_rGTPaF=$~rBx#lclJ-+u9FHrP@#(rriR3O^E5JTdn<k)k3}7ABl4??r
z>To89>jyEBB!7z=Lr=`Qgw-nfTOa9G&Z^|Q-K48tn2FJglHO+5<r?*m4k>%GQcrw@
z+N6w~kI>Gfj5!m}GPh<Ey4=JVloC#Yl3UlLOVW~gm%*B-xG%WQ1?j!C-cvwnm2fx^
zB`A9eW0T>lv$5oQt^_k+seL6;)nRPxP$;0}eX1|G&VL2XG`AJxg~H*=A~H5jj^bg}
zE5>~$=||$+1#u>%n34-OrsVFObAu)M^hoK!KokOP<0QFZ^H>qY(TA2Bmgi<MknHL5
zNlPo&;tL0Tj(l;<Ow)OQt(m4lWdovx2b*b{7og*qmp-d3zMP-gP0+bn2v;1P)8FLi
z?5w<jcz?tFAAbiKpYE<eZ^FH!cSE>O05YJ@tBbE7g3$-5;b*N)&xVH*D8LGh1bPb@
z$)<;X@76!RQ<J&A-B9hVOYhu1GVv%U+34?Wwn$opj@~!V7Rm2Ht4u}(Rh&s$3mGbE
zuE<=1H&r=@<4}fODbZJH3(D`U6k>gwDAK4db${d#Pd_77@+uk(^pi6eVqBrrmJ=IR
zIHx`=B^=m_nsesF(tAm*nBIpr6|`xZCZP6AAP>y#3SJ%B97_Lz%;m#M<dWKPLgevx
zVJ6b(ScRS;&ekBykX4*NlCu<I?u^taXE7{r$#YmsC=+7ofior2040&4m8`hupJg)d
zlz-M4EZuWK9zQoP_*L}zI{G0^2>E~wV$HQ9a!Rb1Ylj{+5^z(41M<^<#9@r3>;L|p
z%MkXxbm9)RYz*o1naP@KkZM(~*C;o+fb^8|A}>?Ki!W6dY1hxs&%8{Z{YqDm_?!&R
z@Xm{ot@+xe%S4kxJ<9&xXx(c;M(Whpf`8r|VWoHQG7vR{mF@+(^N(kSDxUoPxClI$
zO`=Gl;afKO>JNoqTVfpHw&{{Dx81*wO-Wbnx~a7Z@R>B9PW{?Y2KH-GmL_!Ab)VPW
z{`w*ppx;%wf<yn=&OeU|yb)uaTm=2FFIZD&C@OXOvGkZyO8ador5LZKs_io{aY3~5
z;yqU2nj|Tg<Qz)2&%ngfsxEBW4jGtCn}Nyn8JJ9yfr%Sd-0U=^)PtJPhn3{kW+%EC
zl27Y+xu=4mv{ciRQO-Gk+Z#Rfzp6KShWzr5d8G$CyoZgoMzBS3z~Xy;*oHy$N0ICq
z%BUDH(r8tU>B44XI_|*b%^gO(eftk<WZMru`qRs7?1YVh;e96~vq_Nr^!P-GR`G#h
z%h7><jj>}Le73w#gCH?)he;c{6DqJFM@glEZw5*-N0cOx!0D`i!f<P-VIs4)hUuCp
zlTb+t!kg*0>u0_>F-nNWLVhd(oNfM6NQ^Yl2t1u*a3@i>^<!fuwr$&)iEZ1qlYg9v
zZQHhO+qP}JdG2%X`=!5hcU4!N>RspTwSH^cz^Vcx*oHD~Y+(7X6vK06tP#7ogXFvD
z#6hJM*baOHCr8}b!3t?HZunz#L{!yhZu#S!R^{g#%5)j-%#V+{&TZRnUHAyYBntJy
zPuyZgh`=Lt#{ecFo17W*7W+1ErSGM%(&7jpBTBH0*5C~cWcjBig=F(nn&f60^lU$4
z8zvz@JMQ3Ez=Pap^=BED*fW4c!rgAqp6QY|>BUyS*lPkG{uQ@!mpWcnrxj&uYln}u
z2KZsu6INOJP1T=5Lk7xowc+Rta=su?$35<s4-3Lng8=euQ!0nK(8TUo<HnZ9b!FR9
zs6NpE1?v&9lnW3Kf~2wJGs$bav+tvl8}EYgDkDg4^}DxrUtXW}mA8ZA1o{)5y{<4I
zkoS_GPnPNMd|r1#<M9lVSz{lnI`s0U#sO`^uE@Bxd?{NwG!YMMr~Z&pZmaWl0Z#uQ
z0{;+PO#}LZjerxqn^KtidciWeACK6A+PVRka|U#sth#H7r|`qf-Z>vFYVA8lp0-O9
z*Z0XUP8)c)LQHF+aF4Bk=T-jaw{9IQNg{*;izyj<=)pBL?g_H*uhUSJxe<-TNq+BB
z2Dk=0O9is&gTt+IS01n>WK2ty?URNG^)%~QApq2E5kqZ#V-7mUlxHrg_$VH4MVm4=
zEl9cTk#XZSHTx~Ai^|$qC))#78uocXS?|<&3lhP0Qq12fdQW*PDQ#M*=)fxfxkTy>
zEu_VX%f>xA2E<wmx^_o#Ydn(8PLmXfP78<~?$$X_lPH-Qi`@iUUKW1I2Gzy?mJa|P
ze<SUP^T|E!6KJ|(-L=^@yJu*3r-JbNWulgI<4mtj8)*TF1h_b^^WSV=CQb<RvsPSs
zsjFrh>@dU2J|dUPKGhbd?4Lft&q+ihgbUjVf6583bvG8<!v^XhqTO2s{`h$|%b{l~
zgz;YU8RAnE2M&H9u=>N}Q}e?FnE`Mak_^?fz_~?i6&jnQjT@Z4Gs@iKF`2Z0QRt7P
zuZfX6n*OUpr3w*j9eZJu{dFCraCGbVPxyU`SIA0S`@ZSR8j3b}mD6DL<BM4R!S)f0
z{oys~YqO&3TF&uPRC5<neN0|UGTz(PxmAI=(2buT84vty9W`zgPg<3kFCzc~sWZ9m
ztu+C!hV-}QrvSe!KB;z|*#|}XgKu{#A94vI;Coo|`iXBxW*=Ks5f#BN%>Zt0N;Eh1
z^^K$ixhdDU>B<vZ+R;$=J*BO);&(XYk=w8l1iT)>{jvnkSX>gx!bZ&6G92m9BLc^E
zhZo2uCZrQ55itpzs$t++(a)Ajsh>6%;v-uY{${GM(ZHIm7qvx`t#<UZ!8pG9b028|
zOm~T2P!x#rac~~L;2j7)?PW0gjXe>1<D3?G;<%d9Pr-Mz>&;^RxLeW-Loe;I6Xi<i
zN2ofc)=92%gNOKFXvzcqLw_Rh%**xN@pS+2?bm%9$$bNnqcY_Eh7YiK!~GG><|GZE
z3zRL@o7Y{M?2No47izTnGqmx!4?;b$LbmE|+(I_s)`Ge<ZI)inejSKCj7z6iGJI}#
z&)e-HTEysm0+#r6Uk{OM7-$zm)mla~<uP+x5UX%8>7^f|FqxwqZpAV0A;lLNS4?@|
z9zWcptCQ9uj4W?;H2|^5x7*TpK&v%HATdSW%^fG7B|rr9Al#V6shHtupX69%W%?7A
z8_b<S(|Wnz7KelE-|IzFLOy-P4oqu<AAjm4J_gW<iA%*Zc!=m11=4UtDcT;{>shAT
zjdS!w7Wd5Hln#26C2$JBIf1V`Y4Y?mV%m-8D2`Fm^BGQU*#WXuU+)i7YM{s<;y%RK
z)R#f;p99ed*(v;=o{e+!->jqmKuY$%%a^;l1KZ8W$akt3dqAl6>dj}*+VfV2k)0&V
zrC1^vs{-v)62ZIOP6yK9QkQO`Fqxzbh}cw8h(h6Ivzv~Cz4sU^tr{kgskpOQY$rtL
z!~%->3eA6Olmf1AP$KEKF|$;5ZCd4FxN8@-e{+9vM=1DH5+r54QW`}ixq6-4!)yg6
zV@JA<JN81-AkTQ<4n58}xoXlo2u4(qeT_XEsf>K-H$6?J?+5S`>=^TRwoHJCc-p_N
z>RPPc0%WowhX7q}PpL<BhuwigFLw%sk|_kwL6C%CGytZtk3+HwsT(ewX9vY3Y-z4F
z##Hxyh58^*Tb9bCpG~qWS9Pe|I>5`vBvRv2yM^qynz20+xg~aj7yNVX5cwCX;9Y2I
zUJ8Kutx)p#GEEmN7f(<B&%Fr>f8kyunH)yth;pcn6y%z0-jd}OSa}@yKKYm~Z(${W
zf($p`9{_P2;HxqVR#7wJTTUT3=A5uXYoaOyB*+cTVpiJI`qsA=>(sTLy<4WD^?=X4
zwOLZ<8hn0B6>M}HY=HHQ8_5<tn}7;}Jq*8W40Wb#6(8WbeUF5PtC9Yi{Dt6RoWGD!
z-D80wN#Tsr{`l@$d7e+B*C6e=_1mg44bN4f6>yd4%5?{K*vvDBE&W?@=t($^Ft0E6
z(ME{_VZ>K#1qd6edA;4#GwPZc(o2onl4wiS))Au5_=JQg(wxvy&lZ(3Pjrf6*e*WU
zmZFuf+#2Lqd{cf8jvsbd&>owVAa~$@l|w!24R9`D8A%?XUpd&k{cOkJxRO<p;sEC9
zN>by-yB2p=WDQne-R=j>OFH>IV&|&}E?!2m0S}qKmT!IH-Hg<K+jG14vsQ21v>7of
zp&+vwg)6WTuD#=}+%U$Bq{$Ra_C3fv_Eo!HzV`HbOWh?x*$Ym*#F0(!JQ@bNYt3jH
zHIq$pYNPb4I9`h34kKxB-nusQb^+Pj8aWS&%i3Z6g7L)^y3+d3+STPPHv^D+8#32m
zi$2*~?m7*V^wVZJwzji>5sR<%*gtpj0gpq`^luos#?O=rEUI1yOYUK+Q<>vWjp6mn
z1m+je8qZQ;jpYKecmbDqww00VCH9R!`}ME83jPJ*=CepL-AQHEwk@j`20%dqtQ)<y
zYv+?wN+i+~R+pQ0JX-@7<YiFE@Z~Hr;qm2A=0~LD^|R=DFP{J!Qxy!e*~)N5rgFwg
zba1dc+UNWK*a_;?_*a}Z6zZW%3Qcqd-E+yu#Vthx_fY{m=@rQNE6g>E$faT~KL2$Q
zXcXJnik`orE_$rn08~_tfi<$)*ON2xNi%Q-&9lXRNmkUNXTQnXehnHM-KmeM{~EAg
z_g=f;u4voOe!(e3<qn&3P?C7-l`Pum-SdojPU~*o=%p*76iHmC{@8fgs`Ki2PP}UA
zg0!GcFs)`KvKO!IEr7B{DXAU0K0tagu~3@Kg|p;jRx*cq0X+K<EQ43G%(4L!N+PBJ
z^XxNT=6-KJ9~Gryku{(d5sm;YMaIS#0gI^)Xn}MphSi;nU@7aR8X6wO?X-eF|61|+
zJCc%-zQQs4k;DYITm;7E{c|Y5Sx1||8sKc|=}&<%2A1;L#YHU|hoT;gwISL`-!fZ~
z39#N6rUy{!0tjDVzY)*2tG^sR-z{}5s*1j>*JcZXq;oqIl*{=12D+0w6pXD<$SS5n
zxsL7zFFV4_>TU{9SR>OnqG)*Pk2v6xS=Nj08B&L`te8EmB+HHRZ^!2r{BTn9G>p*P
z{76qf-RR^Meu5`<7qx(i>NO#CkSS2Hc$x!5_PJkp05CmSLh49(nE%rmGL`ID2M<0-
zP!EQ>e97Gl4hX_qoSC*nn4pe>C@lx4Fxs)G>xeJ}XDmJ-hF&5SY~E1}<0)oJf0Nuz
zh|WY&_s2*=+F#5xW$RWu2PEHzUv4gyI0ns0KCPTNhM#7rS-FS`^Eafz2CrY46;Dzp
zkw*gv#}^1{0w((N+-DSw{k$ni{Wc-_<5eqkm|5Hh*DN7cv`m{+z+dnuq}EL<Sfm<{
z3qcJjd13|it%Bci<Ne6DVm&;=N@XN$>#~cj^H)uU+tqoiSL+&MGa#|GMbnYi=-%pz
zRF=`ND%aZBG@F8Lxg+ZAr>5cVm<P8hM+*U^1qD${WQFAxI~i^D31-`*$-(q((sYx0
z@mg(4H`bQhu2<`|j{QGfUaxH0cR{I>{-nLJ(@T`>^24=#TTN2hW~JK>Ux~GZ`hT!M
zEKq7(BG54j*Z%~MTZkGR&E?x_aTnRjUezJXCL=K`w2wjXI2tD@9yt`7E`FK_13-Y8
z0@VbCBQU^EqZq%S-Oxh9mW0{L_mT_zU+%C1%6jp~=cJ_VB;Tz+gJO<_`z?~CbmMp#
zLFBA=yu#qKjKp9NOhO(F-lLqn5hUea3DanMwOBbg9npuJgSG^gy_+a>_&kqIY$J57
zNZK`Q)iDeM%{c;t3#i#FvD^;P93p^pxv(JhEGn);kHtn?PM|#Y+7pCftuy#hEWf=-
zUNjDRG)pm7R~`~nXh+!3*@@xo!>}yi_TV}Zp{Vb7i@7KqZYmyg!vqTsgOi}<sHStd
ztDT7;H+s{VVGR&AH)lP<$sL%MfTTl?N0Mt|oBZ;prHFWVEUDQcr9E}>Ot8w_k6oBd
z0xNjWI<X<AnaW(`fS^>JcsDMuR*&bbz}E<#Y)HO1v}xHq@4_jKLNt?1_5T*7Rlm1V
zxJz*kZzzz@ic*KQ95ZZsG0eag)ueSbUT1>=kRu(oCY%a;=jRMk|6UX^nE@(|Cn*p5
z6-fN0)qktd)M|QNluj{2k@oJo;>(C<h(u|%FJhxS+snZ3)s-JI*=ZsiaCf7-Y-Og)
zsrw)n#lZYv;jAMMn_^&$b>8jWGV%NpiS|dv@wZa*16+1ny3s_+Z^1RyIc`YJ0#i;x
z0IafZ#%c<}y_O#FrjY>YK^hF#UUTja7dk~Ds`oTE3`nHF?Q5cVH!<7mb$LBn8y>-R
zjG=39mB5y(p-Rj!CQOy1VCHg^e*+VTh7L;~iLmM>j42N_9RBpr&qvnVa>6T~MVzsO
z^F3%NkMr7E!Z-XdE?Ci0zerwqYjAoG(ES6qZ55(^I3^CaKELW+v??~I;)2*fnk7|(
zjsFxjN+6r+0(x1m`6TiC&`LrgR<&=+s!*nSghxF0I^`HmRPAg4%1f0O-SQ>0e?5T$
zJ&R5o4q;4jnb-Gr^Q=O^B5f*CjMw7NRHYd6$$B))``Byww&tJmg_V?qvm&1aKy#kN
zb#1t9A7pl4BL3aH5(F11mzm_$8Xwm#XM8GDkDvD!!HTKg(m_RKM|S11S4|lSY*}fb
z3Ey%H*(qr7#rAEhj8Nt5R;S&t%qIR24lI+@ZB`fCk7$nbfQm0gcg<Eup6qo#326O?
zQfe+5W+9rvqc4it!F9Bh9>*mOU}N>u*+Q!O;wy^NjAvqLocC@%4x;Vmxd-p=+}Gqw
z0rt&>SiL}f4(fhA-PRcZDZM?goUlrt9$2MsKwFw@m4`YH8MD=xabZ&-6?W;=*Zd4G
zd~NcY#Yk%IZa*R6Hx)OdKSMxQs?23X;KB?k*B6Ffi#Bos5)^{-X{gTwaDIJG9^vJ8
z&YRKutnXNLuP1zCo-pUU3M?`>Vwk;MN^(S?LD_<ATH5C}uj5-NmB03wi`MZ^9H0yO
z6p$}yMBr}BxuZ>uJ<UmK*k46ZGuFC%!nI`}zd~3?!qO*LL}1f(sOY6>o;U_#wxOh)
z1}mYo8HaptQakZrucS8u_E%3NF(3oRnx;D@4ktE~2m9I7%;|g%kjNIG0MyKoK4Iq!
z!(S8oJX~9m{li;)H|>m-*M4^bj^?BM5`^)FwKmNAiqk|vaF1A&Mu4|j;&D7Y3huix
za)kudf!gr+8$%R+U{^CeLfa=1(Sok%UTEuty<Ou~^FaBu(bE^e&gdwKETbHt_Daw?
zv<*@Eb*D8mYRk36dq<z;rU(7Yh4*RuqqTM9;);w4CUVAptba+~t&jG7LrDBK)AyAK
zU5pr4hczc|Z<G;siM|^g^)ytEPAp7H_krjy<%I>9crq^o=v~5&|4E&wT0R1J;k2RB
z2OSGVwuOVBSTr1f_)Y;--RB}@_aW?whyC$kjq!0DAgr9KbvhOuA!n1;JLgEZ<Jamu
zR3^x|`LFxIQH;|+Q5p1Bw9lq|ZqB(&;t0IVz^YygXb7a}2=x@?NIVfFjivDrJlAL3
z0hnU#QGzeL%sPE{&Hca1Pb-A|UAQ}eqI<zN@n@$KAl(D2W2A;P$j%#DqxC~BpT3m!
ztgvA@r4}zBY}entEAPm^33kkscX_ZNSiaJ>*9x`z7=RuKxs~y%v4i7D-Q#hNws7$g
z1M7QBI%IUTgfWaHaFsz&V$HgIl>OH_^^0y3>5t)&NQ8Wd-Ck$14+4rJK`I~V4e`@o
z#?M3p!1^E~-gt^M!|@69QC)@E)_%$t1WL&D@-gG}mmq$9+lG;!THA6lw&*NTszp<`
zC$whZ+~;#vCk#PhZJn~-(Zi~GqWSWAf|2z^f*WuRP0U`%MvBD-E5W~%v@LKa@a4iD
z&CG3RE82ghk~ovxSdk3+CubEQ)#MC^E!)8NfI|xO9N5xoVpTb0U4);fb0%y&fh%S4
z7#vx5`)3ww=D@c>@}m!l8D;)N*x!oo@yL=c=-#pMHMuYLvi+W#<y_pLSEUk?qV^Mf
zJ*K$^L6IufMHuIn9V+)gxbU`TXj9mH@($Ha1~8ZlP4lxq7wyUTmp|Ln*R!KaAIp>g
zDhJCJAaoo+8z()p-@n=cH7s5%&N+;+`d2$HeS;gHW8$F`%&os;MNNNb(L%H?__V?$
zCP{Kuex}N+O!s(G&Y4?0?J)CZs(4>7A~LBu<-e3e_on>9&!$2x;imkd?4&B3{fxu+
z=55@7A~kd3lMV(ZN{ObKqXxIfxj!2Kvc0g2!TXNxi$_>x1M*zOH5A@iJ+sbx+iuUV
zds7W(RGkEWA{GAO38B)=Klu`MP#7#7jDf5gDS$<;gD2XLJg8Y|a7(z(HOZn(F!$4X
z@xsxMp_0%P%P{Gn(o8WCvM<fJ64}q;2a~AvmK3A64blKP<?^@uJk`5a(tt+5x`KeA
z!F+^d^cm`5k*E8tXn2@kqzO4@vr-M0qJt#3ves%u1j_G_7qQsH5ZH*ZSx*!fHG#A1
zvkEk`vZ+dECQOCp2lj=;4=VQWAB~umR_}@n{br_>m3T=nlj8GN(XH5RH1S~m@~8-K
zoFZGAMw~>HA&WAB?T8~>_|M2)HV*7B5NSm3m+%A>8FgOw?6g8mFWQ*GRAV6q!u(qk
zCsnE3nKENbNYu7N&>(E+P4@aN2|~&zU}kWgO;|3@mOp!8AUmgiVjx7Cm)tjLg0@7P
z=Mw=-4%NA=JE%PWCuSDRTGMMvh;{7xDGXFcfCG~uuKF*-Ev*73{X6J*#B}N-!24C>
zooyIsN!=J<#G>Y74C`JLL3oSnlu(xBcH%}c>N9gXUrpYPXP5xf?M(t$0<ef~lc@%k
zLEgQYZlFAww`|k=e<mWl`ST#e^;HfjW2Qbv6hpLO^;DQ(-=6iGK_W0bk~#0^bYTxx
z8#0`!Bx_N8lo0?9AZmrjIqAA^cJx^NzyCqnF~=M`qJ!~g<Pn0)o>RUh-Um6bG%mU6
zHHD0<Ib5_2?eml;WwAd;N+%Cf`-EY{m~BjK_c4zakvsm6asuCK%l@?4OxL;o%;zu4
z8PW3~?;^W>N5}V`QzgxyZ%?eYn3P`ZmS64KaUV;R29RNhE{e6xR$O|lSW`q*b^^#7
zjpbf|OIB&4N)k>AycLv~xBBLZBerfu7Gf+Awj(hil@_p&(ucsnpanVt55iSXCg!~r
zfh^|Md`VsTH@XK~eisJ*9^p0mz<MaRJqSpZyNgMrLx^A`d~KqFA8b}8q|2q+YPJkg
zreGBj0muYHI6~YFKpnUryL8YL?$_BNX%ml6(=}OU^{zSplwQU42!&|o+n#`w5#me!
zt%hmFpEl|GLmw!!6mtSz2Mfb@86}_oYvL}t=`8h{i3K?R3m!QP489!9S?<9+VUUK;
z-DH%LkUj7}gHe?IcwrkqIO*J;Q8eweHYaCMz~|hyDgy&A^ccShPm4Kl>#;@*1YIR`
zIojdCZ~9N1xXa9r6xUftOH^uR&SsTf8gH#25D>9T&Mm8kHrgIKq;iFuaS*O32Mt&h
z<>MtbPR4{S+7P)&vRA>RY-MY6rFCn6Hz}Kbs7EOBxbBa5w}RK<_#>u&1>i?GnWst8
zfVnHX3{5sr(}=&e(UG*6N|GdrF*xqKQ27TVs}>Qd8oIi_^n%`(%0{QghF~|z_Xw1y
z6K4EU(z?X!G!)z7jEUVQ(G_IU2!)*%jX}VhMlH!vk02OHmqw?y?N6oK5W&aHL-_I8
z3ECM=kQK=+tnb#ORDfxDI$-QwexF%10WkY1-M;-<Nwf203rC=G)@;QEx@?kYbf6Nr
zB&zi8=3rh)z5DXFz?H_L?d=pg-0Rr>EFR5^pjQtaVSbbqfM?1hh!5$?)&^EA8%@+;
zdu1iiB*Q?c{;r2D#^QQ-STtf@d4-;L!}v<%XO1wt`_k3*B@XUU)m*(MgR3V92fVhi
zab(F4i#AW`+WyI?Tt29-ZawSP`SPeEwe0+vj|SHq4my*u<+xFf|M5XB;0w;CZsQH7
zlQYV`TK_utmjm;@5H=&6TrZfVFc#A$iQrwYOiyLdk4h3W)^0tD%!xise4X3}vjr2u
zPi#y_4Ea!iM5R5c;PE-Q#S)Te7toq{A<0W0@p^ct`suN~^)v~w912M<0WI=KciJZ`
zhW^=l@t4wmX@UG)cs1Mu%(?NcPGh`3SY9+@lu>m|VRR7WX=#Ip2FekfQ;IklHisS@
zs8EeuAUGpAU7#Pe6gOId%LKy`a`xjwQQ~?orFV@LHNmgeTCj9DwSoiD06>J_!~)?n
zYr`E`+_)3Is!CcwQ>96T8YNUnj1GjMNav#Ji?SU=9-^0p)wu7ZQMeyxEw#u0Xd2Sx
z*T@*qXh}r@YPcSz5W>vdBb*}UVHtH%+)<#Ki{j4wYK~8NQ`F~(xZQE?CI59szjXd2
z``t-)HQOzQ5DO#YA70!I4rte_fnjZbR=^W674W6QJdf-r$A#!W3HrIIBbogbqJgc=
zHDj(C6t1dMYS`7Ojv`A*7}bm0cjK06IE)TC?xk6xWVXM(WXbOF0-WxAKFj!?RPb6K
zoU40qDmLoOgq!Ght#cefs|oP*If^@~>X4voX@-jFB<4YGi_voefX3pd(4^Km3)wn)
zxf`%l+~js<5M&vrwGGG6yPqWnBcuN2bo<wx_(ER#j{+Y}YTsf&;ia#UeCe{K?bgs@
zkDu7ypdoW!Ot=<Hw2d<GN*HW*Yy(tEM5to7#t-a7?dZX;#k2{%5o_Fhqa(W4q5fSE
zzYt?`(xLK-JoYRaFon~gL~az7-nH0Y>`q-9D$e;kx}BLdaNtz59DEfu0*G=C3VSLE
zc<C5LqcT=;X{4bBH^^6JRFpvNT$t6<4W#p?wq3g%Ah)h>P##BJxybufgD7*y6$@<p
zX?<AI*eFf9eqLiHqxZ1W_@=uZ8ohKDMe1t^(Z7l6bY#{CII<}_6!w@3sz+^*+_r-P
z3$nelDPOGgn|m9EkU!Y(@zlW)KeJ*UdengR@Wehm?sw`h1>XmfXij9Z;k|k*#;m-A
zZZ%VXd74q@*I|I8SlwI8h@@Cqh+bllWF&|-L<slE7q&%M*WVsnqGqwnZ7*n~!fdGn
z{W$h%)M)Giyjfru-?GoDfzTKp49<W5JDm}X4W7S+<u8Hfd(2Ks>4nmdUaH|{4v1XJ
zP^Zn*naDX7`~+$m;>r$n&eo)_YuaUY-DXOR%@q(igQpg*^Aqv`+wNP2v%KWEd}B-D
zxwpf4;hxj{2>b(4Jr(SKZtmxrmI4qJq=|XHoWXPe@Ms|FGHa1Hp)Mu#u_l2Vk}$ck
z(%A~uqv@^qi(*xX2aLwa{=35olgfX<Uo`y-lTyP~_o)Wi!(<b>@6;_d!s3l+8lB!{
zoi%B-p7B(jxM{Vt=B0+9Ww=btg~Mz>@J5yHt<!beYwQ5}0hI_8;CkcA^a5RXHpk>T
z;cUnZh=mTR>y45Wc9O?@(fg%cw5l+1w^6ph3lUFs&;PsdJcRYgBv)RhrvBytk?3o;
zxzEPXMrMZ{aP<gizqn#^?&kB;A9KrWAZvA_0&TsDjr>L2QQ7p{tkWJe+v`fT`|Yf~
zyWt;viSsbTdNuekcF(Gsup>l<r=HjpGw(@0pvmX25EkR_V>!=B;2HtX%3U6S`P2UQ
z#`oh8B7Ghgyz{Zr^fTYH#r<(3=ResDwRqXSKOi4F`P+8g-5Z`M?JFYR63s{+jf`23
zy;|BcOje9ttV<DXxm_+{$bQGJ&5$jP$k3IrlQ%=8e6&Wzp_!b~)`^2fr_}3(m1t>?
z09!*QjY}d~5VIciZf2jMT}qS1KN1r7{XZ}p;&>fcITgh1T33)&x&N&7&YsEko|zgS
z1b;P8meC{TEw|1mM=USj%Sm?U8zO(p2kAE=ngqduXfygG1X?;O7bLsCVih3cA9ArS
z;2HrHQ|Gn*Ynq-28NTsyWaUUTfxVOvF!1aacc3cTmzFhiu6uD9x_PPod*VO}a5$}E
zjA+Ip+F^>O=$lTUb&}uKz5MZs`vjci_Lj4J{{?j&AtQQ`K5HF(Q~%th3{hb`Q~LaG
zx{L@!_V$Y^G8le#&?S3vgAo#3KKANT&oh^5t-!NI%hx$LuLyz07w1fFHr#0xP#nyK
zqJa^-@Br0`(t<>b{CV!`%B0&H^nu|c8KhREbxpWx$So2jQN4;W4W8iv%q8j9N@d33
zsYutO3i`s`{6x8^dzvXwVzZ9VSn$VuRPL0cpQXxL?o3`Lngp+pg^vgR6u(b_mn1Bn
z7$}1;$}p6;faJVY)Da8{BZlA_Ff;53rsh?R-_ctFL%nfM|0}yLrTt>)C-5+pfRY6y
z_@AD|#Y>_MWh3z2*3X#kF3Yx<4;yX(5gK+_NrimM?OfQEY<RS&;PM=&5IqDToi)x!
zE-Kv8wt+{?_wLRG<eFh~+I;@CV2-*@_rK-3BNBg!N1k$`adsDIswcT4z^e0P;?*wK
zmEidkyp{Gwz_1^pyw;VUd0Y`wUEd@<>GIpc=~e}?$~OnCUKN((8U4SRv!qH4HfpNJ
za{f_bpsvO<G|MF^K38D&7D)>~grH_CAOCXnGz(E*>~)C<^XY1Ixc*r>a=x%$vLux#
zBJSI8ZQSU@1F)mr{?`5n0Fh*U2F9*weTFa6cd4yv?|+b`+57L&u7g?3SYMTcO(coJ
z&y1nWh$onB-&Su=-Qy6(14uEnpH#*gVt(J0@PD<UUC_O#X;k!6neczxR^Qg|>wn#b
zb~;SS>4X~wn?h`AwK+}@<2x$t3Xh0)a>~D!$u9k385-tDNFhf6B*@m^VQ6X4u6jq`
zA-w2~QKjP@HYaGmMAA=8^n!9^EPI(mLB(iZ&bM2(CjEGw!ZXr9|9&I{_FKRSJ&dj@
zNKEGXHWr6~GkjQV^Y{c1n>H+aWP_n3#`j4~Wdhf^7hI(Ekj!3BYW)2amAX~7eb=B*
zAEgx&eM#&;LiWG~tm<5aFtpdFzWOcTdp%VD@Z5!~!(K)EHjw3;S!LYDGpHx&Ggl{`
zcb>FT>&WD=0Alozjlb<5h@*pk$Lu~K#hpzG7>^cFGPXR4-|ux90t<retBcMR+2cCL
z`Ixc0B<7@0-`rms0>K!@i5{@sDJUC~@4X#h&o>cI+KL2#i7~K2rB9K$F}SrPozE@q
z?&s3%-vC4NqfAV7y{UWCDMP+wXVr4ei`?QIr4%uQ;^Ktncw%ol?zA9yZ(SFb4&QIC
zEp9NavaRv2q0w24>R)A{1+r0O`tnY$jXu%w`Lk9C+!=WlRG;Bs=Ct0UE{qtSMmz0P
z2-8K;u84#22)8hR`ZXptH}1x&SyOYE5~p+4gO{`tphzd@cdbUVF>|v>#6->(5C2&x
zlG>=FZo{ddEum#28m6>QG?QE>TIo(|BeIKFi0S`oc(gG>g%K<5k_}dxz*>wW0;7cG
znp((e#jLP*4hQmg3dTH4UaVEte;bo>GB0C6%H{Ri06WNOMwUeb;V9xsk@;y%k?@Q7
zXL^c7evUa-sfa@f=9N`!?V9NoLsoUoUKTLv$6Ox*N3Bu#2vWr1adC_?xD=GX4OB4X
zCUkwoLrv%F7IehTC#XC$mujhN5mKSJms<aRsa=7C-r<o0tYQ_f4*oJuAIng9lL(&(
z%nrU90!mp&p6q-!7&=b~>kij~?b4Jbr?JcHk<7ZM*u{=|ect(e_SCQr8OE-}aj5e{
z4m;WhYIz2+y_=Agm)b>)L`o#Gr{$$su-8x8T7eKo_SR?6Nxj`l=8_YzHU;8vI0f$y
z2EzQA)DGi{vIn^CKcy_pRwWmhl>;y2N2#={04MP0uM#YF11FS2umh1_E>Q;63<V`g
zBLVuITr7pxaR(9^05rdt!zS<v+#hj*wb>+)%Zbu*b(}YVO_tQ-q=2)>CJ_bkr|l-H
zt8~`0t5r7x|5t8!j@YkAMkXC2@z5!XkeajUA%HA)bJMC)sJy0L;=x#9qSY?K?ts}E
zunuzJPxgn(8W^=Sps<I$U&&lLT+?IP5;tL+g`XJoAnEjaj#iL`ta%j58Hyaj>y`X=
zmw1vti6uF1qH%IIS+atXUU;Z3L5250dCmWWJ5B8VmNLHD)A2@pzfG|^Poew-2IN;s
zK*Kw#TzdvK2YNx`P7{h^g-d2Yxp?UafS*)VuFYIR;FQD9UCl=I$G&-VF^Z^9gs+k(
zF$rBw{s$L8p8q{X6_=+fQ%-@VL~>@n0-FpZl^v{{geQZdR<l}_AT~_f0x5np;2%(Q
zhC@>IMbpB?K5d7alfVG;W4bY52Ho=uVJl7u5*?;%Mc;miadM1L&$_%VyfrrlWUD-)
z%8AHXslFT?gg!iMKt=laR@<HR6{EzwEF&6jtQ8#WWF!5IC)N32oRbcy8%GjGLbyqM
z@eg>JwBnvcAKz=2BS%vVxR}}<+X_&z+&nX5O(qWl2J<eGW?TN?OjfBY@;pacFrJ6U
zq%G)&nrl}KvJporkBCbjgZy0rxR5sX*X9RB$K?8_GDd8%djZN?EBRZ}@}$5PsUJbI
zg`1hC%fx{bp`xChVDMC-?{2{F_D`yt$KYXya@ZsxjEN21?Kse3D%^e!cfZ#>adl2W
z$4jhaVHqEy#AMk*-|z%`;Sw?}X_57&EF!jww!Ki7=IuO*Y$YY;JH66wJi;Rspm78v
zFjoW06k4nk1{-t2DqtCQf7)b%x<jbIP3Rusq>jI|lBsDETlWB@oRV1IG!3})Ck}N2
z)dZM#O8tE9@7zJn;QUC772o1g5-i&Wj#nFh0C*3w%8q&j+xFA-QA^?GFgW&GKYg_(
z9(-kHd_BEHr%`uMm`Sf+kUj64Xu;tW3u2+`7lJ67hTZa8(F_T@mm)l-o3>LD6dJA&
zHzG59-vGpm1M29$)3CM<yI(TUZcp?ER^v5sHU2}>M)TO9aH~;!{Kg{*@I*ZD6DDBB
zM?BBMy`Q=jm&5G=q&@clq;g{D9DIAJEl+ajOG$US<0KAnm<i)l*d$$Elu+6AeSq*)
zmI0hu{9X2dU+YM~aHs0S%MCde-u(TEG#Kr<P!g-rkKQOw51%8~AN$Xou0pO%S^k^D
zi(WrlXN)(!hB0WDVd;kY2*S--_X&W;TI<7fIFE<lZ#Dku<HctT(&#nj+Tp9RXg<Wf
zWul1CmE2s?1FL*M3%)MY)-vv1mw2e<rzMp5#&jVbTdk=oxqGjgdPmT$_X|Ho_7C^C
z>Q4r$ys)4itQM90jq<E=u2?4O%F)D1;~#t2t6nf0LE)4PH*A=Z14Sx|?FN91z$H#E
z6B|2Ci}MJ1_;P=m9Fr^O3&wMdr(|OA-g+5Bv>a-#rd3VS4X%$&oqN*lv|XkS<?iY+
z-rd{*W7=SNt$J(9#J%w)Mn$<OxbbI=wP2NK_R4PV<Y_E19;ZPtu@cPLg62S>!m#9!
zaicJOv5fSOQ!I!PLs20Yy9B`ge&BKS2lLmt%X<DQry}=a=<Fy9%>szDW~$MdbwoFV
zn@WB2*FS1;^g&BZta*>eJuX>E@=<Iwl#wDM=GBA5mNMYjm@otgp1e_&AmWMxgs28e
zKilfCJ4+m`rafOc4;lAJ(27JN<_lP_|FD%d=XLgUbWLvXci8{j7XeeVziGm2E1mZj
zE#lHTiW_v;*zu782gvC+=6AUKM(62%wpD~*<ff9Notx_1V!a{pJfy%jVm`N#-?w+4
z-CdqcrSNU3(Fq5CR1w%3<1T>U`*A<@+$+Pzwttf%-Qkihu@KVN&{1w*X3|T9{#{n)
z<QuzBzZK6y5Do7>umdc<9lK>0tHqE7BcU^WUd}`8L`ajBkiX~wyEI>M>U8Qv!d9zd
z0;gy@wd?L&j(Rd;n|FDh^Lc02kc-QnBXx1NO+~r7xb-gbDfj8c(kYc19ABR({C>ej
z_GBgJ<D7b`)+Y+kyoWdcK6`%Z)X8HsD3O_@p0V$}zi`G~nFr9wL&z0}?$^<vTDRe;
zg}MsB#_?Wz?L%IBp}*+&vddbl9)+%&5s?arGfznMl;_`zrrkon8mdd-W2ziP`&O}U
zZrz0*v0_8<ro3$QP`+IZ-;lu`;9<^7azGA>1Y)cGF|SB`HLuzWjju0s-{Pj@(jppM
ziKi{@c>ng^Z3Hxb-vmT|JrI3YEPNOZY$Ij0!9zA*$;Th9GXmRK5FEnzq*G=D=ga+!
zw7tvt4<`<mRVhJ6=605q>j<22W1u;9r-SqNJ76Dzia$-@EfRkr<=3@W^B3)x&!=XW
z%J<jaw)K44a&sd)x|KQ6iF4`VDERsj>UNAv6o}nq7vQ;_`FE-!uPVYo!ZK!_+WG4t
zzc49^5aRK|>X=10He1@9OMNjn+2xc>J=jvkj@D0d!LQM%mU05LkuaANxZeh<ro3L0
zc9|<^9Q3deif9orCAGhT4{6O@dMWVCYv|yINV9(hAwgCUh1;*ZC$jS5fk&bJYR9js
zN<KD6O#|#)%dC%g<7Mf1;}+!uz4OlV_PbRr0c)U7`=Hptt57cTrhln?-ZMW=Uu!{}
zvcbk#&*tDF;$72JoUeR*G)kTWrz>+tnL2YtrAunsdyQttLqE{mJvN}L2N>Cc`Zn6j
ze}$8wNnoQFA|f><tC~G5J*c6VL=LZ9(e)71bpj&e?!{N027+{$dftwpvOI?6*ky@!
z9*dAMc(N-AyBU?!P@qdui%t8I&*2JLl;E}Ql~_@I<4#+W7f!=92tNO?_ueFyR^=3H
zjH%mXz$ApPxUQYP*!~S+7JT3<W65h)YL)fB(Mh!_y`RR!waNHV>L_#c9nT}=!x?ld
zy8#D|6wnhcvCfh~67#gERF;P<8pgQ}S9EkEsht?7Fn0wKz|w6EMWmFS$E1>&9b?fQ
z84Gc_bN0dJTI)Fr`5UARo~gzERWDYxMKlzA?$Y<&<{=9_H;tVn=+cZ^ub1qyt3Mo)
zV_ZW^V?0>$IG;R14h`Zlr(Mhieo9eT_^nQ~I9S=9Q1W1-Ra17T;niM)(`aK+71tIH
zcHOR{_|tgoivx`7IgI0<_}U*Jk79S?3yHpETdoglhf(04@y(ePMN1at49c4xHAXwI
z+=tn3ikfj^g#X$xs*p4o@S15T@)G^ZV}T-Ez~e0!h$F9(M0mx?NXqd57Nx??{<^5{
z0l5IhRWmdZPMxINU`U1<q5IWck`lNX#CMh6uDRiNY^JS(m9&aa5$vKaW!C-43fsj~
zL*65BJF_ONz7UCiKOuOUqOmV!Vaiw4*B#TokfmknNXkO*PXBYx&BFTTEeowd1ZP~;
z&j&Q-t#nDwP%hRJq;eAgCnafNly*srwMeHE+ZLwejg&^x3Z8bA=kwf)i9OZTqghJF
ztOphzZxTVYfj}BGEB;<mj_<&=D;f&Jz6Zf7Smv+CnZq~_4b~(O%+8;L;Cfe<VaF%7
z6fwIPo!N82{Pns3>u+-Gc4h4E=ksKp1lH|SxEKfl{iXEHKC60wZv7xHh^n<aw2QEx
zQq8-Dwi}_c;|A44ks5*xL|w|f|1uaA<^&xB%o!_uUW^f;-_KwCa%M%-nnf-6IDbto
z--Zh{--<#41*P6(-fIbxJ~|oDK*J)Y&NP%4YZk0rmGTsK{G&?>MvTtMj^1aCEpdxV
z-NER{_7r?Ik0k>p&8xtiaC4=F9;)?9-XW<R_tG%p*|vm@rt*U;RQoE%Ox#GGtd4xX
z1EROw@882e?s6Ifz!mYTkzK+F>&cSLqd*SeUaT^+lC>bnay`q{HKn^8YJ1ZbZ6ofv
z8Y1TZaeNk#F{Y)9UuKML96smHQQ0ZuxTK1E$aGD8)++<FKB50Wm6#cy46HnK!IO8&
zdi{kApJ2Z?=Qb_ns28@fv*yj=aMsP!Ha0fp%^DSWy*grpDh=SPG=15P0M0X>#=x-3
zH6nd^OxrO6zZB8qDDlz6lu5&=%rwQ62*~sI$1QP8*80WwS;b14^_*mFlv_l?upmQB
za5f{RmP1U;sUQDB{OXg3qNe>&(go$2YZqr-SX)u4JV*kaKFoOs98wX__>BS>8HdS-
zA3->hD{1`m*CN(4=XUH@SWu@^4I31&e{K_5j?)xDbSAdR2G;>)!^wXr5!~5;1K4-W
zyy?X|mxfsxYVqAB<=;-WP^73}1fwELo(hUgCG{$U;B;|(32SXA5}hv63`+<$^D0ms
zH?7XWmd}NO!^a3PF1UA2pWlEQlLR#)N>vQ*j3Z*)PSXbCam+BCg7(4OU_xEw>DxO=
zzbNBwKiY6Dn#{dV5i;FZEg%9eGmSJHP<3JBn4{Qr%rxWE6uk;-uY2bFIBe4zr%YJ4
zorR{Hg<UD08v-(+g6IOu>%5C3Dq8&?9~fyi2o`YLW1rbS@WvDFhI{~iQ6j9{TB)^8
z+=8ukRgd`L-Sk0`+&Wr|la7Sj!w=an6R`lm_^)9=QMuvHTo8fcfJ6v5J<7<W`NiP|
z2l+8UYW-#ASAG*I`V$-EZFEsL=*Wohmi~kqS>TrG)K2ZrO?bed_j`O+8PP;rr)$&z
zYwcED@}c~{x+VeuPjCv|bt_QM12wb@nAo_G9;^;Ch66~*kCICPk2L3>jSK^)mFc|m
zh~jiWS5rSgey)s5z!Jb5GdPddVNxSwfp%~>l7G-R=EmT)SZy6(Mk#pvY5%FJ^=;n^
z8O9?Ez5s3f1C?CHKXF>_I_g>&viEKG3{8Q$sXo5;hUNpHW8&d@w6g|#bFK_;`jLaJ
zAs#EQPRZFy=0OUM^YaBis~md9N|q0)A`V#`76*#X3TlvK$v``yQXcAUwIN;-3?AN7
z!rl?>k(*Xz$T7jWi_}+9WKNt(_!o(vs*}63D$KB?rwJfH#+$c3lEdkwTC9oink%=j
ztb(80h@5|z|EuDAhzDdyhMZUDg>Lt(>5?`>cE3ZQ07qb2g)V0OBcx-?sIpu*?mqNt
z>%=DCpI#<Gj=gDn!AbOe)40D<?W6jB8RKNy3g#P?mX&=gN&1<>z16^YCpt4epMiCy
z7sgTL51)UTDu9==j@rT1FlzNGcXX#uR;TbXI0-;@|IjYcp-U~zbEe*SP{z5Z>9pO6
zOX!&;Uy0>W+R2#iN^qP0Ib2E*4}%`yI09KzWdUS3$t5fyET3C_ho>i*ec;~)K!4!!
zf{Hp0Ov+PBiMd?(A_1PbvapSkDP97yfl6g%sgJ1jJK8#5Q!qG@cr9^2=2j8yxc<cQ
zGGP2+OV5Z9`AnPgLyQh6W&$qujzDFlmei2u2l>Y84<WCgpF*1c+^bom3R@2rGu}C?
z0Ieq1d&o2A){Q}kpW}tP+&n=&n*6Dp|3SoE6K*VSTZ~zuYvFVr!*zdEgSW8r%pD_~
zG9wugtlTU0Xcr)#pI}8XrW~&CM`5b~X4Bn)DlN=1b!>|`HV{>9kHG&$o?mC4Pxe-i
zE2{{8W|iC6gE`Psh?h+{2fFWv&QYKY1P!AN16$_Dvt;I~b5^C{(@qy3242z;Qd*2H
zkdlBms3$s!<;ObxSn@Dv;xw_lf9Jlg+5XMoM!=0fW{R==dmf^JG6JfU<je^KaNNB7
zatrTPLw33>=ST6e{vB@j3|T8?k2Z;?d+7}~Jf~{mo!rZl8o+mIh*A3?P?P?jYh;MY
zz#aMLKTDP@`f0DJcH)j98a_00o;r*&i5<p|k8tQq@BsP1FIT#s93Ui8FCr)NgD_r!
zIG1VC{_}DcErvqwE{8lM-&4S<1C&uSWzF*{hMWY8`Ex7e@R~PP&mavF^)eAC1E!h8
zJxDUJgSZIcvz%N7v!3S&X!?9e;uTk&pQFU{t}EGF6;+X<?i*F=yV;(W0vg2ldf@<b
z_%cy4#ZspOqQr74;|z`VYbtsX%m433_#0#j_9Gyg$%Nuo00dk@n^K1DsCm+;Aw}5i
zuQmj~4`<JSpK3*-7_Jvf2(#aPkXa89O$MW6zn`{po&w8k^B1aY#m{9CpkW%Urn_i=
zqZAik(#@x_cGw~(#+&P+$Z4=0LiHxOL0B_(H-j&?3gl<iRTI?2;w3F}OtM2lr^D%H
zMv^W&l162~0$h^8)I;oZg>!wW-qk{YO{vU^T04EwU_z+FPwK+|8i{V$|3Isafmhmi
zp^hGVQeuohZ?*wT@>b>WnIk^x8xF+#zz1MGUXwoT9$lDA=!Z$a>Rp=ie8&XdcpAvm
z`~3CsPd&@Zwy}}Om+4SSG>4GX7+?szBCRdBb<)5Ctdu(^ui}VVk}nmoc0rw*S#P~>
zJa2yn@IU@14Gc507PNX(<S3{$lYj|*>~(-d=En{cO5UUpGq#kEnnCUpr9u!(m#bvq
zV<Zu4tiM$<YjvmGqRqRAH0hAD$Lm1Q-&!$5gmFb0MN_BS?*7Ca8L}(8M+q07z<xs|
z)n7$X2fb0vBh51XKA}Z5TBQu0<4?sKKyzkzm$_8ea_r{dJw~cj{=<<a>q7ve0gENO
zK>!m2(<Ns>0AmAe%NG>9J!QMv^g))J&x5EboCETVP~0KlmMD)vbOILG=;f~3=yDm-
zUBH8^(val1Wc2Wo){P51GE$N8`u^Z??!<!5g}bkJ$P*D)ai}n<!wMTrmG|TAPpaGT
z-yfHGye)2Ppq!`L_rB6ibvyfpCLvsStf_7mxol&J1<wFdNib+&TgeltQJmcHG0T4Y
zyhp!CsI*Ud&}-6&#pzEzE4cecUwTsN_<BC-NQgI6DN;(8+F}*84Vv_H?u6emSnjd_
zJNY=jUnf6>aT~&=ZNHSAnH0g323T$_{yGVuvsIsil{uFfLDLot8_Ij%rp&O={42uc
zbAx>Ju15!8Sd7yV4u^@X1ck-`QrP?bGc5+@YTE%tVm2zdPsSnC`Bd8TwAUgkxD?ix
zJ&#fz#}Ay*LZfHHm9|EUmo0_$pQBoG2qP*Ip_kR#G_r?ip~NX}q8IZ1u;f)|MOL%5
z_?bv!x#~`xM=MFS&J|&`4qktf7&|42bmflJJQpya(GkSm%0^Z0JjT?-O^(^)AXGFf
z<v4Ujqb#mWU(swcp9-70B^>U@lCSj#gEt0S;H}d%x{^$%x>#Pb!SZ@mzHi5sPfMr`
zc6-dU=jenP-c34ZDe5`W{Z|W<^T4%#Lo>>1@Xg50;;NcIrEtSKIF?kR5|>gDW~48Y
zK_xh#8rsT)5fSD}j4fMMD3^;gB7Bs?<%%d8)@K6zI@z`DOSx0$^oX1qQ10$`1GK&=
z(3Zi3sM`6Ig59^t{OCbjWH4B3T&7vRoJs#v4y(C`I1(NI#n~%E^q8@q$>|bY87DLU
zqCugVliY(#_+MWV9$#Z@-cMyc67CbM<ZTOW&c34!9P>P2jx$}HyC1SQMY*w~mLgO$
zPB?z_W3P}{+MPkqN2!Uepe=i|))XIln6%u<{m2M}A>lp3NVbOt{tIBAbyX@;+SUnm
zFJz5wuoNru4I@s4Im1G0snDkzwH)D1V11|y3TMn!u`4pq^j+ihTb<cq$F;z{%XB~R
zn>dLj$8$GGA}1kLJeEvGFC-{YE7?S6b=HtxnAfEHRd@;{AGf_}FTNblQb_KzEI<kr
zFUTks1)Z@Q$6S#_VFS=#_Zts{lG+{h4u|Y1GXKfa;qm)fSGAucsN<PYL~|ip;XneH
zU!DrX6Dwq7i79`Zl=i55I((EAREN3i@KM!j|F$Ny^w8dM>&;i`j@0^`F&)5|M>?E?
zElfcl{Ez|un&Dp4zYq<CoGflUsbDOJzPR7i$eaU4!$5+e$CVWB>YoJ;hHI9YT$1i>
z7x}lPo1A0o-Wu4RZP}hmme`!bN7f@SDhBv;vt-aqHAELzuw3_7QS{e|;#q$aa77=!
z25Pf=IF+tojs1z-+c1y+bZ<(Agasx7?ntJB1;*D69G6I{u_cDC02>2|?sYN4C4=+S
z`2LXb9-je|<TKzg7WrjbUG&3eOncOG!d^2OFw^!xzutKT(|6Yz^qBDYK%x!EvD<!a
zAbDc4%Us+78E(!zaP4hx*c`PHU;IrjfdwW3$Sc@L+JM+?c@SH1wnxl1sO#;Gd8hxq
z!m~v>tjIuOgW*3sdbg$stJuBKJPs_GEgOYTL+UXL(8^`ZxlpRgIiPlDH0}wH=z)Dr
zp1N&~IsE<}_kGu0)%kwKBsKKSreOQWu?Gzlm(DJRG$ZUbnN=t|()SSq2b-ML4qVEe
zEC~k;54@JF4)^mds~!!8!5rQCGOI*YqCzpC`vO9@&xe+hPtzL>gzGN^43pg2K)qp|
zL*G8A9AJE_GgZ=G@Unku)mc$ZMc$Q2d^{ob5q+E^kd!1l!>7G&dJo?L-p9mRHuEu+
zGG(i?bEwhtGWIeG9I)$-l{%MMJM|MB{9tLM`o=3P(i*COd^y5*^&WCHH8-bFPy-Bf
zUdegiH)#i*TLJjo=Sn3cHFy&v8~$yHPw|Sr{q8;E0(`JSK>{p_&q(}^`^}(Q#a4Ua
zPO40@TqKe^l{A9ec?{Fxn$l1=XG}7EMb$04d#S5Csn4M>qb3(3@Lf8s4~DIeAIfTh
zB#kYb-PjP2oP+<970fv2o4?F@`L@-u=0YUYC<9x6d}kTN4$&@dP_fDk{D_u4tA5_M
zouvY{juu&O8aD&ILeF#|9669`>{`hZZW&2-kif6g!Yg%HZj%qg+uOKEq~mpaZ4i?k
z>8SC<Gs<R2U2HwR&8)J|f|ia%JN6};-o5UVgr@^=4?7|1Qp8Qyh(s==CPq}*CvzC2
zO=zhIvufs#k7GBKpQCD@Q3^+zH0cWe>p^72KwI6(G0&zlRUgc9cd(XCXnG=(7gEiP
zqqG8VdBwfAeR{`2-21;0pKmn7Ph=fT2gNTMCuXN$sM_*+ysjy`)D^arB+|%!*rZs1
z-i?LUR+tH;*c->`PIQA>B3gW5_OD}3l*$4!(OUa}2|mYMhX?JL5O53Fb*+*D?@Q)n
z*$jd77QQdM1slhFJ-aYi)HL=Ab|?z+U%*GziZ8>Vk`!n%JVNo67H#t9Eoj1T(i|Ii
zL!Ejbgn;H?_Pzrnl<ekq+<-liN@FWP5G~NsaKGwWF`jgoP`Ln{s&TkfP3e6w;*e&A
z5z2~Bcw-$*>WpP-fDIGPlzq!6RByUdd@Nj;sN!7#Skei93;oBX@v~H`d3~E^LOCY0
zW_@<{(yx9s{Du>eG->Kzj9Ld_$ERU!I^>-c41<H_mU7TfxxrZ8;-$0y!0pZeq~d~S
z7eH4e+J@%b4|z^2OXF&w*-E9G$~*TMe-nt>*qvEvqw?EmOeqCB&kw?t1O@TT3k68g
z3+6Nm)f`$K2X8asTji6p|IRBoZHAdlZ2V(9`z52J@gGa1VG@}(-h5o#urYzluK$3b
z_iT8<L3wTzsXI#c05bFc3q}{Y=;s3R3x7;?TpAxAHIOf#qbYNNLIK$7BplP<)cw^N
zL-f8eH&QB9<UR?4sx~lc^mE378y7J5oC|o^+?p}!5GL2WmwgUMbS=VeYHq1eNx7wh
zDT!k>B_*v3rG;q=wD2v`1<aGG1^f!%v`bQYFH06(U9ZT?Nz0X?yjl$NVx@K&rGF0P
zMDB+$jYo=q94Ve0QW}3-^o5HlvfeR0QYJpPn4%g^{G{=Nd;tvNvhCHPJ@OZ8oZnCX
zz52KK&HDEnKfFk=r18D4k$sQkT1z^A;|bU3P*q^<GONwJ`JMHGx~Ye)i<{N~$?4XK
zn%rKriODa&K%9KMhp)4fjFf?dzJG17N?$yU1W<Y$kkH7$)maB#kD%0XJ7i2#SDJ3j
z0!og?G8A0rf;y>MK#z=5_j!GA==}Fpzm$Ymh2VR5T<W7Ob-%X5!e^hX>X>_DGr=AQ
zrp_aBHpX}JCt5Q=gV)>qr=P%QkNe2M9j$LSq}fOG;hRR8oPF@!Y)4%{i+^dPoWq`m
z$JHoK{!AUkkFarfnKY-tit1GRz(xx2+VoD;r^R4(LnSSD$6|NwQ+*qEhCQxUCu65u
z#2a`LB)*@t_YJR=b7v&FoRIJKr#Bexq-E@V#kruK$Is8CNIDZ>oKqlhfoU?D_C-yd
zdVb;=Z7Gga8Y+YW^r;Q<cz+=WEfwi0FT)aKdyVtJ^E>_RS?FLWCA!RQsQ=QX=kR(l
z79d5<%gr*tJu*mxr8bO1k0J#ve+kk4uqB-r+etUpLE7#5ooT(L3Ug7KD#K|JjPqrA
zYL>eMSrP}ijkWD`7^LN4AeJO{p#ZtZ4Enr08HXOlj;b#c+DuhcyMHy_HYZgZpSF@H
zd>lO*t>X$5S%=r@`5DhAsso+)UoK&D))9m^p8`LoSjn=F2l;yQ*cH9zmOK#41A~Ac
z-4+cRlmRcgE15y!EkZ~>VCLdu?aJE;$4*(?h)KkKc{8*1H>8T!L={RRe5=QOJER;q
zPUtD;%+tC3EAT|Q0Dl<WtkL>!qG(!}ST~#|N6<|l#7X=D52fm^*B*WonXK7j_0x@&
zs<l|XxiI!1_Zck6C$pgkqg5b<HKJ1eEbdjPIGV`F95>7{2aL2P{Xn~sJ^jA$i?95{
zFZ@ma=NG-$NzJ2ZQe-t05HPQ(t?RV6I_=8eoe2+P4##yL?0*o}Tj+vbFHSh8_dd~`
zf0Q{o!&ezzidZ+_7X%s%{xaU=N*93C_>i=?`=VrZtmDxDFDblds0pjlN4%VN?{z01
zIigveBP1K+RCV!%z3bU0$x|51@oyDjDL@5!CKo4^OZdQa;~ukfqbSuCpH<xFGG(_$
zrj|+r$(jRX#(%!E><Gr_hd{MV!*tSydJ6CO8B-<EMG*W-vKxK#M>&S^M%?11Q>Y>R
zNW8Evrr?Z#2&iHH)KL~0F{@P-*-GNSO6%8VM4?&ZT74<ss@Y@GK<VwFOTFVWL%025
zt#A6BEltdt$BM9G`I|lx<7bP;odw|Jxpk~@*P(b1=6?;?)#Jb$U;Ux*Yl~>jZChF&
zwlU78-K-zjDb8e`R7d2S3rny7?Y{b=lqfiM^R2tI6h&7A_9Bxmr6R}$sZL*%QrgK$
z9lSFZF|u`vKo?5n&U&27WUPm}k`;BQOaUc6<w;#9ANLBfpL!|qk*i}{PnSfcYo9NQ
zoU|L;R)0`U(*)Fx3FKk9T}G<MnG6mOVj{@|;VACJ9s+Nz)KGbQCE^UKWW%Okx8y=p
zk;F8?Wda10$t5sPoZIC^;eP9)Swq;A3WArF+h@3TUrKoN+(SmKL!J5H;Y{a|8y>l#
z=LXm?@Up;HCm)c=kLBTmFK@zmfYZffUFV(OtACcsWzt^mMK|`%>0`!#sccY&wl;{?
z0JSCM!p*#B4BtP~I;8+HrmCpBeufoxf~>+?tr15og_n1*$S`(^RJ2f#&TTQ?;%xN#
z_2pegAqq@1z$hF=+i`K_Wk+GQU-nnO2i(1A*{N;6>{-&QliFcjS%VM>sg4l$%ew2;
zx_=bKfc67Lmj|54ty`K75hs#F-$k6*87XherTV=0jkvTMP#vQ_&FdDL><M{gS;)qN
zSpcm;0}Eh8yhRMaZRZ)_<qwF*^Xq7S<A`{NhfEXc%CRNT+kg1MM}K+|g}8A`q0y8*
zaq?}2hLty9LhpnhRrN=Cd(Dq3`iX$@6Mw%`rNGbrcQwGvv!AL_P22FLO*GV{kH7P<
zEw!61xA}UOnOoK%xSxnVH?{&f-^rdYN<o~l%~;Hfj<5F0O$#jP@jMZvj+=-c5rAUJ
zgU%PEFq3jYn*LsTLCT#<Ol1=F)(aC8bQ5!JkRa&==(e<tTZ2f7^6U}AnHzDA+J9|X
zt@%KbJKBIMAo$^=k;i}FZ2U&U+I!rFkG1xxPbu&MN6ti0@D?<mxMbaD@1{={5P|1`
z-U0df@g5GD3+2|Boez5B?(~XWkV2arnF~^%9T#kgbMVCB<$6x%dNYo=vzVncyOuXj
z6fkR<W2kd0atrkB7jp}o($*@NDt~B13k(aWp*c|=?cahW?nC%Jp2_`XkGLj#1a#@?
z*u#QUrVUIvTs(WLhO2*mS%UF>rv_4aa_N=IddVK!L+sh5iN{zMti7e{b7v~AeRuU+
z*Y+d_3{Bu<TvAOZU!GBn50A>ZL-Tj&P1Lf)>!^4*Ey8$Il0gG>*C;J8<$wN)r!ZU~
z`VWUryG<FRIQXoIa`U4wHt0qnb|38GfH$f4?t?u>Ou##q1ZYxsz#O}xmmkAqGD?K+
zHKC6>>X$#8;Hpm=u6bIE-@5c}UtCohyJM4^2Arg2sTHe9t^PImR*nH6PvOzQGrhNB
z!olxi{U|5`ozPVYbl>Er?0+{>OBB?eD6tVTpc|~UA_p|uXCOjhQHl+aWbXY!wGS<j
zPM`jIVdJO&2Km7nqtwOIe~c=fGg4xWrKuJCD8^Q@)Ij`=dA8DTHd<=yZkzk*)@emk
z(^QHzKq#f!k8f9yET=l##*0!Aq@O+=Q!a&yFnD_%^0Sw4tea&mB7e~G99F5xp7e<(
zT;%IbAl^3M?w?F`ga)cT^FSAj=qo6d8*qd~aTDrTx5Sf|k&puZ%|X5f%M`476tUgE
z>VY^LBknEa6$P}n^MT_kscstURwBBUATO}M6i}*2&kaSOC)O4A?2j;%T-Oqq4~Goc
zRYG11X;3c=J^Ck<7=OGv8w##x3XF)mKuM8|@&HEmqgOclObjL0wWQ8-R|&0F9yhOM
zLW_Z`ap^PK1#F_=K2quKsMHf>LbT^plsX8iaiBh$zO7*+HRmy1v>ks_!^e0@id*U(
zLg+|gFzw)Y`rUFL+Y^=`C%ZX`>q(wpz}>TP!XFIOIl0aqT7Qf|pjemj6o@4Q<9)J5
z#Q(`A_HrAmnOyggEEiAz-^!;?|EF62=|8JH`}AMXa~TV~`SiE&a0Hh1NvJb5^ltfc
zsd<`^@7VO-Ur1z}8`hf_!sa5G)@)BRY<M7_xpnyr2pZPk;M$Z7OWzp~Y8@BVm1=22
zYkv|ZVU!vsxqq?HE_Ga)qH&<-+gnm#e75=ftLg8krCffWk0SvcEu1<tH<303w=vxj
zGp9f|pH4O`ox<!$xc78i&o;2ltz-Pw6-!4|)Z~&PsXadn<R$<EXny#iIfo^ekX+Q4
zwY8eA3>QTXcUuaauM$>nCnLL8&-64`EBT%8t7K(grGM&1xvsW(0zPFJ=K=sxAlBqZ
zO@QK9i5b*fk=jWXq<bW=cFNR{e@-6RwQ&YZ*IbYXPHi(vJ<jBv{valTe(6yfj$_lf
zrfcPo6*L15V2u0Kx~A`V%U_L4zguEv+}x8r4{9B{^X&9wzr}O^wVdChwJjxHoWa((
zsc<yOC4ZNm_R`->^cK1%C|J1za@0ra9sRaa7#13w!K<^O0NTc+)a@uh$~0Z#AyP)m
z0QcU3*9?{^Yyl;AB-&MBBpAFJSFxg53V^F0m-;A6J+ACz?VqQj^<2pnb{l$^$HOCq
zaHj^oSut^6O`$?CK+&!CjuVFp;h6+mbBEuTK!1~AUA~C;?*CSAb#hyb{hAl;#BX&n
z3ipt1yg}rBlQ);VEn&!5yXo#O2o|<vu;@!*>*a)5O_iaj)aeEaf)a8h5!Xw;Gg0+H
zb`8x;DCN3n{j9JT8iVPkos<7oBzO@dk`SHS2t%QNZ3A6Z-yr@uP+;-gHiNn2THvTR
zZhuV(_2^zv#N(HG1|L?E>X4P78In%xu#5H1I`HAmR)~rgE2bDI8IB%g+z=?*9Q|!*
zP7EcSa~n?wUl}tWeEiZd|85<j$&Cw`doBeuY;MgM^#~_|zx<Oxng>PXbDl$OV&AG3
zBxSWPf|*L)HX?<V#0p1IiC@$LC$d5tVt<<K&Th6<S<p)?{1wRaT)X@fJFpbQ1=vNx
zjn=V%`MGf|kW`&pyFk@N3qtkaHqFmL*Ov5m?lwU@Cb!85bqFW^dif{u;UmpImNbV$
zg#vGc$XPp}g>y%X@rj9i(*YKWyTb;gEU|GW>XIqbSXGRxM)-?oKR#=@c=l6``hSsQ
zn2DN*(+b&L?%->!oLd85Yn413zf%AH;`@t)*fbCCbd_PZ1V6jUQ>~e(O;uLxWaQir
zISp$cgCE=xvtYW#axx7pRKxnWk9@PI>wE;yx#ylYHOok4(h-$8PNC~JC351pYdb3-
z%W}AgC@3Mrv9AU&8m>8~OZ}TM?SI0HKN`T}wa@fDCn&@q6!?u$CuD}x>d|=tqOA8X
zJHyEBQPvJr!Bkk6pU^*W;HNi!<%{nxcV|fLF}86r`QG;9CHu)PCx+8$<#}EQa>4ZG
zP_9f)5BtEdJ$$0s655c|x3~-jsX)U)b0cpTm)XNM?k>rYp4?qvTM83*mwyz9gxp<%
z(WWU}=<ae#PN6B@ll?-Qbs0<<kd}G|+xG6f6^=MBun?|)gZ|A+Z%Z_TJ-!`bV5E^1
ztd-HYKE=k$2{0I|mi9LfIf$2nYm!Xk$}c0?5km#=u-(aUzd{9M3=g9o@btRWixYtl
zsb?YzySh^yUU|L}B@+rAC4b8f*9dg&9yKeM57ONv^iFCNqqP%{lP%$>R&gqsNPoBB
z3B4{)7&j5x+6?R8sibfB-EY<6BQgi!GH%TGiKL9-ft$4G^u8CRL>pVLAq?del~(3_
zDqNzJm1C`3mi$RnU!^U`zw^-jKq_Z88iw9hOXAJIo=PAErZ6U5Eq`vPa{8ZANx2?t
zHY(3yJ^oH+=ABi7Z<l>=Fv@kaQw{~r<PuaqseA9(F(<>S_~vkl3*3TxaOq}*2XH38
zIB=e;^Uuy~+SUx#?sEZ;pPLu_D*Ehb^pGa>A(1nT{%};HJvu@czUj)ETJ6VG`f{?b
z)jubg)^d7p6^yPkRDVjXoXoV~8m?yaDmc2bC2YsKt(CgkR|&K1%vK2nrI2zUaRGo1
zvm|+<Bmp|Rl_k)n)h+FuWuB;GhvKr<{7il!xiN#a>s-JCr?wfT9_P&D4`3qcnloiP
zYC=E38K3$%l6e|F2Dv!y)5Ij5e1d<fsq@MDP+;4GgCp9c6Mym`Rlp80|B4S56!m#h
z3ABoGq7qE~_NON4TRcig<|#N@TW{|h+LmwkRuC7b1hGQ9v1<*>+keHxT9VQR=XfMX
z_Mia?$(kbvIO0yX$GI}b0zb(6|E{FWBqVX={yZ!ZW>v1RI%O_yx#A|KVQ!yZe+b{0
zhHvrh?Kcgd>VJJ(nN`CKyB@eLd{H9&s-(n#PU8oD#5Y1WH48I79cw(OSCD0b2XV=E
zoA8ac3H0+?lea?30^IV}U|y`5GCSeq?IvK#C!2UEXcNX|*=G~xkvlHhX%kLT#tFik
z6~r3q-~5r8)T@%s+l^jIHnJDd3(}TS$zJ3D(dG6c9)GtZ+D&A@_07Ts!^5cOR;3<l
zJ~PzYVijJ8l7vG?$-2ii;?6?5a0ys-1G_Lk2w&fbSSEWIQ^a+dB2EOhiCLIP-)_B4
zfU09MN1O<M_l=@)BFNpGqQX_J?FEBg6tii5>4`5X$+=yr0woXT21Xxf)mG;Ro=t_J
zza14~v43Q3so;v)Ha{8VHuVi@Qzu%?yR{S3tyLEEQn9Ts<S73ORA!rCw7M<8z7mol
zEq(=M_F?7%@2NVs_By}PYQXf^Yt#O$YD=TqZV9sdTx`=I)FVv3-7ozlK0GDyU;gEK
zFf>oG#%Nc_&wrG*ZAtoChq9)Y5%rrM%CHv5#{qqpF(Ls?R(mPErHX0@Jzqt~vfotP
zWL-VEsRfLjBuR@g%|WRc%*!VK|3N|#Jy_rYXKailZDgs3tQp3I8x0kJSq#z(cM__b
zp=n?^cw{v0M|Ru?asdGFcn?dL%_0Gjf7(bC{VVgaRTa(4^OCAc34|1NX%LV_mBj}a
zreKNK$abXU-|v|j<B+tgT_oc>ckX-691FroM!3|(60R6ggd0s95sVWqh~!X9!kKV{
z!%l=hhPQ#z5UzzJcv&XN=g)NYa`JRu>^+_NU0K}J&pAVUn+d|X;~ToDyQ1^Ne=)l7
zZT-}2eG9jFQ*W2P%jtYPp)3E~ZRqWDcejkT83HWmq^>&D2Jy=mI>N$NT}yP_n->jM
zC?oEMIu-`q469hx5Rl%_XN325oTJqcV_`#EgUe0P`jC>&Zy!dhZ=Yt%hv{A29m*|T
z)elv<t#=+RMb{WU8sApXm(`w5e|IRT>|U<E(y?#1zS<R47fjk5GlkQJE}wpO!7+HV
z|4bUxAyQMGy1EG`@;38mI$qUx)A6i04aw<vjh+~z>s&A`MXnf*m$41bRx6fUu9Juz
zXOpOdmc&O2VpJB@TICw27e(_by4(mEMZ<HOr4YvC#;PR3K#M3^F=(wCe==LxN=vL#
z<h<(;$(mGwiYmk1Ii(RiL?p0COPlv4nvCbl>QFIJ8t+t?$#ibASb|aT<td_)=Ms#H
ztr25bC?V!OC(}Id2a%Rp9%rKa`Sbw{28pY3b}}kg#wHQf^~Q#oP!fS<+<KjXu{Mlu
z$b$Z(F~*`zvT$nX(wY1se>bAVWxs1#mS5Cw8Rn+hV9aIgG)$>?I#0=B!si%5VqnPu
zhzY)%0Iuar+xf?7^{Wmn5U_W~FE#@L0~E!@b$bigxcpu``hS7;O<;;E2jaO3OypcR
zeYc^LW3k6AS4vxY9qv&V^mJ65zWQ>1NUL<iy68%$U2!b8*VX>$e+i>Y6#X|UcCiQF
zf#C)=nUqHlTGAJ+;rC_RH7_5oclA&Ik={2u-{3lbSeMo4P&5cI!S5q_Kb?;LF(iF|
zb?<+y@2<apS`~--vH0!UnsjYn8N|N3$CI*YyO4`;`d875O4D_@>ke(6IZKqnlYw<X
zssgO6goaMWM}ione}!xT9}O5W3$7I;`e~rlB)w85+DWju%HVGu(E|H{Aw&R420z4h
z2D;#<lHJ84Wrn!WE9@%(%J5i2tjS#1D%a=Wv7R7j!C!}53U3*E5>{NWV)Nv~RQ?B|
zexG<k6Gn6eLIGJgfPDZ{b_SAp10-_^B)I(<NK(>S*|xw$Av};ouNPo)?>;)=Q`q8j
z^@OOLek*rvp6DMo{{R*@_x6|gCIKb^H<J(t6qhq60VG0UH#a#sVKZhlV>vlDIAb|7
zWin$hVPP>fH#IggWMnx$JUBNnWHL85VrF46GB7wdW;kIrVK*``F=1sjH90jlFqfGp
z0WMRq4S+BVMA3f)NT6W?I@kb-O<02MU>Zs$F~qWqC+kkK0n7vwG>|}AbL?`HxZg-d
zw{csy2<_2!ZtrH1%YTh>L_3IUuF1L8FUy0E*#{5k300RIC;=-AHZU_b3MC~)Peux=
CBz<=P

delta 55107
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
IB}Gq03U*aW1^@s6

diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
index 43d5a658c..0f9b3befd 100755
--- a/document/database/knowledge.a5er
+++ b/document/database/knowledge.a5er
@@ -360,8 +360,8 @@ LName=認証トークン
 Comment=
 TableOption=
 Page=MAIN
-Left=1600
-Top=50
+Left=3050
+Top=900
 Field="TOKEN","TOKEN","@VARCHAR(128)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ユーザID","USER_ID","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="有効期限","EXPIRES","@DATETIME","NOT NULL",,"","",$FFFFFFFF,""
@@ -370,7 +370,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170620125822
-Position="MAIN",1600,50
+Position="MAIN",3050,900
 
 [Relation]
 Entity1=MAIL_HOOKS
@@ -823,7 +823,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=1600
-Top=400
+Top=350
 Field="サービス名","SERVICE_NAME","@VARCHAR(64)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ロケールキー","LOCALE_KEY","@VARCHAR(12)","NOT NULL",1,"","",$FFFFFFFF,""
 Field="トップページのHTML","PAGE_HTML","text",,,"","",$FFFFFFFF,""
@@ -831,7 +831,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170130131057
-Position="MAIN",1600,400
+Position="MAIN",1600,350
 
 [Entity]
 PName=SERVICE_CONFIGS
@@ -840,7 +840,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=1600
-Top=200
+Top=100
 Field="サービス名","SERVICE_NAME","@VARCHAR(64)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="表示名","SERVICE_LABEL","@VARCHAR(24)","NOT NULL",,"","",$FFFFFFFF,""
 Field="アイコン文字列","SERVICE_ICON","@VARCHAR(24)","NOT NULL",,"","",$FFFFFFFF,""
@@ -849,7 +849,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170131001923
-Position="MAIN",1600,200
+Position="MAIN",1600,100
 
 [Entity]
 PName=PINS
@@ -1243,7 +1243,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=950
-Top=300
+Top=200
 Field="テンプレートの種類ID","TYPE_ID","@INT","NOT NULL",0,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="選択肢番号","CHOICE_NO","@INT","NOT NULL",2,"","",$FFFFFFFF,""
@@ -1253,7 +1253,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150910041119
-Position="MAIN",950,300,542,135
+Position="MAIN",950,200,542,135
 
 [Relation]
 Entity1=TEMPLATE_MASTERS
@@ -1264,7 +1264,7 @@ Fields1=TYPE_ID
 Fields2=TYPE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4460,6903,3568,R,R
+Position="MAIN",0,4460,6903,3717,R,R
 Dependence=1
 Caption=
 PName=
@@ -1272,7 +1272,7 @@ ModifiedDateTime=20150910034230
 LineMode=0
 Bar1=446
 Bar2=690
-Bar3=357
+Bar3=372
 TermPos1=R
 TermPos2=R
 
@@ -1285,14 +1285,14 @@ Fields1=TYPE_ID
 Fields2=TYPE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,3334,5475,2219,R,R
+Position="MAIN",0,3334,5475,2295,R,R
 Dependence=0
 Caption=
 PName=
 LineMode=0
 Bar1=333
 Bar2=548
-Bar3=222
+Bar3=230
 TermPos1=R
 TermPos2=R
 
@@ -1308,10 +1308,11 @@ Field="テンプレートの種類ID","TYPE_ID","serial","NOT NULL",0,"","",$FFF
 Field="テンプレート名","TYPE_NAME","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,""
 Field="アイコン","TYPE_ICON","@VARCHAR(64)",,,"","",$FFFFFFFF,""
 Field="説明","DESCRIPTION","@VARCHAR(1024)",,,"","",$FFFFFFFF,""
+Field="本文の初期値","INITIAL_VALUE","text",,,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20150912014311
+ModifiedDateTime=20170915171119
 Position="MAIN",650,550
 
 [Entity]
@@ -1321,17 +1322,18 @@ Comment=
 TableOption=
 Page=MAIN
 Left=1350
-Top=550
+Top=500
 Field="テンプレートの種類ID","TYPE_ID","@INT","NOT NULL",0,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="項目名","ITEM_NAME","@VARCHAR(32)","NOT NULL",,"","",$FFFFFFFF,""
 Field="項目の種類","ITEM_TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="説明","DESCRIPTION","@VARCHAR(1024)",,,"","",$FFFFFFFF,""
+Field="初期値","INITIAL_VALUE","text",,,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20151027035632
-Position="MAIN",1350,550
+ModifiedDateTime=20170915171315
+Position="MAIN",1350,500
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1519,8 +1521,8 @@ LName=アカウントの画像
 Comment=
 TableOption=
 Page=MAIN
-Left=900
-Top=50
+Left=3550
+Top=1250
 Field="IMAGE_ID","IMAGE_ID","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ユーザID","USER_ID","@INT",,,"","",$FFFFFFFF,""
 Field="ファイル名","FILE_NAME","@VARCHAR(256)",,,"","",$FFFFFFFF,""
@@ -1533,7 +1535,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150416234339
-Position="MAIN",900,50
+Position="MAIN",3550,1250
 
 [Relation]
 Entity1=KNOWLEDGES
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
index b1efca39d..c5b3678bd 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
@@ -219,6 +219,7 @@ public TemplateItemsEntity rawPhysicalInsert(TemplateItemsEntity entity) {
             entity.getItemName(), 
             entity.getItemType(), 
             entity.getDescription(), 
+            entity.getInitialValue(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -241,6 +242,7 @@ public TemplateItemsEntity physicalInsert(TemplateItemsEntity entity) {
             entity.getItemName(), 
             entity.getItemType(), 
             entity.getDescription(), 
+            entity.getInitialValue(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -288,6 +290,7 @@ public TemplateItemsEntity physicalUpdate(TemplateItemsEntity entity) {
             entity.getItemName(), 
             entity.getItemType(), 
             entity.getDescription(), 
+            entity.getInitialValue(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
index dbce0f8ea..dcda456aa 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
@@ -176,6 +176,7 @@ public TemplateMastersEntity rawPhysicalInsert(TemplateMastersEntity entity) {
             entity.getTypeName(), 
             entity.getTypeIcon(), 
             entity.getDescription(), 
+            entity.getInitialValue(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -207,6 +208,7 @@ public TemplateMastersEntity physicalInsert(TemplateMastersEntity entity) {
             entity.getTypeName(), 
             entity.getTypeIcon(), 
             entity.getDescription(), 
+            entity.getInitialValue(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
@@ -255,6 +257,7 @@ public TemplateMastersEntity physicalUpdate(TemplateMastersEntity entity) {
             entity.getTypeName(), 
             entity.getTypeIcon(), 
             entity.getDescription(), 
+            entity.getInitialValue(), 
             entity.getInsertUser(), 
             entity.getInsertDatetime(), 
             entity.getUpdateUser(), 
diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
index e222e874b..da4ae3da0 100644
--- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java
+++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
@@ -25,6 +25,7 @@
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_0;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_1;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_2;
+import org.support.project.knowledge.deploy.v1_12.Migrate_1_12_0;
 import org.support.project.knowledge.deploy.v1_1_0pre1.Migrate_1_1_0pre1;
 import org.support.project.knowledge.deploy.v1_4_0.Migrate_1_4_0;
 import org.support.project.knowledge.deploy.v1_5_0.Migrate_1_5_0;
@@ -50,7 +51,7 @@ public class InitDB {
     private static final Map<String, Migrate> MAP = new LinkedHashMap<>();
 
     private static final Migrate INIT = InitializeSystem.get();
-    public static final String CURRENT = "1.11.2";
+    public static final String CURRENT = "1.12.0";
 
     public InitDB() {
         super();
@@ -83,6 +84,7 @@ public InitDB() {
         MAP.put("1.11.0", Migrate_1_11_0.get());
         MAP.put("1.11.1", Migrate_1_11_1.get());
         MAP.put("1.11.2", Migrate_1_11_2.get());
+        MAP.put("1.12.0", Migrate_1_12_0.get());
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java b/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java
new file mode 100644
index 000000000..aa18566d8
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java
@@ -0,0 +1,21 @@
+package org.support.project.knowledge.deploy.v1_12;
+
+import org.support.project.knowledge.deploy.Migrate;
+import org.support.project.ormapping.tool.dao.InitializeDao;
+
+public class Migrate_1_12_0 implements Migrate {
+
+    public static Migrate_1_12_0 get() {
+        return org.support.project.di.Container.getComp(Migrate_1_12_0.class);
+    }
+
+    @Override
+    public boolean doMigrate() throws Exception {
+        InitializeDao initializeDao = InitializeDao.get();
+        String[] sqlpaths = {
+            "/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql",
+        };
+        initializeDao.initializeDatabase(sqlpaths);
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateItemsEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateItemsEntity.java
index b5d0d95c5..6494ff8e7 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateItemsEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateItemsEntity.java
@@ -61,6 +61,8 @@ public GenTemplateItemsEntity(Integer itemNo, Integer typeId) {
     private Integer itemType;
     /** 説明 */
     private String description;
+    /** 初期値 */
+    private String initialValue;
     /** 登録ユーザ */
     private Integer insertUser;
     /** 登録日時 */
@@ -152,6 +154,22 @@ public GenTemplateItemsEntity setDescription(String description) {
         return this;
     }
 
+    /**
+     * Get 初期値.
+     * @return 初期値
+     */
+    public String getInitialValue() {
+        return this.initialValue;
+    }
+    /**
+     * Set 初期値.
+     * @param initialValue 初期値
+     * @return this object     */
+    public GenTemplateItemsEntity setInitialValue(String initialValue) {
+        this.initialValue = initialValue;
+        return this;
+    }
+
     /**
      * Get 登録ユーザ.
      * @return 登録ユーザ
@@ -288,6 +306,7 @@ public String toString() {
         builder.append("itemName = ").append(itemName).append("\n");
         builder.append("itemType = ").append(itemType).append("\n");
         builder.append("description = ").append(description).append("\n");
+        builder.append("initialValue = ").append(initialValue).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
         builder.append("insertDatetime = ").append(insertDatetime).append("\n");
         builder.append("updateUser = ").append(updateUser).append("\n");
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateMastersEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateMastersEntity.java
index 97bbcb93c..fe0842458 100644
--- a/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateMastersEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateMastersEntity.java
@@ -57,6 +57,8 @@ public GenTemplateMastersEntity(Integer typeId) {
     private String typeIcon;
     /** 説明 */
     private String description;
+    /** 本文の初期値 */
+    private String initialValue;
     /** 登録ユーザ */
     private Integer insertUser;
     /** 登録日時 */
@@ -132,6 +134,22 @@ public GenTemplateMastersEntity setDescription(String description) {
         return this;
     }
 
+    /**
+     * Get 本文の初期値.
+     * @return 本文の初期値
+     */
+    public String getInitialValue() {
+        return this.initialValue;
+    }
+    /**
+     * Set 本文の初期値.
+     * @param initialValue 本文の初期値
+     * @return this object     */
+    public GenTemplateMastersEntity setInitialValue(String initialValue) {
+        this.initialValue = initialValue;
+        return this;
+    }
+
     /**
      * Get 登録ユーザ.
      * @return 登録ユーザ
@@ -264,6 +282,7 @@ public String toString() {
         builder.append("typeName = ").append(typeName).append("\n");
         builder.append("typeIcon = ").append(typeIcon).append("\n");
         builder.append("description = ").append(description).append("\n");
+        builder.append("initialValue = ").append(initialValue).append("\n");
         builder.append("insertUser = ").append(insertUser).append("\n");
         builder.append("insertDatetime = ").append(insertDatetime).append("\n");
         builder.append("updateUser = ").append(updateUser).append("\n");
diff --git a/src/main/java/org/support/project/knowledge/logic/TemplateLogic.java b/src/main/java/org/support/project/knowledge/logic/TemplateLogic.java
index e8fb80b72..adfd95046 100644
--- a/src/main/java/org/support/project/knowledge/logic/TemplateLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/TemplateLogic.java
@@ -155,6 +155,7 @@ public TemplateMastersEntity updateTemplate(TemplateMastersEntity template, Logi
         db.setTypeName(template.getTypeName());
         db.setTypeIcon(template.getTypeIcon());
         db.setDescription(template.getDescription());
+        db.setInitialValue(template.getInitialValue());
         templateDao.update(db);
 
         Integer typeId = template.getTypeId();
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 6ce949b2a..db6b7ecb7 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -694,6 +694,7 @@ knowledge.template.label.name=Name
 knowledge.template.label.icon=Icon
 knowledge.template.label.icon.msg=(Choice from 'Font Awesome'.[<a href="http://fontawesome.io/icons/" target="_blank">http://fontawesome.io/icons/</a>] e.g. fa-book)
 knowledge.template.label.description=Description
+knowledge.template.label.initial.value=Initial value
 knowledge.template.label.not.editable=This template is the default template of the system. you can edit only description.
 knowledge.template.msg.not.delete=The default template (knowledge, bookmark) can not be deleted.
 knowledge.template.label.item=Item
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index d346a4b3e..bd393a2f4 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -694,6 +694,7 @@ knowledge.template.label.name=名称
 knowledge.template.label.icon=アイコン
 knowledge.template.label.icon.msg=(Font Awesome[<a href="http://fontawesome.io/icons/" target="_blank">http://fontawesome.io/icons/</a>]から選択してください。 e.g. fa-book)
 knowledge.template.label.description=説明
+knowledge.template.label.initial.value=初期値
 knowledge.template.label.not.editable=このテンプレートはシステムのデフォルトのテンプレートです。項目の増減、テンプレートの削除は出来ません。
 knowledge.template.msg.not.delete=デフォルトのテンプレート(knowledge,bookmark)は削除できません
 knowledge.template.label.item=項目
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_insert.sql
index 50cdf9dd6..de0c2c128 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_insert.sql
@@ -5,6 +5,7 @@ ITEM_NO
  , ITEM_NAME
  , ITEM_TYPE
  , DESCRIPTION
+ , INITIAL_VALUE
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -21,4 +22,5 @@ ITEM_NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_raw_insert.sql
index 50cdf9dd6..de0c2c128 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_raw_insert.sql
@@ -5,6 +5,7 @@ ITEM_NO
  , ITEM_NAME
  , ITEM_TYPE
  , DESCRIPTION
+ , INITIAL_VALUE
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -21,4 +22,5 @@ ITEM_NO
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_update.sql
index 4f7f156e4..20cba5d01 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_update.sql
@@ -3,6 +3,7 @@ SET
    ITEM_NAME = ?
  , ITEM_TYPE = ?
  , DESCRIPTION = ?
+ , INITIAL_VALUE = ?
  , INSERT_USER = ?
  , INSERT_DATETIME = ?
  , UPDATE_USER = ?
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_insert.sql
index 48ba4feaa..5ad1df82e 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_insert.sql
@@ -4,6 +4,7 @@ TYPE_ID
  , TYPE_NAME
  , TYPE_ICON
  , DESCRIPTION
+ , INITIAL_VALUE
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -19,4 +20,5 @@ DEFAULT
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_raw_insert.sql
index 0c51f5ecc..ad00cad89 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_raw_insert.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_raw_insert.sql
@@ -4,6 +4,7 @@ TYPE_ID
  , TYPE_NAME
  , TYPE_ICON
  , DESCRIPTION
+ , INITIAL_VALUE
  , INSERT_USER
  , INSERT_DATETIME
  , UPDATE_USER
@@ -19,4 +20,5 @@ TYPE_ID
  , ?
  , ?
  , ?
+ , ?
 );
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_update.sql
index e3388f0f4..7f2ad83b6 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_update.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_update.sql
@@ -3,6 +3,7 @@ SET
    TYPE_NAME = ?
  , TYPE_ICON = ?
  , DESCRIPTION = ?
+ , INITIAL_VALUE = ?
  , INSERT_USER = ?
  , INSERT_DATETIME = ?
  , UPDATE_USER = ?
diff --git a/src/main/resources/org/support/project/knowledge/database/ddl.sql b/src/main/resources/org/support/project/knowledge/database/ddl.sql
index 007e6a342..9b38d1985 100644
--- a/src/main/resources/org/support/project/knowledge/database/ddl.sql
+++ b/src/main/resources/org/support/project/knowledge/database/ddl.sql
@@ -527,6 +527,7 @@ create table TEMPLATE_MASTERS (
   , TYPE_NAME character varying(256) not null
   , TYPE_ICON character varying(64)
   , DESCRIPTION character varying(1024)
+  , INITIAL_VALUE text
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
@@ -544,6 +545,7 @@ create table TEMPLATE_ITEMS (
   , ITEM_NAME character varying(32) not null
   , ITEM_TYPE integer not null
   , DESCRIPTION character varying(1024)
+  , INITIAL_VALUE text
   , INSERT_USER integer
   , INSERT_DATETIME timestamp
   , UPDATE_USER integer
@@ -1210,6 +1212,7 @@ comment on column TEMPLATE_MASTERS.TYPE_ID is 'テンプレートの種類ID';
 comment on column TEMPLATE_MASTERS.TYPE_NAME is 'テンプレート名';
 comment on column TEMPLATE_MASTERS.TYPE_ICON is 'アイコン';
 comment on column TEMPLATE_MASTERS.DESCRIPTION is '説明';
+comment on column TEMPLATE_MASTERS.INITIAL_VALUE is '本文の初期値';
 comment on column TEMPLATE_MASTERS.INSERT_USER is '登録ユーザ';
 comment on column TEMPLATE_MASTERS.INSERT_DATETIME is '登録日時';
 comment on column TEMPLATE_MASTERS.UPDATE_USER is '更新ユーザ';
@@ -1222,6 +1225,7 @@ comment on column TEMPLATE_ITEMS.ITEM_NO is '項目NO';
 comment on column TEMPLATE_ITEMS.ITEM_NAME is '項目名';
 comment on column TEMPLATE_ITEMS.ITEM_TYPE is '項目の種類';
 comment on column TEMPLATE_ITEMS.DESCRIPTION is '説明';
+comment on column TEMPLATE_ITEMS.INITIAL_VALUE is '初期値';
 comment on column TEMPLATE_ITEMS.INSERT_USER is '登録ユーザ';
 comment on column TEMPLATE_ITEMS.INSERT_DATETIME is '登録日時';
 comment on column TEMPLATE_ITEMS.UPDATE_USER is '更新ユーザ';
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql
new file mode 100644
index 000000000..f8fc68aab
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql
@@ -0,0 +1,11 @@
+ALTER TABLE TEMPLATE_MASTERS DROP COLUMN IF EXISTS INITIAL_VALUE;
+ALTER TABLE TEMPLATE_MASTERS ADD COLUMN INITIAL_VALUE text;
+
+comment on column TEMPLATE_MASTERS.INITIAL_VALUE is '本文の初期値';
+
+ALTER TABLE TEMPLATE_ITEMS DROP COLUMN IF EXISTS INITIAL_VALUE;
+ALTER TABLE TEMPLATE_ITEMS ADD COLUMN INITIAL_VALUE text;
+
+comment on column TEMPLATE_ITEMS.INITIAL_VALUE is '初期値';
+
+
diff --git a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp
index b4b6bc6c4..e77d645e7 100644
--- a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp
+++ b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp
@@ -48,6 +48,10 @@
         <label for="description"><%= jspUtil.label("knowledge.template.label.description") %></label>
         <textarea class="form-control" name="description" id="description" placeholder="Description" ><%= jspUtil.out("description") %></textarea>
     </div>
+    <div class="form-group">
+        <label for="initialValue"><%= jspUtil.label("knowledge.template.label.initialValue") %></label>
+        <textarea class="form-control" name="initialValue" id="initialValue" placeholder="Initia lValue" ><%= jspUtil.out("initialValue") %></textarea>
+    </div>
     
     <h5><b><%= jspUtil.label("knowledge.template.label.item") %></b></h5>
     <div class="form-group">
diff --git a/src/main/webapp/js/template-item-edit.js b/src/main/webapp/js/template-item-edit.js
index a361a33c8..5864a6182 100644
--- a/src/main/webapp/js/template-item-edit.js
+++ b/src/main/webapp/js/template-item-edit.js
@@ -231,6 +231,7 @@ $(document).ready(function() {
                 $('#typeName').val(result.typeName ? result.typeName : result.title);
                 $('#typeIcon').val(result.typeIcon);
                 $('#description').val(result.description);
+                $('#initialValue').val(result.initialValue);
                 $('#deletebutton').removeClass('hide');
                 document._TEMPLATE.editable = result.editable;
                 if (!result.editable) {
diff --git a/src/main/webapp/js/template-item-input.js b/src/main/webapp/js/template-item-input.js
index dde111141..ddba815e8 100644
--- a/src/main/webapp/js/template-item-input.js
+++ b/src/main/webapp/js/template-item-input.js
@@ -122,12 +122,22 @@ $(document).ready(function() {
         tag += '</div>';
         return tag;
     };
-
+    
+    var initialValue = '';
     var addTemplateItem = function(template) {
         $('#template_msg').text(template.description);
         $('#template_info').removeClass('hide');
         $('#template_info').addClass('show');
         
+        if (!$('#content').val()) {
+            $('#content').val(template.initialValue);
+            initialValue = template.initialValue;
+        } else if (initialValue === $('#content').val()) {
+            // 初期値を指定してから変更していない
+            $('#content').val(template.initialValue);
+            initialValue = template.initialValue;
+        }
+        
         $('#template_items').html('');
         var exists_date = false;
         var exists_time = false;

From 20608d15c4b6dfe9ab63590f6ce09618b45e18bf Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 15 Sep 2017 20:50:56 +0900
Subject: [PATCH 072/138] #757 Do not erase the login user in the display of
 the logined user

---
 .../support/project/knowledge/logic/TargetLogic.java   | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/logic/TargetLogic.java b/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
index 66ce0867d..a34f617cc 100644
--- a/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
@@ -266,18 +266,10 @@ public List<LabelValue> filterTargetLabel(List<GroupsEntity> groups, List<UsersE
         }
 
         for (UsersEntity usersEntity : users) {
-            // 自分の場合はスキップ
-            if (loginedUser != null) {
-                if (usersEntity.getUserId().intValue() == loginedUser.getUserId().intValue()) {
-                    continue;
-                }
-            }
-
-            // グループに公開されていてかつそのグループに所属してる場合もスキップ
+            // グループに公開されていてかつそのグループに所属してる場合はスキップ
             if (groupUserIds.contains(usersEntity.getUserId())) {
                 continue;
             }
-
             LabelValue labelValue = new LabelValue();
             labelValue.setLabel(NAME_PREFIX_USER + usersEntity.getUserName());
             labelValue.setValue(ID_PREFIX_USER + usersEntity.getUserId());

From 48dc8d74d1072e17cc3b740e02a3325ebf6d4280 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 15 Sep 2017 21:46:18 +0900
Subject: [PATCH 073/138] #853 Change version from v1.12 to v1.11

---
 .../support/project/knowledge/deploy/InitDB.java    |  6 +++---
 .../Migrate_1_11_3.java}                            |  8 ++++----
 .../webapp/WEB-INF/views/admin/template/edit.jsp    |  2 +-
 src/main/webapp/js/template-item-input.js           | 13 ++++++++-----
 4 files changed, 16 insertions(+), 13 deletions(-)
 rename src/main/java/org/support/project/knowledge/deploy/{v1_12/Migrate_1_12_0.java => v1_11_0/Migrate_1_11_3.java} (76%)

diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
index da4ae3da0..92a71f12f 100644
--- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java
+++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
@@ -25,7 +25,7 @@
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_0;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_1;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_2;
-import org.support.project.knowledge.deploy.v1_12.Migrate_1_12_0;
+import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_3;
 import org.support.project.knowledge.deploy.v1_1_0pre1.Migrate_1_1_0pre1;
 import org.support.project.knowledge.deploy.v1_4_0.Migrate_1_4_0;
 import org.support.project.knowledge.deploy.v1_5_0.Migrate_1_5_0;
@@ -51,7 +51,7 @@ public class InitDB {
     private static final Map<String, Migrate> MAP = new LinkedHashMap<>();
 
     private static final Migrate INIT = InitializeSystem.get();
-    public static final String CURRENT = "1.12.0";
+    public static final String CURRENT = "1.11.3";
 
     public InitDB() {
         super();
@@ -84,7 +84,7 @@ public InitDB() {
         MAP.put("1.11.0", Migrate_1_11_0.get());
         MAP.put("1.11.1", Migrate_1_11_1.get());
         MAP.put("1.11.2", Migrate_1_11_2.get());
-        MAP.put("1.12.0", Migrate_1_12_0.get());
+        MAP.put("1.11.3", Migrate_1_11_3.get());
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java
similarity index 76%
rename from src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java
rename to src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java
index aa18566d8..b5a53023e 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java
@@ -1,12 +1,12 @@
-package org.support.project.knowledge.deploy.v1_12;
+package org.support.project.knowledge.deploy.v1_11_0;
 
 import org.support.project.knowledge.deploy.Migrate;
 import org.support.project.ormapping.tool.dao.InitializeDao;
 
-public class Migrate_1_12_0 implements Migrate {
+public class Migrate_1_11_3 implements Migrate {
 
-    public static Migrate_1_12_0 get() {
-        return org.support.project.di.Container.getComp(Migrate_1_12_0.class);
+    public static Migrate_1_11_3 get() {
+        return org.support.project.di.Container.getComp(Migrate_1_11_3.class);
     }
 
     @Override
diff --git a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp
index e77d645e7..1973ea1e9 100644
--- a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp
+++ b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp
@@ -49,7 +49,7 @@
         <textarea class="form-control" name="description" id="description" placeholder="Description" ><%= jspUtil.out("description") %></textarea>
     </div>
     <div class="form-group">
-        <label for="initialValue"><%= jspUtil.label("knowledge.template.label.initialValue") %></label>
+        <label for="initialValue"><%= jspUtil.label("knowledge.template.label.initial.value") %></label>
         <textarea class="form-control" name="initialValue" id="initialValue" placeholder="Initia lValue" ><%= jspUtil.out("initialValue") %></textarea>
     </div>
     
diff --git a/src/main/webapp/js/template-item-input.js b/src/main/webapp/js/template-item-input.js
index ddba815e8..1e334511c 100644
--- a/src/main/webapp/js/template-item-input.js
+++ b/src/main/webapp/js/template-item-input.js
@@ -129,13 +129,16 @@ $(document).ready(function() {
         $('#template_info').removeClass('hide');
         $('#template_info').addClass('show');
         
-        if (!$('#content').val()) {
-            $('#content').val(template.initialValue);
-            initialValue = template.initialValue;
-        } else if (initialValue === $('#content').val()) {
-            // 初期値を指定してから変更していない
+        var contentStr = $('#content').val();
+        if (!contentStr) {
             $('#content').val(template.initialValue);
             initialValue = template.initialValue;
+        } else {
+            if (initialValue.replace(/\r?\n/g,"") == contentStr.replace(/\r?\n/g,"")) {
+                // 初期値を指定してから変更していない
+                $('#content').val(template.initialValue ? template.initialValue : '');
+                initialValue = template.initialValue;
+            }
         }
         
         $('#template_items').html('');

From 5c29f695a3c6f0d0b64d220b07dbf7d86c574407 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 17 Sep 2017 11:39:24 +0900
Subject: [PATCH 074/138] #809 Safe null on like user in not login

---
 .../logic/notification/LikeInsertNotification.java         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
index 7f5e1607f..85e9f74b1 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
@@ -139,8 +139,11 @@ private NotificationsEntity insertNotificationOnLikeMyItem(KnowledgesEntity know
         info.setKnowledgeId(knowledge.getKnowledgeId());
         info.setKnowledgeTitle(knowledge.getTitle());
         info.setUpdateUser(knowledge.getUpdateUserName());
-        
-        info.setLikeInsertUser(likeUser.getUserName());
+        if (likeUser != null) {
+            info.setLikeInsertUser(likeUser.getUserName());
+        } else {
+            info.setLikeInsertUser("anonymous");
+        }
         
         notification.setContent(JSON.encode(info));
         notification = NotificationsDao.get().insert(notification);

From 5567b4e2b2499114a07e08f42e261cc593c01632 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 17 Sep 2017 09:44:00 +0900
Subject: [PATCH 075/138] #809 Add a feature to be can set system timestamp

---
 .../knowledge/control/open/KnowledgeControl.java    |  7 ++++---
 .../control/open/PasswordInitializationControl.java |  5 +++--
 .../knowledge/control/open/SignupControl.java       |  7 ++++---
 .../knowledge/control/protect/EventControl.java     |  5 +++--
 .../knowledge/control/protect/KnowledgeControl.java |  9 +++++----
 .../knowledge/control/protect/SurveyControl.java    |  3 ++-
 .../project/knowledge/dao/KnowledgeFilesDao.java    |  9 +++++----
 .../project/knowledge/dao/KnowledgesDao.java        |  3 ++-
 .../support/project/knowledge/dao/MailHooksDao.java |  3 ++-
 .../project/knowledge/dao/StockKnowledgesDao.java   |  3 ++-
 .../knowledge/dao/gen/GenAccountImagesDao.java      | 11 ++++++-----
 .../project/knowledge/dao/gen/GenActivitiesDao.java | 11 ++++++-----
 .../project/knowledge/dao/gen/GenBadgesDao.java     | 11 ++++++-----
 .../project/knowledge/dao/gen/GenCommentsDao.java   | 11 ++++++-----
 .../knowledge/dao/gen/GenDraftItemValuesDao.java    | 11 ++++++-----
 .../knowledge/dao/gen/GenDraftKnowledgesDao.java    | 11 ++++++-----
 .../project/knowledge/dao/gen/GenEventsDao.java     | 11 ++++++-----
 .../knowledge/dao/gen/GenItemChoicesDao.java        | 11 ++++++-----
 .../dao/gen/GenKnowledgeEditGroupsDao.java          | 11 ++++++-----
 .../knowledge/dao/gen/GenKnowledgeEditUsersDao.java | 11 ++++++-----
 .../knowledge/dao/gen/GenKnowledgeFilesDao.java     | 11 ++++++-----
 .../knowledge/dao/gen/GenKnowledgeGroupsDao.java    | 11 ++++++-----
 .../knowledge/dao/gen/GenKnowledgeHistoriesDao.java | 11 ++++++-----
 .../dao/gen/GenKnowledgeItemValuesDao.java          | 11 ++++++-----
 .../knowledge/dao/gen/GenKnowledgeTagsDao.java      | 11 ++++++-----
 .../knowledge/dao/gen/GenKnowledgeUsersDao.java     | 11 ++++++-----
 .../project/knowledge/dao/gen/GenKnowledgesDao.java | 11 ++++++-----
 .../knowledge/dao/gen/GenLikeCommentsDao.java       | 11 ++++++-----
 .../project/knowledge/dao/gen/GenLikesDao.java      | 11 ++++++-----
 .../knowledge/dao/gen/GenMailHookConditionsDao.java | 11 ++++++-----
 .../project/knowledge/dao/gen/GenMailHooksDao.java  | 11 ++++++-----
 .../dao/gen/GenMailLocaleTemplatesDao.java          | 11 ++++++-----
 .../project/knowledge/dao/gen/GenMailPostsDao.java  | 11 ++++++-----
 .../knowledge/dao/gen/GenMailPropertiesDao.java     | 11 ++++++-----
 .../knowledge/dao/gen/GenMailTemplatesDao.java      | 11 ++++++-----
 .../knowledge/dao/gen/GenNotifyConfigsDao.java      | 11 ++++++-----
 .../knowledge/dao/gen/GenNotifyQueuesDao.java       | 11 ++++++-----
 .../knowledge/dao/gen/GenParticipantsDao.java       | 11 ++++++-----
 .../project/knowledge/dao/gen/GenPinsDao.java       | 11 ++++++-----
 .../dao/gen/GenPointKnowledgeHistoriesDao.java      | 11 ++++++-----
 .../knowledge/dao/gen/GenPointUserHistoriesDao.java | 11 ++++++-----
 .../knowledge/dao/gen/GenServiceConfigsDao.java     | 11 ++++++-----
 .../dao/gen/GenServiceLocaleConfigsDao.java         | 11 ++++++-----
 .../knowledge/dao/gen/GenStockKnowledgesDao.java    | 11 ++++++-----
 .../project/knowledge/dao/gen/GenStocksDao.java     | 11 ++++++-----
 .../knowledge/dao/gen/GenSurveyAnswersDao.java      | 11 ++++++-----
 .../knowledge/dao/gen/GenSurveyChoicesDao.java      | 11 ++++++-----
 .../knowledge/dao/gen/GenSurveyItemAnswersDao.java  | 11 ++++++-----
 .../knowledge/dao/gen/GenSurveyItemsDao.java        | 11 ++++++-----
 .../project/knowledge/dao/gen/GenSurveysDao.java    | 11 ++++++-----
 .../project/knowledge/dao/gen/GenTagsDao.java       | 11 ++++++-----
 .../knowledge/dao/gen/GenTemplateItemsDao.java      | 11 ++++++-----
 .../knowledge/dao/gen/GenTemplateMastersDao.java    | 11 ++++++-----
 .../project/knowledge/dao/gen/GenTokensDao.java     | 11 ++++++-----
 .../project/knowledge/dao/gen/GenUserBadgesDao.java | 11 ++++++-----
 .../knowledge/dao/gen/GenViewHistoriesDao.java      | 11 ++++++-----
 .../project/knowledge/dao/gen/GenVotesDao.java      | 11 ++++++-----
 .../knowledge/dao/gen/GenWebhookConfigsDao.java     | 11 ++++++-----
 .../project/knowledge/dao/gen/GenWebhooksDao.java   | 11 ++++++-----
 .../support/project/knowledge/filter/ApiFilter.java |  3 ++-
 .../project/knowledge/logic/AccountLogic.java       |  4 ++--
 .../project/knowledge/logic/DataTransferLogic.java  |  2 +-
 .../project/knowledge/logic/DatabaseLogic.java      |  4 ++--
 .../project/knowledge/logic/KnowledgeLogic.java     |  5 +++--
 .../project/knowledge/logic/LogManageLogic.java     |  3 ++-
 .../support/project/knowledge/logic/MailLogic.java  |  4 ++--
 .../project/knowledge/logic/MarkdownLogic.java      |  5 +++--
 .../project/knowledge/logic/UploadedFileLogic.java  |  2 +-
 .../project/knowledge/logic/MailEventLogicTest.java |  5 +++--
 .../project/knowledge/searcher/SearchTest.java      | 13 +++++++------
 70 files changed, 354 insertions(+), 289 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index b87dc3c28..756265758 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -11,6 +11,7 @@
 import org.support.project.common.exception.ParseException;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.DateUtils;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -218,7 +219,7 @@ public Boundary view() throws InvalidParamException, ParseException {
         List<StocksEntity> stocks = StocksDao.get().selectStockOnKnowledge(entity, loginedUser);
         setAttribute("stocks", stocks);
         
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, getLoginedUser(), new Date(), entity);
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, getLoginedUser(), DateUtils.now(), entity);
         long point = KnowledgesDao.get().selectPoint(entity.getKnowledgeId());
         setAttribute("point", point);
         
@@ -666,7 +667,7 @@ public Boundary like() throws InvalidParamException {
         likeCount.setKnowledgeId(knowledgeId);
         likeCount.setCount(count);
         
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, getLoginedUser(), new Date(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, getLoginedUser(), DateUtils.now(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         return send(likeCount);
     }
@@ -683,7 +684,7 @@ public Boundary likecomment() throws InvalidParamException {
         LikeCount likeCount = new LikeCount();
         likeCount.setCount(count);
         
-        ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, getLoginedUser(), new Date(),
+        ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, getLoginedUser(), DateUtils.now(),
                 CommentsDao.get().selectOnKey(commentNo));
         return send(likeCount);
     }
diff --git a/src/main/java/org/support/project/knowledge/control/open/PasswordInitializationControl.java b/src/main/java/org/support/project/knowledge/control/open/PasswordInitializationControl.java
index e31a0d33c..ae41653b2 100644
--- a/src/main/java/org/support/project/knowledge/control/open/PasswordInitializationControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/PasswordInitializationControl.java
@@ -5,6 +5,7 @@
 import java.util.List;
 
 import org.support.project.common.bean.ValidateError;
+import org.support.project.common.util.DateUtils;
 import org.support.project.common.util.StringUtils;
 import org.support.project.common.validate.Validator;
 import org.support.project.common.validate.ValidatorFactory;
@@ -91,7 +92,7 @@ public Boundary init() throws InvalidParamException {
             return sendError(HttpStatus.SC_404_NOT_FOUND, "NOT FOUND");
         }
 
-        long now = new Date().getTime();
+        long now = DateUtils.now().getTime();
         if (now - resetsEntity.getInsertDatetime().getTime() > 1000 * 60 * 60) {
             return sendError(HttpStatus.SC_404_NOT_FOUND, "NOT FOUND");
         }
@@ -113,7 +114,7 @@ public Boundary change() {
         if (resetsEntity == null) {
             return sendError(HttpStatus.SC_404_NOT_FOUND, "NOT FOUND");
         }
-        long now = new Date().getTime();
+        long now = DateUtils.now().getTime();
         if (now - resetsEntity.getInsertDatetime().getTime() > 1000 * 60 * 60) {
             return sendError(HttpStatus.SC_404_NOT_FOUND, "NOT FOUND");
         }
diff --git a/src/main/java/org/support/project/knowledge/control/open/SignupControl.java b/src/main/java/org/support/project/knowledge/control/open/SignupControl.java
index 0a34efdef..ff1f53391 100644
--- a/src/main/java/org/support/project/knowledge/control/open/SignupControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/SignupControl.java
@@ -6,6 +6,7 @@
 
 import org.support.project.aop.Aspect;
 import org.support.project.common.bean.ValidateError;
+import org.support.project.common.util.DateUtils;
 import org.support.project.common.util.StringUtils;
 import org.support.project.common.validate.Validator;
 import org.support.project.common.validate.ValidatorFactory;
@@ -83,7 +84,7 @@ public Boundary save() {
             ProvisionalRegistrationsDao dao = ProvisionalRegistrationsDao.get();
             List<ProvisionalRegistrationsEntity> check = dao.selectOnUserKey(getParam("userKey"));
             if (!check.isEmpty()) {
-                long now = new Date().getTime();
+                long now = DateUtils.now().getTime();
                 for (ProvisionalRegistrationsEntity entity : check) {
                     if (now - entity.getInsertDatetime().getTime() > 1000 * 60 * 60) {
                         // 無効なものなので、削除
@@ -134,7 +135,7 @@ public Boundary save() {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     private ProvisionalRegistrationsEntity addProvisionalRegistration() {
         ProvisionalRegistrationsEntity entity = super.getParams(ProvisionalRegistrationsEntity.class);
-        String id = UUID.randomUUID().toString() + "-" + new Date().getTime() + "-" + UUID.randomUUID().toString();
+        String id = UUID.randomUUID().toString() + "-" + DateUtils.now() + "-" + UUID.randomUUID().toString();
         entity.setId(id);
         ProvisionalRegistrationsDao dao = ProvisionalRegistrationsDao.get();
         // 既に仮登録が行われたユーザ(メールアドレス)でも、再度仮登録できる
@@ -212,7 +213,7 @@ public Boundary activate() {
             return sendError(HttpStatus.SC_404_NOT_FOUND, "NOT FOUND");
         }
 
-        long now = new Date().getTime();
+        long now = DateUtils.now().getTime();
         if (now - entity.getInsertDatetime().getTime() > 1000 * 60 * 60) {
             return sendError(HttpStatus.SC_404_NOT_FOUND, "NOT FOUND");
         }
diff --git a/src/main/java/org/support/project/knowledge/control/protect/EventControl.java b/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
index 69206b8ec..5f2e47958 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 
+import org.support.project.common.util.DateUtils;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.control.Control;
@@ -35,7 +36,7 @@ public Boundary participation() throws InvalidParamException {
             labelValue.setLabel(getResource("knowledge.view.msg.wait.cansel"));
         }
         
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_ADD, getLoginedUser(), new Date(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_ADD, getLoginedUser(), DateUtils.now(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         
         return send(labelValue);
@@ -50,7 +51,7 @@ public Boundary nonparticipation() throws InvalidParamException {
         Long knowledgeId = getPathLong();
         EventsLogic.get().removeParticipation(knowledgeId, getLoginUserId());
         
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_DELETE, getLoginedUser(), new Date(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_DELETE, getLoginedUser(), DateUtils.now(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         
         return send(getResource("knowledge.view.msg.participate.delete"));
diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index ee879ec85..862c8108d 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -13,6 +13,7 @@
 import org.support.project.common.exception.ParseException;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.DateUtils;
 import org.support.project.common.util.PropertyUtil;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
@@ -214,7 +215,7 @@ private Boundary add(KnowledgesEntity entity) throws Exception, ParseException {
         LOG.trace("save");
 
         KnowledgesEntity insertedEntity = knowledgeLogic.insert(data, super.getLoginedUser());
-        ActivityLogic.get().processKnowledgeSaveActivity(getLoginedUser(), new Date(), insertedEntity);
+        ActivityLogic.get().processKnowledgeSaveActivity(getLoginedUser(), DateUtils.now(), insertedEntity);
         
         return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK,
                 String.valueOf(insertedEntity.getKnowledgeId()), "message.success.insert");
@@ -310,7 +311,7 @@ private Boundary update(KnowledgesEntity entity) throws Exception {
         }
         
         KnowledgesEntity updatedEntity = knowledgeLogic.update(data, super.getLoginedUser());
-        ActivityLogic.get().processKnowledgeSaveActivity(getLoginedUser(), new Date(), updatedEntity);
+        ActivityLogic.get().processKnowledgeSaveActivity(getLoginedUser(), DateUtils.now(), updatedEntity);
         
         if (data.isUpdateContent()) {
             return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK,
@@ -494,7 +495,7 @@ public Boundary comment() throws Exception {
         }
 
         CommentsEntity commentsEntity = KnowledgeLogic.get().saveComment(knowledgeId, comment, fileNos, getLoginedUser());
-        ActivityLogic.get().processActivity(Activity.COMMENT_INSERT, getLoginedUser(), new Date(), commentsEntity);
+        ActivityLogic.get().processActivity(Activity.COMMENT_INSERT, getLoginedUser(), DateUtils.now(), commentsEntity);
 
         return super.redirect(getRequest().getContextPath() + "/open.knowledge/view/" + knowledgeId + params);
     }
@@ -734,7 +735,7 @@ public Boundary stock() throws IOException, InvalidParamException {
                 dao.physicalDelete(entity);
             }
         }
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_STOCK, getLoginedUser(), new Date(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_STOCK, getLoginedUser(), DateUtils.now(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         
         return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK, "saved", "message.success.save");
diff --git a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
index ad433e846..922ae794b 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
@@ -8,6 +8,7 @@
 import org.support.project.common.bean.ValidateError;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.DateUtils;
 import org.support.project.common.util.PropertyUtil;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.DI;
@@ -226,7 +227,7 @@ public Boundary answer() throws InstantiationException, IllegalAccessException,
             LOG.debug(PropertyUtil.reflectionToString(answer));
         }
         SurveyLogic.get().saveAnswer(answer, getLoginUserId());
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_ANSWER, getLoginedUser(), new Date(),
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_ANSWER, getLoginedUser(), DateUtils.now(),
                 KnowledgesDao.get().selectOnKey(knowledgeId));
         
         // メッセージ送信
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgeFilesDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgeFilesDao.java
index 655db7219..8bd03f8b0 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgeFilesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgeFilesDao.java
@@ -5,6 +5,7 @@
 import java.util.List;
 
 import org.support.project.aop.Aspect;
+import org.support.project.common.util.DateUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -88,7 +89,7 @@ public void connectKnowledge(Long fileNo, Long knowledgeId, Long commentNo, Logi
         sql.append("UPDATE KNOWLEDGE_FILES ");
         sql.append("SET KNOWLEDGE_ID = ?, UPDATE_USER = ?, UPDATE_DATETIME = ?, COMMENT_NO = ? ");
         sql.append("WHERE FILE_NO = ? ");
-        executeUpdate(sql.toString(), knowledgeId, loginedUser.getUserId(), new Timestamp(new Date().getTime()), commentNo, fileNo);
+        executeUpdate(sql.toString(), knowledgeId, loginedUser.getUserId(), new Timestamp(DateUtils.now().getTime()), commentNo, fileNo);
     }
 
     /**
@@ -99,7 +100,7 @@ public void connectKnowledge(Long fileNo, Long knowledgeId, Long commentNo, Logi
     public List<KnowledgeFilesEntity> deleteNotConnectFiles() {
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT FILE_NO FROM KNOWLEDGE_FILES WHERE KNOWLEDGE_ID IS NULL AND DRAFT_ID IS NULL AND UPDATE_DATETIME < ? ");
-        Timestamp timestamp = new Timestamp(new Date().getTime() - (1000 * 60 * 60 * 24));
+        Timestamp timestamp = new Timestamp(DateUtils.now().getTime() - (1000 * 60 * 60 * 24));
         return executeQueryList(sql.toString(), KnowledgeFilesEntity.class, timestamp);
     }
 
@@ -130,7 +131,7 @@ public void changeStatus(Long fileNo, int parseStatus, Integer updateUserId) {
         sql.append("UPDATE KNOWLEDGE_FILES ");
         sql.append("SET PARSE_STATUS = ?, UPDATE_USER = ?, UPDATE_DATETIME = ? ");
         sql.append("WHERE FILE_NO = ? ");
-        executeUpdate(sql.toString(), parseStatus, updateUserId, new Timestamp(new Date().getTime()), fileNo);
+        executeUpdate(sql.toString(), parseStatus, updateUserId, new Timestamp(DateUtils.now().getTime()), fileNo);
     }
 
     /**
@@ -145,7 +146,7 @@ public void updateDraftId(KnowledgeFilesEntity entity, Integer updateUserId) {
         sql.append("SET DRAFT_ID = ?, KNOWLEDGE_ID = ?, UPDATE_USER = ?, UPDATE_DATETIME = ? ");
         sql.append("WHERE FILE_NO = ? ");
         executeUpdate(sql.toString(), entity.getDraftId(), entity.getKnowledgeId(), 
-                updateUserId, new Timestamp(new Date().getTime()), entity.getFileNo());
+                updateUserId, new Timestamp(DateUtils.now().getTime()), entity.getFileNo());
         
     }
 
diff --git a/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
index 5f016fade..183bf27f5 100644
--- a/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/KnowledgesDao.java
@@ -6,6 +6,7 @@
 import java.util.List;
 
 import org.support.project.aop.Aspect;
+import org.support.project.common.util.DateUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -128,7 +129,7 @@ public List<Long> selectOnUser(Integer userId) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void deleteOnUser(Integer loginUserId) {
         String sql = "UPDATE KNOWLEDGES SET DELETE_FLAG = 1 , UPDATE_USER = ? , UPDATE_DATETIME = ? WHERE INSERT_USER = ?";
-        super.executeUpdate(sql, loginUserId, new Timestamp(new Date().getTime()), loginUserId);
+        super.executeUpdate(sql, loginUserId, new Timestamp(DateUtils.now().getTime()), loginUserId);
     }
 
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/MailHooksDao.java b/src/main/java/org/support/project/knowledge/dao/MailHooksDao.java
index 195b108e5..5d74c9a47 100644
--- a/src/main/java/org/support/project/knowledge/dao/MailHooksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/MailHooksDao.java
@@ -4,6 +4,7 @@
 
 import org.support.project.aop.Aspect;
 import org.support.project.common.config.INT_FLAG;
+import org.support.project.common.util.DateUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -63,7 +64,7 @@ public MailHooksEntity save(MailHooksEntity entity) {
             }
             entity.setDeleteFlag(INT_FLAG.OFF.getValue());
             entity.setInsertUser((Integer) DBUserPool.get().getUser());
-            entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+            entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
             return rawPhysicalInsert(entity);
         } else {
             return super.save(entity);
diff --git a/src/main/java/org/support/project/knowledge/dao/StockKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/StockKnowledgesDao.java
index 64426a1d8..e9273d535 100644
--- a/src/main/java/org/support/project/knowledge/dao/StockKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/StockKnowledgesDao.java
@@ -4,6 +4,7 @@
 import java.util.List;
 
 import org.support.project.aop.Aspect;
+import org.support.project.common.util.DateUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -64,7 +65,7 @@ public List<StockKnowledgesEntity> selectActiveOnStockId(Long stockId) {
     public void deleteOnKnowledgeId(Long knowledgeId) {
         DBUserPool pool = Container.getComp(DBUserPool.class);
         Integer user = (Integer) pool.getUser();
-        Date now = new Date();
+        Date now = DateUtils.now();
         String sql = "UPDATE stock_knowledges SET delete_flag = 1, update_user = ?, update_datetime = ? WHERE knowledge_id = ?";
         executeUpdate(sql, user, now, knowledgeId);
     }
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
index ee7583c36..d663bbdbf 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java
@@ -16,6 +16,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -232,9 +233,9 @@ public AccountImagesEntity physicalInsert(AccountImagesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public AccountImagesEntity insert(Integer user, AccountImagesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -287,7 +288,7 @@ public AccountImagesEntity update(Integer user, AccountImagesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -364,7 +365,7 @@ public void delete(Integer user, Long imageId) {
         AccountImagesEntity db = selectOnKey(imageId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -413,7 +414,7 @@ public void activation(Integer user, Long imageId) {
         AccountImagesEntity db = physicalSelectOnKey(imageId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
index 229f24c1a..00cfb1372 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -225,9 +226,9 @@ public ActivitiesEntity physicalInsert(ActivitiesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ActivitiesEntity insert(Integer user, ActivitiesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -277,7 +278,7 @@ public ActivitiesEntity update(Integer user, ActivitiesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -354,7 +355,7 @@ public void delete(Integer user, Long activityNo) {
         ActivitiesEntity db = selectOnKey(activityNo);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -403,7 +404,7 @@ public void activation(Integer user, Long activityNo) {
         ActivitiesEntity db = physicalSelectOnKey(activityNo);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
index 29f69fb35..400501b74 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -229,9 +230,9 @@ public BadgesEntity physicalInsert(BadgesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public BadgesEntity insert(Integer user, BadgesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -283,7 +284,7 @@ public BadgesEntity update(Integer user, BadgesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -360,7 +361,7 @@ public void delete(Integer user, Integer no) {
         BadgesEntity db = selectOnKey(no);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -409,7 +410,7 @@ public void activation(Integer user, Integer no) {
         BadgesEntity db = physicalSelectOnKey(no);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
index 0b0a097ec..49a2a32b1 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -225,9 +226,9 @@ public CommentsEntity physicalInsert(CommentsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public CommentsEntity insert(Integer user, CommentsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -277,7 +278,7 @@ public CommentsEntity update(Integer user, CommentsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -354,7 +355,7 @@ public void delete(Integer user, Long commentNo) {
         CommentsEntity db = selectOnKey(commentNo);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -403,7 +404,7 @@ public void activation(Integer user, Long commentNo) {
         CommentsEntity db = physicalSelectOnKey(commentNo);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java
index 25123fdd0..6bc62c327 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftItemValuesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -280,9 +281,9 @@ public DraftItemValuesEntity physicalInsert(DraftItemValuesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public DraftItemValuesEntity insert(Integer user, DraftItemValuesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -333,7 +334,7 @@ public DraftItemValuesEntity update(Integer user, DraftItemValuesEntity entity)
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -414,7 +415,7 @@ public void delete(Integer user, Long draftId, Integer itemNo, Integer typeId) {
         DraftItemValuesEntity db = selectOnKey(draftId, itemNo, typeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -467,7 +468,7 @@ public void activation(Integer user, Long draftId, Integer itemNo, Integer typeI
         DraftItemValuesEntity db = physicalSelectOnKey(draftId, itemNo, typeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
index d04f0e8cd..186c06cea 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -235,9 +236,9 @@ public DraftKnowledgesEntity physicalInsert(DraftKnowledgesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public DraftKnowledgesEntity insert(Integer user, DraftKnowledgesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -292,7 +293,7 @@ public DraftKnowledgesEntity update(Integer user, DraftKnowledgesEntity entity)
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -369,7 +370,7 @@ public void delete(Integer user, Long draftId) {
         DraftKnowledgesEntity db = selectOnKey(draftId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -418,7 +419,7 @@ public void activation(Integer user, Long draftId) {
         DraftKnowledgesEntity db = physicalSelectOnKey(draftId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java
index b3af83bab..0d52950ef 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenEventsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -214,9 +215,9 @@ public EventsEntity physicalInsert(EventsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public EventsEntity insert(Integer user, EventsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -266,7 +267,7 @@ public EventsEntity update(Integer user, EventsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -343,7 +344,7 @@ public void delete(Integer user, Long knowledgeId) {
         EventsEntity db = selectOnKey(knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -392,7 +393,7 @@ public void activation(Integer user, Long knowledgeId) {
         EventsEntity db = physicalSelectOnKey(knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java
index d7f63210c..cbbc3f915 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenItemChoicesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -280,9 +281,9 @@ public ItemChoicesEntity physicalInsert(ItemChoicesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ItemChoicesEntity insert(Integer user, ItemChoicesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -333,7 +334,7 @@ public ItemChoicesEntity update(Integer user, ItemChoicesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -414,7 +415,7 @@ public void delete(Integer user, Integer choiceNo, Integer itemNo, Integer typeI
         ItemChoicesEntity db = selectOnKey(choiceNo, itemNo, typeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -467,7 +468,7 @@ public void activation(Integer user, Integer choiceNo, Integer itemNo, Integer t
         ItemChoicesEntity db = physicalSelectOnKey(choiceNo, itemNo, typeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java
index d64b1b6d1..5872a1a26 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditGroupsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -252,9 +253,9 @@ public KnowledgeEditGroupsEntity physicalInsert(KnowledgeEditGroupsEntity entity
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeEditGroupsEntity insert(Integer user, KnowledgeEditGroupsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -302,7 +303,7 @@ public KnowledgeEditGroupsEntity update(Integer user, KnowledgeEditGroupsEntity
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -381,7 +382,7 @@ public void delete(Integer user, Integer groupId, Long knowledgeId) {
         KnowledgeEditGroupsEntity db = selectOnKey(groupId, knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -432,7 +433,7 @@ public void activation(Integer user, Integer groupId, Long knowledgeId) {
         KnowledgeEditGroupsEntity db = physicalSelectOnKey(groupId, knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java
index 6e08954f4..a00c330bd 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeEditUsersDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -252,9 +253,9 @@ public KnowledgeEditUsersEntity physicalInsert(KnowledgeEditUsersEntity entity)
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeEditUsersEntity insert(Integer user, KnowledgeEditUsersEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -302,7 +303,7 @@ public KnowledgeEditUsersEntity update(Integer user, KnowledgeEditUsersEntity en
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -381,7 +382,7 @@ public void delete(Integer user, Long knowledgeId, Integer userId) {
         KnowledgeEditUsersEntity db = selectOnKey(knowledgeId, userId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -432,7 +433,7 @@ public void activation(Integer user, Long knowledgeId, Integer userId) {
         KnowledgeEditUsersEntity db = physicalSelectOnKey(knowledgeId, userId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
index 4d72c4c5e..01f55d4eb 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java
@@ -16,6 +16,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -234,9 +235,9 @@ public KnowledgeFilesEntity physicalInsert(KnowledgeFilesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeFilesEntity insert(Integer user, KnowledgeFilesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -290,7 +291,7 @@ public KnowledgeFilesEntity update(Integer user, KnowledgeFilesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -367,7 +368,7 @@ public void delete(Integer user, Long fileNo) {
         KnowledgeFilesEntity db = selectOnKey(fileNo);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -416,7 +417,7 @@ public void activation(Integer user, Long fileNo) {
         KnowledgeFilesEntity db = physicalSelectOnKey(fileNo);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java
index d99a468a7..efd46954f 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeGroupsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -252,9 +253,9 @@ public KnowledgeGroupsEntity physicalInsert(KnowledgeGroupsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeGroupsEntity insert(Integer user, KnowledgeGroupsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -302,7 +303,7 @@ public KnowledgeGroupsEntity update(Integer user, KnowledgeGroupsEntity entity)
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -381,7 +382,7 @@ public void delete(Integer user, Integer groupId, Long knowledgeId) {
         KnowledgeGroupsEntity db = selectOnKey(groupId, knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -432,7 +433,7 @@ public void activation(Integer user, Integer groupId, Long knowledgeId) {
         KnowledgeGroupsEntity db = physicalSelectOnKey(groupId, knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java
index 146c02755..acea7ef99 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeHistoriesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -266,9 +267,9 @@ public KnowledgeHistoriesEntity physicalInsert(KnowledgeHistoriesEntity entity)
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeHistoriesEntity insert(Integer user, KnowledgeHistoriesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -323,7 +324,7 @@ public KnowledgeHistoriesEntity update(Integer user, KnowledgeHistoriesEntity en
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -402,7 +403,7 @@ public void delete(Integer user, Integer historyNo, Long knowledgeId) {
         KnowledgeHistoriesEntity db = selectOnKey(historyNo, knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -453,7 +454,7 @@ public void activation(Integer user, Integer historyNo, Long knowledgeId) {
         KnowledgeHistoriesEntity db = physicalSelectOnKey(historyNo, knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java
index 3aff11032..03f3341e2 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeItemValuesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -280,9 +281,9 @@ public KnowledgeItemValuesEntity physicalInsert(KnowledgeItemValuesEntity entity
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeItemValuesEntity insert(Integer user, KnowledgeItemValuesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -333,7 +334,7 @@ public KnowledgeItemValuesEntity update(Integer user, KnowledgeItemValuesEntity
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -414,7 +415,7 @@ public void delete(Integer user, Integer itemNo, Long knowledgeId, Integer typeI
         KnowledgeItemValuesEntity db = selectOnKey(itemNo, knowledgeId, typeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -467,7 +468,7 @@ public void activation(Integer user, Integer itemNo, Long knowledgeId, Integer t
         KnowledgeItemValuesEntity db = physicalSelectOnKey(itemNo, knowledgeId, typeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java
index e7ecb1997..a370ff68c 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeTagsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -252,9 +253,9 @@ public KnowledgeTagsEntity physicalInsert(KnowledgeTagsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeTagsEntity insert(Integer user, KnowledgeTagsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -302,7 +303,7 @@ public KnowledgeTagsEntity update(Integer user, KnowledgeTagsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -381,7 +382,7 @@ public void delete(Integer user, Long knowledgeId, Integer tagId) {
         KnowledgeTagsEntity db = selectOnKey(knowledgeId, tagId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -432,7 +433,7 @@ public void activation(Integer user, Long knowledgeId, Integer tagId) {
         KnowledgeTagsEntity db = physicalSelectOnKey(knowledgeId, tagId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java
index 5928b2047..7b92c2901 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeUsersDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -252,9 +253,9 @@ public KnowledgeUsersEntity physicalInsert(KnowledgeUsersEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgeUsersEntity insert(Integer user, KnowledgeUsersEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -302,7 +303,7 @@ public KnowledgeUsersEntity update(Integer user, KnowledgeUsersEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -381,7 +382,7 @@ public void delete(Integer user, Long knowledgeId, Integer userId) {
         KnowledgeUsersEntity db = selectOnKey(knowledgeId, userId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -432,7 +433,7 @@ public void activation(Integer user, Long knowledgeId, Integer userId) {
         KnowledgeUsersEntity db = physicalSelectOnKey(knowledgeId, userId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
index 5a3da55df..abac38dc4 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -241,9 +242,9 @@ public KnowledgesEntity physicalInsert(KnowledgesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public KnowledgesEntity insert(Integer user, KnowledgesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -301,7 +302,7 @@ public KnowledgesEntity update(Integer user, KnowledgesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -378,7 +379,7 @@ public void delete(Integer user, Long knowledgeId) {
         KnowledgesEntity db = selectOnKey(knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -427,7 +428,7 @@ public void activation(Integer user, Long knowledgeId) {
         KnowledgesEntity db = physicalSelectOnKey(knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
index 013583b20..05757fbc5 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -223,9 +224,9 @@ public LikeCommentsEntity physicalInsert(LikeCommentsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public LikeCommentsEntity insert(Integer user, LikeCommentsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -274,7 +275,7 @@ public LikeCommentsEntity update(Integer user, LikeCommentsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -351,7 +352,7 @@ public void delete(Integer user, Long no) {
         LikeCommentsEntity db = selectOnKey(no);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -400,7 +401,7 @@ public void activation(Integer user, Long no) {
         LikeCommentsEntity db = physicalSelectOnKey(no);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
index bef04434c..ebc2551cf 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -223,9 +224,9 @@ public LikesEntity physicalInsert(LikesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public LikesEntity insert(Integer user, LikesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -274,7 +275,7 @@ public LikesEntity update(Integer user, LikesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -351,7 +352,7 @@ public void delete(Integer user, Long no) {
         LikesEntity db = selectOnKey(no);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -400,7 +401,7 @@ public void activation(Integer user, Long no) {
         LikesEntity db = physicalSelectOnKey(no);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java
index 3f940e367..311984771 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookConditionsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -272,9 +273,9 @@ public MailHookConditionsEntity physicalInsert(MailHookConditionsEntity entity)
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailHookConditionsEntity insert(Integer user, MailHookConditionsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -332,7 +333,7 @@ public MailHookConditionsEntity update(Integer user, MailHookConditionsEntity en
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -411,7 +412,7 @@ public void delete(Integer user, Integer conditionNo, Integer hookId) {
         MailHookConditionsEntity db = selectOnKey(conditionNo, hookId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -462,7 +463,7 @@ public void activation(Integer user, Integer conditionNo, Integer hookId) {
         MailHookConditionsEntity db = physicalSelectOnKey(conditionNo, hookId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
index ddd6a8620..65cee2dd9 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -233,9 +234,9 @@ public MailHooksEntity physicalInsert(MailHooksEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailHooksEntity insert(Integer user, MailHooksEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -289,7 +290,7 @@ public MailHooksEntity update(Integer user, MailHooksEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -366,7 +367,7 @@ public void delete(Integer user, Integer hookId) {
         MailHooksEntity db = selectOnKey(hookId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -415,7 +416,7 @@ public void activation(Integer user, Integer hookId) {
         MailHooksEntity db = physicalSelectOnKey(hookId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java
index 64557990e..992198c5a 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailLocaleTemplatesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -256,9 +257,9 @@ public MailLocaleTemplatesEntity physicalInsert(MailLocaleTemplatesEntity entity
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailLocaleTemplatesEntity insert(Integer user, MailLocaleTemplatesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -308,7 +309,7 @@ public MailLocaleTemplatesEntity update(Integer user, MailLocaleTemplatesEntity
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -387,7 +388,7 @@ public void delete(Integer user, String key, String templateId) {
         MailLocaleTemplatesEntity db = selectOnKey(key, templateId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -438,7 +439,7 @@ public void activation(Integer user, String key, String templateId) {
         MailLocaleTemplatesEntity db = physicalSelectOnKey(key, templateId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java
index 4587eac5a..166ad9f62 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPostsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -214,9 +215,9 @@ public MailPostsEntity physicalInsert(MailPostsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailPostsEntity insert(Integer user, MailPostsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -266,7 +267,7 @@ public MailPostsEntity update(Integer user, MailPostsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -343,7 +344,7 @@ public void delete(Integer user, String messageId) {
         MailPostsEntity db = selectOnKey(messageId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -392,7 +393,7 @@ public void activation(Integer user, String messageId) {
         MailPostsEntity db = physicalSelectOnKey(messageId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java
index 6a27f700d..ed72f8dda 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailPropertiesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -254,9 +255,9 @@ public MailPropertiesEntity physicalInsert(MailPropertiesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailPropertiesEntity insert(Integer user, MailPropertiesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -305,7 +306,7 @@ public MailPropertiesEntity update(Integer user, MailPropertiesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -384,7 +385,7 @@ public void delete(Integer user, Integer hookId, String propertyKey) {
         MailPropertiesEntity db = selectOnKey(hookId, propertyKey);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -435,7 +436,7 @@ public void activation(Integer user, Integer hookId, String propertyKey) {
         MailPropertiesEntity db = physicalSelectOnKey(hookId, propertyKey);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java
index b7f085f95..1df408ef1 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailTemplatesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -212,9 +213,9 @@ public MailTemplatesEntity physicalInsert(MailTemplatesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public MailTemplatesEntity insert(Integer user, MailTemplatesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -263,7 +264,7 @@ public MailTemplatesEntity update(Integer user, MailTemplatesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -340,7 +341,7 @@ public void delete(Integer user, String templateId) {
         MailTemplatesEntity db = selectOnKey(templateId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -389,7 +390,7 @@ public void activation(Integer user, String templateId) {
         MailTemplatesEntity db = physicalSelectOnKey(templateId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java
index 0ae77eb7a..0f080acee 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyConfigsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -228,9 +229,9 @@ public NotifyConfigsEntity physicalInsert(NotifyConfigsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public NotifyConfigsEntity insert(Integer user, NotifyConfigsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -287,7 +288,7 @@ public NotifyConfigsEntity update(Integer user, NotifyConfigsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -364,7 +365,7 @@ public void delete(Integer user, Integer userId) {
         NotifyConfigsEntity db = selectOnKey(userId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -413,7 +414,7 @@ public void activation(Integer user, Integer userId) {
         NotifyConfigsEntity db = physicalSelectOnKey(userId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java
index faf2a0dba..9bda7a281 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenNotifyQueuesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -212,9 +213,9 @@ public NotifyQueuesEntity physicalInsert(NotifyQueuesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public NotifyQueuesEntity insert(Integer user, NotifyQueuesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -263,7 +264,7 @@ public NotifyQueuesEntity update(Integer user, NotifyQueuesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -340,7 +341,7 @@ public void delete(Integer user, String hash) {
         NotifyQueuesEntity db = selectOnKey(hash);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -389,7 +390,7 @@ public void activation(Integer user, String hash) {
         NotifyQueuesEntity db = physicalSelectOnKey(hash);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java
index 64d102d1e..cec6fa6f3 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenParticipantsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -254,9 +255,9 @@ public ParticipantsEntity physicalInsert(ParticipantsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ParticipantsEntity insert(Integer user, ParticipantsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -305,7 +306,7 @@ public ParticipantsEntity update(Integer user, ParticipantsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -384,7 +385,7 @@ public void delete(Integer user, Long knowledgeId, Integer userId) {
         ParticipantsEntity db = selectOnKey(knowledgeId, userId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -435,7 +436,7 @@ public void activation(Integer user, Long knowledgeId, Integer userId) {
         ParticipantsEntity db = physicalSelectOnKey(knowledgeId, userId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
index b47f2cf99..86bd58d05 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -223,9 +224,9 @@ public PinsEntity physicalInsert(PinsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public PinsEntity insert(Integer user, PinsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -274,7 +275,7 @@ public PinsEntity update(Integer user, PinsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -351,7 +352,7 @@ public void delete(Integer user, Integer no) {
         PinsEntity db = selectOnKey(no);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -400,7 +401,7 @@ public void activation(Integer user, Integer no) {
         PinsEntity db = physicalSelectOnKey(no);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
index 988955edb..11db71c64 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointKnowledgeHistoriesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -262,9 +263,9 @@ public PointKnowledgeHistoriesEntity physicalInsert(PointKnowledgeHistoriesEntit
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public PointKnowledgeHistoriesEntity insert(Integer user, PointKnowledgeHistoriesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -317,7 +318,7 @@ public PointKnowledgeHistoriesEntity update(Integer user, PointKnowledgeHistorie
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -396,7 +397,7 @@ public void delete(Integer user, Long historyNo, Long knowledgeId) {
         PointKnowledgeHistoriesEntity db = selectOnKey(historyNo, knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -447,7 +448,7 @@ public void activation(Integer user, Long historyNo, Long knowledgeId) {
         PointKnowledgeHistoriesEntity db = physicalSelectOnKey(historyNo, knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
index bf811244e..8e8b0ed9d 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPointUserHistoriesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -262,9 +263,9 @@ public PointUserHistoriesEntity physicalInsert(PointUserHistoriesEntity entity)
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public PointUserHistoriesEntity insert(Integer user, PointUserHistoriesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -317,7 +318,7 @@ public PointUserHistoriesEntity update(Integer user, PointUserHistoriesEntity en
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -396,7 +397,7 @@ public void delete(Integer user, Long historyNo, Integer userId) {
         PointUserHistoriesEntity db = selectOnKey(historyNo, userId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -447,7 +448,7 @@ public void activation(Integer user, Long historyNo, Integer userId) {
         PointUserHistoriesEntity db = physicalSelectOnKey(historyNo, userId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java
index 07b16964c..5851e56d2 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceConfigsDao.java
@@ -16,6 +16,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -215,9 +216,9 @@ public ServiceConfigsEntity physicalInsert(ServiceConfigsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ServiceConfigsEntity insert(Integer user, ServiceConfigsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -267,7 +268,7 @@ public ServiceConfigsEntity update(Integer user, ServiceConfigsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -344,7 +345,7 @@ public void delete(Integer user, String serviceName) {
         ServiceConfigsEntity db = selectOnKey(serviceName);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -393,7 +394,7 @@ public void activation(Integer user, String serviceName) {
         ServiceConfigsEntity db = physicalSelectOnKey(serviceName);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java
index a110f295a..5d3e86dfa 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenServiceLocaleConfigsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -254,9 +255,9 @@ public ServiceLocaleConfigsEntity physicalInsert(ServiceLocaleConfigsEntity enti
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ServiceLocaleConfigsEntity insert(Integer user, ServiceLocaleConfigsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -305,7 +306,7 @@ public ServiceLocaleConfigsEntity update(Integer user, ServiceLocaleConfigsEntit
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -384,7 +385,7 @@ public void delete(Integer user, String localeKey, String serviceName) {
         ServiceLocaleConfigsEntity db = selectOnKey(localeKey, serviceName);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -435,7 +436,7 @@ public void activation(Integer user, String localeKey, String serviceName) {
         ServiceLocaleConfigsEntity db = physicalSelectOnKey(localeKey, serviceName);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java
index 022821c5f..04c0129e8 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenStockKnowledgesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -254,9 +255,9 @@ public StockKnowledgesEntity physicalInsert(StockKnowledgesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public StockKnowledgesEntity insert(Integer user, StockKnowledgesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -305,7 +306,7 @@ public StockKnowledgesEntity update(Integer user, StockKnowledgesEntity entity)
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -384,7 +385,7 @@ public void delete(Integer user, Long knowledgeId, Long stockId) {
         StockKnowledgesEntity db = selectOnKey(knowledgeId, stockId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -435,7 +436,7 @@ public void activation(Integer user, Long knowledgeId, Long stockId) {
         StockKnowledgesEntity db = physicalSelectOnKey(knowledgeId, stockId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
index e18d4a1d9..e6197a988 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -225,9 +226,9 @@ public StocksEntity physicalInsert(StocksEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public StocksEntity insert(Integer user, StocksEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -277,7 +278,7 @@ public StocksEntity update(Integer user, StocksEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -354,7 +355,7 @@ public void delete(Integer user, Long stockId) {
         StocksEntity db = selectOnKey(stockId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -403,7 +404,7 @@ public void activation(Integer user, Long stockId) {
         StocksEntity db = physicalSelectOnKey(stockId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java
index b26ec4394..1c5427a50 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyAnswersDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -252,9 +253,9 @@ public SurveyAnswersEntity physicalInsert(SurveyAnswersEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyAnswersEntity insert(Integer user, SurveyAnswersEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -302,7 +303,7 @@ public SurveyAnswersEntity update(Integer user, SurveyAnswersEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -381,7 +382,7 @@ public void delete(Integer user, Integer answerId, Long knowledgeId) {
         SurveyAnswersEntity db = selectOnKey(answerId, knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -432,7 +433,7 @@ public void activation(Integer user, Integer answerId, Long knowledgeId) {
         SurveyAnswersEntity db = physicalSelectOnKey(answerId, knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java
index 923e04691..5da7a466d 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyChoicesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -280,9 +281,9 @@ public SurveyChoicesEntity physicalInsert(SurveyChoicesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyChoicesEntity insert(Integer user, SurveyChoicesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -333,7 +334,7 @@ public SurveyChoicesEntity update(Integer user, SurveyChoicesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -414,7 +415,7 @@ public void delete(Integer user, Integer choiceNo, Integer itemNo, Long knowledg
         SurveyChoicesEntity db = selectOnKey(choiceNo, itemNo, knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -467,7 +468,7 @@ public void activation(Integer user, Integer choiceNo, Integer itemNo, Long know
         SurveyChoicesEntity db = physicalSelectOnKey(choiceNo, itemNo, knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java
index efea18977..10fc6310c 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemAnswersDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -278,9 +279,9 @@ public SurveyItemAnswersEntity physicalInsert(SurveyItemAnswersEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyItemAnswersEntity insert(Integer user, SurveyItemAnswersEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -330,7 +331,7 @@ public SurveyItemAnswersEntity update(Integer user, SurveyItemAnswersEntity enti
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -411,7 +412,7 @@ public void delete(Integer user, Integer answerId, Integer itemNo, Long knowledg
         SurveyItemAnswersEntity db = selectOnKey(answerId, itemNo, knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -464,7 +465,7 @@ public void activation(Integer user, Integer answerId, Integer itemNo, Long know
         SurveyItemAnswersEntity db = physicalSelectOnKey(answerId, itemNo, knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java
index 4002ab94d..21674d54d 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveyItemsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -258,9 +259,9 @@ public SurveyItemsEntity physicalInsert(SurveyItemsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveyItemsEntity insert(Integer user, SurveyItemsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -311,7 +312,7 @@ public SurveyItemsEntity update(Integer user, SurveyItemsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -390,7 +391,7 @@ public void delete(Integer user, Integer itemNo, Long knowledgeId) {
         SurveyItemsEntity db = selectOnKey(itemNo, knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -441,7 +442,7 @@ public void activation(Integer user, Integer itemNo, Long knowledgeId) {
         SurveyItemsEntity db = physicalSelectOnKey(itemNo, knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java
index 2775e5e4f..43e9727c1 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenSurveysDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -212,9 +213,9 @@ public SurveysEntity physicalInsert(SurveysEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public SurveysEntity insert(Integer user, SurveysEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -263,7 +264,7 @@ public SurveysEntity update(Integer user, SurveysEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -340,7 +341,7 @@ public void delete(Integer user, Long knowledgeId) {
         SurveysEntity db = selectOnKey(knowledgeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -389,7 +390,7 @@ public void activation(Integer user, Long knowledgeId) {
         SurveysEntity db = physicalSelectOnKey(knowledgeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
index 4cdba1926..3d0a4ace1 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -221,9 +222,9 @@ public TagsEntity physicalInsert(TagsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TagsEntity insert(Integer user, TagsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -271,7 +272,7 @@ public TagsEntity update(Integer user, TagsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -348,7 +349,7 @@ public void delete(Integer user, Integer tagId) {
         TagsEntity db = selectOnKey(tagId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -397,7 +398,7 @@ public void activation(Integer user, Integer tagId) {
         TagsEntity db = physicalSelectOnKey(tagId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
index c5b3678bd..4e2a0a3e3 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -260,9 +261,9 @@ public TemplateItemsEntity physicalInsert(TemplateItemsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TemplateItemsEntity insert(Integer user, TemplateItemsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -314,7 +315,7 @@ public TemplateItemsEntity update(Integer user, TemplateItemsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -393,7 +394,7 @@ public void delete(Integer user, Integer itemNo, Integer typeId) {
         TemplateItemsEntity db = selectOnKey(itemNo, typeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -444,7 +445,7 @@ public void activation(Integer user, Integer itemNo, Integer typeId) {
         TemplateItemsEntity db = physicalSelectOnKey(itemNo, typeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
index dcda456aa..3c877044d 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -227,9 +228,9 @@ public TemplateMastersEntity physicalInsert(TemplateMastersEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TemplateMastersEntity insert(Integer user, TemplateMastersEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -280,7 +281,7 @@ public TemplateMastersEntity update(Integer user, TemplateMastersEntity entity)
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -357,7 +358,7 @@ public void delete(Integer user, Integer typeId) {
         TemplateMastersEntity db = selectOnKey(typeId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -406,7 +407,7 @@ public void activation(Integer user, Integer typeId) {
         TemplateMastersEntity db = physicalSelectOnKey(typeId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java
index c6a66487e..de827e4b8 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTokensDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -212,9 +213,9 @@ public TokensEntity physicalInsert(TokensEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public TokensEntity insert(Integer user, TokensEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -263,7 +264,7 @@ public TokensEntity update(Integer user, TokensEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -340,7 +341,7 @@ public void delete(Integer user, String token) {
         TokensEntity db = selectOnKey(token);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -389,7 +390,7 @@ public void activation(Integer user, String token) {
         TokensEntity db = physicalSelectOnKey(token);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
index 34d535ce0..463d1d424 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenUserBadgesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -252,9 +253,9 @@ public UserBadgesEntity physicalInsert(UserBadgesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public UserBadgesEntity insert(Integer user, UserBadgesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -302,7 +303,7 @@ public UserBadgesEntity update(Integer user, UserBadgesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -381,7 +382,7 @@ public void delete(Integer user, Integer no, Integer userId) {
         UserBadgesEntity db = selectOnKey(no, userId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -432,7 +433,7 @@ public void activation(Integer user, Integer no, Integer userId) {
         UserBadgesEntity db = physicalSelectOnKey(no, userId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
index 41085af99..560af0970 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -223,9 +224,9 @@ public ViewHistoriesEntity physicalInsert(ViewHistoriesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public ViewHistoriesEntity insert(Integer user, ViewHistoriesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -274,7 +275,7 @@ public ViewHistoriesEntity update(Integer user, ViewHistoriesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -351,7 +352,7 @@ public void delete(Integer user, Long historyNo) {
         ViewHistoriesEntity db = selectOnKey(historyNo);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -400,7 +401,7 @@ public void activation(Integer user, Long historyNo) {
         ViewHistoriesEntity db = physicalSelectOnKey(historyNo);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
index 66422d11b..c9972c6d4 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -223,9 +224,9 @@ public VotesEntity physicalInsert(VotesEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public VotesEntity insert(Integer user, VotesEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -274,7 +275,7 @@ public VotesEntity update(Integer user, VotesEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -351,7 +352,7 @@ public void delete(Integer user, Long voteNo) {
         VotesEntity db = selectOnKey(voteNo);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -400,7 +401,7 @@ public void activation(Integer user, Long voteNo) {
         VotesEntity db = physicalSelectOnKey(voteNo);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
index 4c7d0648b..0bcd8c7e3 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -223,9 +224,9 @@ public WebhookConfigsEntity physicalInsert(WebhookConfigsEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public WebhookConfigsEntity insert(Integer user, WebhookConfigsEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -274,7 +275,7 @@ public WebhookConfigsEntity update(Integer user, WebhookConfigsEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -351,7 +352,7 @@ public void delete(Integer user, Integer hookId) {
         WebhookConfigsEntity db = selectOnKey(hookId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -400,7 +401,7 @@ public void activation(Integer user, Integer hookId) {
         WebhookConfigsEntity db = physicalSelectOnKey(hookId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java
index b59db8fd9..7cd9c73b8 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhooksDao.java
@@ -15,6 +15,7 @@
 import org.support.project.ormapping.config.Order;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
 
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -214,9 +215,9 @@ public WebhooksEntity physicalInsert(WebhooksEntity entity) {
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public WebhooksEntity insert(Integer user, WebhooksEntity entity) {
         entity.setInsertUser(user);
-        entity.setInsertDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         entity.setDeleteFlag(0);
         return physicalInsert(entity);
     }
@@ -266,7 +267,7 @@ public WebhooksEntity update(Integer user, WebhooksEntity entity) {
         entity.setInsertDatetime(db.getInsertDatetime());
         entity.setDeleteFlag(db.getDeleteFlag());
         entity.setUpdateUser(user);
-        entity.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         return physicalUpdate(entity);
     }
     /**
@@ -343,7 +344,7 @@ public void delete(Integer user, String webhookId) {
         WebhooksEntity db = selectOnKey(webhookId);
         db.setDeleteFlag(1);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
@@ -392,7 +393,7 @@ public void activation(Integer user, String webhookId) {
         WebhooksEntity db = physicalSelectOnKey(webhookId);
         db.setDeleteFlag(0);
         db.setUpdateUser(user);
-        db.setUpdateDatetime(new Timestamp(new java.util.Date().getTime()));
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
         physicalUpdate(db);
     }
     /**
diff --git a/src/main/java/org/support/project/knowledge/filter/ApiFilter.java b/src/main/java/org/support/project/knowledge/filter/ApiFilter.java
index 5f4b84351..c168bacd2 100644
--- a/src/main/java/org/support/project/knowledge/filter/ApiFilter.java
+++ b/src/main/java/org/support/project/knowledge/filter/ApiFilter.java
@@ -14,6 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.support.project.common.util.DateUtils;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.knowledge.dao.TokensDao;
@@ -90,7 +91,7 @@ public void doFilter(ServletRequest servletrequest, ServletResponse servletrespo
             res.sendError(HttpStatus.SC_403_FORBIDDEN);
             return;
         }
-        Date now = new Date();
+        Date now = DateUtils.now();
         if (now.getTime() > tokensEntity.getExpires().getTime()) {
             res.sendError(HttpStatus.SC_403_FORBIDDEN);
             return;
diff --git a/src/main/java/org/support/project/knowledge/logic/AccountLogic.java b/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
index 541f893b5..b0995c5c8 100644
--- a/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
@@ -141,7 +141,7 @@ private UploadFile convUploadFile(String context, AccountImagesEntity entity) {
         UploadFile file = new UploadFile();
         file.setFileNo(new Long(entity.getUserId()));
         file.setUrl(context + "/open.account/icon/" + entity.getUserId());
-        file.setThumbnailUrl(context + "/open.account/icon/" + entity.getUserId() + "?t=" + new Date().getTime());
+        file.setThumbnailUrl(context + "/open.account/icon/" + entity.getUserId() + "?t=" + DateUtils.now().getTime());
         file.setName(entity.getFileName());
         file.setType("-");
         file.setSize(entity.getFileSize());
@@ -203,7 +203,7 @@ private String idGen(String label) {
         StringBuilder builder = new StringBuilder();
         builder.append(label);
         builder.append("-");
-        builder.append(DateUtils.getTransferDateFormat().format(new Date()));
+        builder.append(DateUtils.getTransferDateFormat().format(DateUtils.now()));
         builder.append("-");
         builder.append(UUID.randomUUID().toString());
         builder.append("-");
diff --git a/src/main/java/org/support/project/knowledge/logic/DataTransferLogic.java b/src/main/java/org/support/project/knowledge/logic/DataTransferLogic.java
index 32c61491f..1b0804cd4 100644
--- a/src/main/java/org/support/project/knowledge/logic/DataTransferLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/DataTransferLogic.java
@@ -313,7 +313,7 @@ public void backupAndInitH2() throws IOException {
         AppConfig appConfig = AppConfig.get();
         Path source = Paths.get(appConfig.getDatabasePath());
         if (Files.exists(source)) {
-            Path target = Paths.get(appConfig.getBasePath() + "/db_" + DateUtils.getTransferDateFormat().format(new Date()));
+            Path target = Paths.get(appConfig.getBasePath() + "/db_" + DateUtils.getTransferDateFormat().format(DateUtils.now()));
             Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
         }
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/DatabaseLogic.java b/src/main/java/org/support/project/knowledge/logic/DatabaseLogic.java
index 578c31201..09a5998f9 100644
--- a/src/main/java/org/support/project/knowledge/logic/DatabaseLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/DatabaseLogic.java
@@ -44,7 +44,7 @@ public static DatabaseLogic get() {
     public FileInputStreamWithDeleteWrapper getData() throws IOException {
         AppConfig config = ConfigLoader.load(AppConfig.APP_CONFIG, AppConfig.class);
         File tmpDir = new File(config.getTmpPath());
-        String name = "knowledge-" + DateUtils.formatTransferDateTime(new Date()) + ".zip";
+        String name = "knowledge-" + DateUtils.formatTransferDateTime(DateUtils.now()) + ".zip";
         File tmp = new File(tmpDir, name);
 
         BufferedOutputStream output = null;
@@ -81,7 +81,7 @@ public List<ValidateError> restore(FileItem fileItem) throws IOException {
         List<ValidateError> errors = new ArrayList<ValidateError>();
         AppConfig config = ConfigLoader.load(AppConfig.APP_CONFIG, AppConfig.class);
         File tmpDir = new File(config.getTmpPath());
-        String name = "knowledge-restore-" + DateUtils.formatTransferDateTime(new Date()) + "";
+        String name = "knowledge-restore-" + DateUtils.formatTransferDateTime(DateUtils.now()) + "";
         File tmp = new File(tmpDir, name);
         if (tmp.exists() && !tmp.isDirectory()) {
             errors.add(new ValidateError("knowledge.data.label.msg.fail"));
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index 6b7bf9506..a7400a7ae 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -13,6 +13,7 @@
 import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.DateUtils;
 import org.support.project.common.util.HtmlUtils;
 import org.support.project.common.util.PropertyUtil;
 import org.support.project.common.util.StringJoinBuilder;
@@ -1102,7 +1103,7 @@ public void addViewHistory(Long knowledgeId, LoginedUser loginedUser) {
         ViewHistoriesDao historiesDao = ViewHistoriesDao.get();
         ViewHistoriesEntity historiesEntity = new ViewHistoriesEntity();
         historiesEntity.setKnowledgeId(knowledgeId);
-        historiesEntity.setViewDateTime(new Timestamp(new Date().getTime()));
+        historiesEntity.setViewDateTime(new Timestamp(DateUtils.now().getTime()));
         if (loginedUser != null) {
             historiesEntity.setInsertUser(loginedUser.getUserId());
         } else {
@@ -1491,7 +1492,7 @@ public boolean isEditor(LoginedUser loginedUser, KnowledgesEntity entity, List<L
      * @return
      */
     public List<KnowledgesEntity> getPopularityKnowledges(LoginedUser loginedUser, int offset, int limit) {
-        long now = new Date().getTime();
+        long now = DateUtils.now().getTime();
         LOG.trace(now);
 
         long term = 1000L * 60L * 60L * 24L * 30L;
diff --git a/src/main/java/org/support/project/knowledge/logic/LogManageLogic.java b/src/main/java/org/support/project/knowledge/logic/LogManageLogic.java
index 484bf56a1..153141c5d 100644
--- a/src/main/java/org/support/project/knowledge/logic/LogManageLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/LogManageLogic.java
@@ -9,6 +9,7 @@
 import org.apache.commons.io.FilenameUtils;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.DateUtils;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.knowledge.config.AppConfig;
@@ -60,7 +61,7 @@ public void clearLogFiles() {
             long term = 1000 * 60 * 60 * 24 * days;
             File[] logs = logFiles();
 
-            Date now = new Date();
+            Date now = DateUtils.now();
             if (logs != null) {
                 for (File file : logs) {
                     if (now.getTime() - file.lastModified() > term) {
diff --git a/src/main/java/org/support/project/knowledge/logic/MailLogic.java b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
index ddbf945d3..52b1d0bcf 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
@@ -312,7 +312,7 @@ private void mailSend(Session session, MailConfigsEntity config, MailsEntity ent
         // メールの形式を指定
         // mimeMessage.setHeader( "Content-Type", "text/html" );
         // 送信日付を指定
-        mimeMessage.setSentDate(new Date());
+        mimeMessage.setSentDate(DateUtils.now());
 
         Transport.send(mimeMessage);
         LOG.debug("Mail sended.");
@@ -327,7 +327,7 @@ public String idGen(String label) {
         StringBuilder builder = new StringBuilder();
         builder.append(label);
         builder.append("-");
-        builder.append(DateUtils.getSimpleFormat().format(new Date()));
+        builder.append(DateUtils.getSimpleFormat().format(DateUtils.now()));
         builder.append("-");
         builder.append(UUID.randomUUID().toString());
         return builder.toString();
diff --git a/src/main/java/org/support/project/knowledge/logic/MarkdownLogic.java b/src/main/java/org/support/project/knowledge/logic/MarkdownLogic.java
index 9fa41213c..506c663b2 100644
--- a/src/main/java/org/support/project/knowledge/logic/MarkdownLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MarkdownLogic.java
@@ -20,6 +20,7 @@
 import org.support.project.common.exception.ParseException;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.DateUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -107,7 +108,7 @@ private MarkDown sanitize(String markdown, MarkDown result) throws ParseExceptio
      * @param result
      */
     private void markdownToHtmlOnMarkedJ(String markdown, MarkDown result) {
-        Date start = new Date();
+        Date start = DateUtils.now();
 
         Options options = new Options();
         options.setBreaks(true);
@@ -121,7 +122,7 @@ private void markdownToHtmlOnMarkedJ(String markdown, MarkDown result) {
         result.setMarkdown(markdown);
 
         if (LOG.isDebugEnabled()) {
-            Date end = new Date();
+            Date end = DateUtils.now();
             // 以前、別のMarkdownパーサーのパースが凄く時間がかかったので、パース時間を出力している
             LOG.debug("Parse time (MarkedJ): " + (end.getTime() - start.getTime()) + " [ms]");
         }
diff --git a/src/main/java/org/support/project/knowledge/logic/UploadedFileLogic.java b/src/main/java/org/support/project/knowledge/logic/UploadedFileLogic.java
index e6a932983..ab8ed72d6 100644
--- a/src/main/java/org/support/project/knowledge/logic/UploadedFileLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/UploadedFileLogic.java
@@ -84,7 +84,7 @@ public UploadFile saveFile(FileItem fileItem, LoginedUser loginedUser, String co
     public UploadFile saveFile(byte[] img, LoginedUser loginedUser, String context) {
         LOG.trace("saveFile()");
         KnowledgeFilesEntity entity = new KnowledgeFilesEntity();
-        entity.setFileName("image-" + DateUtils.formatTransferDateTime(new Date()) + ".png");
+        entity.setFileName("image-" + DateUtils.formatTransferDateTime(DateUtils.now()) + ".png");
         entity.setFileSize(new Double(img.length));
         entity.setFileBinary(new ByteArrayInputStream(img));
         entity.setParseStatus(0);
diff --git a/src/test/java/org/support/project/knowledge/logic/MailEventLogicTest.java b/src/test/java/org/support/project/knowledge/logic/MailEventLogicTest.java
index 6fde4638c..a976e1028 100644
--- a/src/test/java/org/support/project/knowledge/logic/MailEventLogicTest.java
+++ b/src/test/java/org/support/project/knowledge/logic/MailEventLogicTest.java
@@ -18,6 +18,7 @@
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.test.Order;
+import org.support.project.common.util.DateUtils;
 import org.support.project.knowledge.TestCommon;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.SystemConfig;
@@ -274,14 +275,14 @@ public void testNotifyEvents3() throws Exception {
         stock.setStockId(new Long(1));
         stock.setKnowledgeId(knowledge.getKnowledgeId());
         stock.setInsertUser(loginedUser.getUserId());
-        stock.setInsertDatetime(new Timestamp(new Date().getTime()));
+        stock.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         stock.setDeleteFlag(0);
         StockKnowledgesDao.get().rawPhysicalInsert(stock);
         stock = new StockKnowledgesEntity();
         stock.setStockId(new Long(2));
         stock.setKnowledgeId(knowledge.getKnowledgeId());
         stock.setInsertUser(loginedUser.getUserId());
-        stock.setInsertDatetime(new Timestamp(new Date().getTime()));
+        stock.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
         stock.setDeleteFlag(0);
         StockKnowledgesDao.get().rawPhysicalInsert(stock);
         
diff --git a/src/test/java/org/support/project/knowledge/searcher/SearchTest.java b/src/test/java/org/support/project/knowledge/searcher/SearchTest.java
index 2371e5cf2..c892e2d0c 100644
--- a/src/test/java/org/support/project/knowledge/searcher/SearchTest.java
+++ b/src/test/java/org/support/project/knowledge/searcher/SearchTest.java
@@ -14,6 +14,7 @@
 import org.support.project.common.config.ConfigLoader;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.DateUtils;
 import org.support.project.common.util.FileUtil;
 import org.support.project.common.util.PropertyUtil;
 import org.support.project.common.util.RandomUtil;
@@ -57,7 +58,7 @@ public void testSearch1() throws Exception {
         indexingValue.setTitle(title);
         indexingValue.setContents(contents);
         indexingValue.setCreator(100);
-        indexingValue.setTime(new Date().getTime());
+        indexingValue.setTime(DateUtils.now().getTime());
 
         Indexer indexer = Container.getComp(Indexer.class);
         indexer.writeIndex(indexingValue);
@@ -84,7 +85,7 @@ public void testSearch1() throws Exception {
         indexingValue.setTitle(title);
         indexingValue.setContents(contents);
         indexingValue.setCreator(100);
-        indexingValue.setTime(new Date().getTime());
+        indexingValue.setTime(DateUtils.now().getTime());
 
         indexer.writeIndex(indexingValue);
 
@@ -108,7 +109,7 @@ public void testSearch2() throws Exception {
         indexingValue.setContents(contents);
         indexingValue.addUser(0);
         indexingValue.setCreator(100);
-        indexingValue.setTime(new Date().getTime());
+        indexingValue.setTime(DateUtils.now().getTime());
 
         Indexer indexer = Container.getComp(Indexer.class);
         indexer.writeIndex(indexingValue);
@@ -177,7 +178,7 @@ public void testSearch3() throws Exception {
         indexingValue.addGroup(100);
         ;
         indexingValue.setCreator(100);
-        indexingValue.setTime(new Date().getTime());
+        indexingValue.setTime(DateUtils.now().getTime());
 
         Indexer indexer = Container.getComp(Indexer.class);
         indexer.writeIndex(indexingValue);
@@ -227,7 +228,7 @@ public void testSearch4() throws Exception {
         indexingValue.addUser(100);
         indexingValue.addGroup(100);
         indexingValue.setCreator(100);
-        indexingValue.setTime(new Date().getTime());
+        indexingValue.setTime(DateUtils.now().getTime());
         indexingValue.setTemplate(1);
         indexer.writeIndex(indexingValue);
 
@@ -239,7 +240,7 @@ public void testSearch4() throws Exception {
         indexingValue2.addUser(100);
         indexingValue2.addGroup(100);
         indexingValue2.setCreator(100);
-        indexingValue2.setTime(new Date().getTime());
+        indexingValue2.setTime(DateUtils.now().getTime());
         indexingValue2.setTemplate(2);
         indexer.writeIndex(indexingValue);
         

From b26f12de53842b7d9471f3351889e780009c2b7d Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 17 Sep 2017 11:54:08 +0900
Subject: [PATCH 076/138] Add integration test

---
 .../support/project/knowledge/TestCommon.java |  54 +++++-
 .../integration/Integration01Test.java        | 173 ++++++++++++++++++
 2 files changed, 225 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/integration/Integration01Test.java

diff --git a/src/test/java/org/support/project/knowledge/TestCommon.java b/src/test/java/org/support/project/knowledge/TestCommon.java
index f8e66ca0d..b0742e249 100644
--- a/src/test/java/org/support/project/knowledge/TestCommon.java
+++ b/src/test/java/org/support/project/knowledge/TestCommon.java
@@ -11,6 +11,7 @@
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.support.project.common.config.ConfigLoader;
+import org.support.project.common.config.INT_FLAG;
 import org.support.project.common.exception.SerializeException;
 import org.support.project.common.logic.H2DBServerLogic;
 import org.support.project.common.serialize.SerializeUtils;
@@ -22,8 +23,10 @@
 import org.support.project.knowledge.deploy.InitDB;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.UserLogicEx;
 import org.support.project.knowledge.vo.KnowledgeData;
 import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.ormapping.common.IDGen;
 import org.support.project.ormapping.connection.ConnectionManager;
 import org.support.project.ormapping.tool.config.ORmappingToolConfig;
 import org.support.project.web.bean.LoginedUser;
@@ -172,12 +175,14 @@ public static void initData() throws Exception {
     
     /**
      * テストユーザの情報を生成
+     * 直接ユーザテーブルにデータを入れているため、通知設定などが設定されない
+     * 古いテスト用（現在は使わないこと）
      * @param user
      * @param userName
      * @param roleIds
      * @return
      */
-    protected static List<RolesEntity> addUser(LoginedUser user, String userName, Integer[] roleIds) {
+    private static List<RolesEntity> addUser(LoginedUser user, String userName, Integer[] roleIds) {
         // テスト用のユーザを登録
         UsersEntity entity = new UsersEntity();
         entity.setUserKey(RandomUtil.randamGen(64));
@@ -198,7 +203,13 @@ protected static List<RolesEntity> addUser(LoginedUser user, String userName, In
         user.setRoles(rolesEntities);
         return rolesEntities;
     }
-
+    /**
+     * ナレッジを登録
+     * @param title
+     * @param loginedUser
+     * @return
+     * @throws Exception
+     */
     protected KnowledgesEntity insertKnowledge(String title, LoginedUser loginedUser) throws Exception {
         KnowledgesEntity entity = new KnowledgesEntity();
         entity.setTitle(title);
@@ -211,4 +222,43 @@ protected KnowledgesEntity insertKnowledge(String title, LoginedUser loginedUser
         return entity;
     }
     
+    /**
+     * ユーザの登録
+     * @param userKey
+     * @return
+     */
+    protected UsersEntity addUser(String userKey) {
+        UsersEntity user = new UsersEntity();
+        user.setAuthLdap(INT_FLAG.OFF.getValue());
+        user.setEncrypted(false);
+        user.setUserKey(userKey);
+        user.setLocaleKey(Locale.JAPAN.toString());
+        user.setMailAddress("test@example.com");
+        user.setUserName("Integration Test User 01");
+        user.setPassword(IDGen.get().gen("hoge"));
+        String[] roles = {"user"};
+        return UserLogicEx.get().insert(user, roles);
+    }
+    /**
+     * 登録されているユーザのログインユーザ情報を取得
+     * @param userKey
+     * @return
+     */
+    protected LoginedUser getLoginUser(String userKey) {
+        UsersDao usersDao = UsersDao.get();
+        UsersEntity usersEntity = usersDao.selectOnUserKey(userKey);
+        RolesDao rolesDao = RolesDao.get();
+        List<RolesEntity> rolesEntities = rolesDao.selectOnUserKey(userKey);
+
+        LoginedUser loginedUser = new LoginedUser();
+        loginedUser.setLoginUser(usersEntity);
+        loginedUser.setRoles(rolesEntities);
+        loginedUser.setLocale(usersEntity.getLocale());
+
+        // グループ
+        GroupsDao groupsDao = GroupsDao.get();
+        List<GroupsEntity> groups = groupsDao.selectMyGroup(loginedUser, 0, Integer.MAX_VALUE);
+        loginedUser.setGroups(groups);
+        return loginedUser;
+   }
 }
diff --git a/src/test/java/org/support/project/knowledge/integration/Integration01Test.java b/src/test/java/org/support/project/knowledge/integration/Integration01Test.java
new file mode 100644
index 000000000..6292f1419
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/Integration01Test.java
@@ -0,0 +1,173 @@
+package org.support.project.knowledge.integration;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.test.OrderedRunner;
+import org.support.project.knowledge.TestCommon;
+import org.support.project.knowledge.bat.NotifyMailBat;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.AuthType;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.NotifyConfigsDao;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.NotifyConfigsEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.notification.QueueNotification;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.UserNotificationsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.MailsEntity;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UserNotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+@RunWith(OrderedRunner.class)
+public class Integration01Test extends TestCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(Integration01Test.class);
+    
+    private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
+    
+    /**
+     * ユーザを2つ登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        UsersEntity user = addUser("integration-test-user-01");
+        UsersEntity check = UsersDao.get().selectOnUserKey(user.getUserKey());
+        Assert.assertNotNull(check);
+        Assert.assertEquals(user.getUserKey(), check.getUserKey());
+        Assert.assertEquals(user.getLocaleKey(), check.getLocaleKey());
+        Assert.assertEquals(user.getMailAddress(), check.getMailAddress());
+        Assert.assertEquals(user.getUserName(), check.getUserName());
+        
+        UsersEntity user2 = addUser("integration-test-user-02");
+        check = UsersDao.get().selectOnUserKey(user2.getUserKey());
+        Assert.assertNotNull(check);
+        Assert.assertEquals(user2.getUserKey(), check.getUserKey());
+        Assert.assertEquals(user2.getLocaleKey(), check.getLocaleKey());
+        Assert.assertEquals(user2.getMailAddress(), check.getMailAddress());
+        Assert.assertEquals(user2.getUserName(), check.getUserName());
+    }
+    
+    /**
+     * 登録されたユーザの通知設定を参照
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 2)
+    public void testCheckNotify() throws Exception {
+        LOG.info("通知設定確認");
+        testCheckNotify("integration-test-user-01");
+        testCheckNotify("integration-test-user-02");
+    }
+    private void testCheckNotify(String key) {
+        UsersEntity user = UsersDao.get().selectOnUserKey(key);
+        NotifyConfigsEntity notify = NotifyConfigsDao.get().selectOnKey(user.getUserId());
+        //LOG.info(notify.toString());
+        Assert.assertNotNull(notify);
+        Assert.assertEquals(1, notify.getNotifyMail().intValue());
+        Assert.assertEquals(0, notify.getNotifyDesktop().intValue());
+        Assert.assertEquals(1, notify.getMyItemComment().intValue());
+        Assert.assertEquals(1, notify.getMyItemLike().intValue());
+        Assert.assertEquals(1, notify.getMyItemStock().intValue());
+        Assert.assertEquals(1, notify.getToItemSave().intValue());
+        Assert.assertEquals(1, notify.getToItemComment().intValue());
+        Assert.assertEquals(0, notify.getToItemIgnorePublic().intValue());
+        Assert.assertEquals(0, notify.getStockItemSave().intValue());
+        Assert.assertEquals(0, notify.getStokeItemComment().intValue());
+    }
+
+    /**
+     * 記事を登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 3)
+    public void testInsertKnowledge() throws Exception {
+        LOG.info("記事投稿");
+        LoginedUser loginUser = getLoginUser("integration-test-user-01");
+        DBUserPool.get().setUser(loginUser.getUserId()); // 操作ユーザのIDを指定
+        
+        KnowledgesEntity knowledge = super.insertKnowledge("integration-test-knowledge-01", loginUser);
+        
+        KnowledgesEntity check = KnowledgesDao.get().selectOnKey(knowledge.getKnowledgeId());
+        Assert.assertNotNull(check);
+        Assert.assertEquals(knowledge.getKnowledgeId(), check.getKnowledgeId());
+        Assert.assertEquals("integration-test-knowledge-01", check.getTitle());
+        Assert.assertEquals(loginUser.getUserId(), check.getInsertUser());
+        knowledgeId = knowledge.getKnowledgeId();
+    }
+    
+    /**
+     * 通知情報が登録されていることを確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 4)
+    public void testCheckNotifyQueue() throws Exception {
+        LOG.info("通知キュー確認");
+        NotifyQueuesEntity notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
+        Assert.assertNotNull(notify);
+    }
+    
+    /**
+     * 通知を処理
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 5)
+    public void testExecNotifyQueue() throws Exception {
+        LOG.info("通知キューを処理");
+        MailConfigsEntity mailConfig = new MailConfigsEntity(AppConfig.get().getSystemName());
+        mailConfig.setHost("example.com");
+        mailConfig.setPort(25);
+        mailConfig.setAuthType(AuthType.None.getValue());
+        MailConfigsDao.get().insert(mailConfig); // メール送信設定
+        
+        NotifyMailBat.main(null);
+        NotifyQueuesEntity notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
+        Assert.assertNull(notify);
+    }
+    
+    /**
+     * ユーザに通知が届いていることを確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 6)
+    public void tesCheckUserNotification() throws Exception {
+        LOG.info("通知確認");
+        NotificationsEntity notification = NotificationsDao.get().selectOnKey(new Long(1)); // 1件だけ通知が登録されているはず
+        Assert.assertNotNull(notification);
+        Assert.assertEquals(MailLogic.NOTIFY_INSERT_KNOWLEDGE, notification.getTitle());
+        
+        UsersEntity user = UsersDao.get().selectOnUserKey("integration-test-user-01");
+        UserNotificationsEntity userNotification = UserNotificationsDao.get().selectOnKey(notification.getNo(), user.getUserId());
+        Assert.assertNotNull(userNotification);
+        user = UsersDao.get().selectOnUserKey("integration-test-user-02");
+        userNotification = UserNotificationsDao.get().selectOnKey(notification.getNo(), user.getUserId());
+        Assert.assertNotNull(userNotification);
+        
+        int count = MailsDao.get().selectCountAll();
+        Assert.assertEquals(2, count);
+    }
+    
+    
+    
+    
+}

From 401c171c78b84a4812b7087d80473b042025dc0e Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 17 Sep 2017 20:30:30 +0900
Subject: [PATCH 077/138] Add integration test

---
 .../integration/Integration01Test.java        | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/support/project/knowledge/integration/Integration01Test.java b/src/test/java/org/support/project/knowledge/integration/Integration01Test.java
index 6292f1419..a7e1220e4 100644
--- a/src/test/java/org/support/project/knowledge/integration/Integration01Test.java
+++ b/src/test/java/org/support/project/knowledge/integration/Integration01Test.java
@@ -1,5 +1,7 @@
 package org.support.project.knowledge.integration;
 
+import java.util.List;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,6 +19,7 @@
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.NotifyConfigsEntity;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.knowledge.logic.MailLogic;
 import org.support.project.knowledge.logic.notification.QueueNotification;
 import org.support.project.ormapping.common.DBUserPool;
@@ -27,7 +30,6 @@
 import org.support.project.web.dao.UserNotificationsDao;
 import org.support.project.web.dao.UsersDao;
 import org.support.project.web.entity.MailConfigsEntity;
-import org.support.project.web.entity.MailsEntity;
 import org.support.project.web.entity.NotificationsEntity;
 import org.support.project.web.entity.UserNotificationsEntity;
 import org.support.project.web.entity.UsersEntity;
@@ -150,7 +152,7 @@ public void testExecNotifyQueue() throws Exception {
      */
     @Test
     @Order(order = 6)
-    public void tesCheckUserNotification() throws Exception {
+    public void testCheckUserNotification() throws Exception {
         LOG.info("通知確認");
         NotificationsEntity notification = NotificationsDao.get().selectOnKey(new Long(1)); // 1件だけ通知が登録されているはず
         Assert.assertNotNull(notification);
@@ -167,7 +169,30 @@ public void tesCheckUserNotification() throws Exception {
         Assert.assertEquals(2, count);
     }
     
-    
+    /**
+     * 記事を参照できる
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 7)
+    public void testKnowledgeView() throws Exception {
+        LOG.info("通知確認");
+        LoginedUser user = getLoginUser("integration-test-user-01");
+        List<KnowledgesEntity> knowledges = KnowledgeLogic.get().searchKnowledge(null, user, 0, 100);
+        Assert.assertEquals(1, knowledges.size());
+        
+        KnowledgesEntity knowledge = KnowledgeLogic.get().select(knowledges.get(0).getKnowledgeId(), user);
+        Assert.assertNotNull(knowledge);
+        Assert.assertEquals(knowledgeId, knowledge.getKnowledgeId().intValue());
+        
+        user = getLoginUser("integration-test-user-02");
+        knowledges = KnowledgeLogic.get().searchKnowledge(null, user, 0, 100);
+        Assert.assertEquals(1, knowledges.size());
+        
+        knowledge = KnowledgeLogic.get().select(knowledges.get(0).getKnowledgeId(), user);
+        Assert.assertNotNull(knowledge);
+        Assert.assertEquals(knowledgeId, knowledge.getKnowledgeId().intValue());
+    }
     
     
 }

From 9f59ff55b0c2b95f7429cdb54639163a51912745 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 18 Sep 2017 20:06:13 +0900
Subject: [PATCH 078/138] Add coverage report on jacoco to pom.xml

---
 pom.xml | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad97f4b40..6fb35819b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.support-project</groupId>
     <artifactId>knowledge</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
+    <version>1.11.1-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>knowledge</name>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.support-project</groupId>
             <artifactId>web</artifactId>
-            <version>1.11.0-SNAPSHOT</version>
+            <version>1.11.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -271,6 +271,48 @@
                     </execution>
                 </executions>
             </plugin>
+            
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.9</version>
+                <executions>
+                    <execution>
+                        <id>default-prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-report</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-check</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <rule implementation="org.jacoco.maven.RuleConfiguration">
+                                    <element>BUNDLE</element>
+                                    <limits>
+                                        <limit implementation="org.jacoco.report.check.Limit">
+                                            <counter>COMPLEXITY</counter>
+                                            <value>COVEREDRATIO</value>
+                                            <minimum>0.01</minimum>
+                                        </limit>
+                                    </limits>
+                                </rule>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
         </plugins>
     </build>
 
@@ -321,6 +363,24 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>report</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/deploy/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
         </plugins>
     </reporting>
 

From a4291b5f77803d5dba975085385773fc2b0cc7e9 Mon Sep 17 00:00:00 2001
From: koda <koda.masaru3@gmail.com>
Date: Tue, 19 Sep 2017 21:30:05 +0900
Subject: [PATCH 079/138] Add integration test

---
 .../knowledge/indexer/impl/LuceneIndexer.java |   1 +
 .../support/project/knowledge/TestCommon.java |  48 ++++-
 .../integration/Integration01Test.java        |   7 +-
 .../integration/Integration02Test.java        | 186 ++++++++++++++++++
 .../integration/Integration03Test.java        | 174 ++++++++++++++++
 .../integration/Integration04Test.java        | 162 +++++++++++++++
 6 files changed, 573 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/integration/Integration02Test.java
 create mode 100644 src/test/java/org/support/project/knowledge/integration/Integration03Test.java
 create mode 100644 src/test/java/org/support/project/knowledge/integration/Integration04Test.java

diff --git a/src/main/java/org/support/project/knowledge/indexer/impl/LuceneIndexer.java b/src/main/java/org/support/project/knowledge/indexer/impl/LuceneIndexer.java
index f37451b91..1cfc758d8 100644
--- a/src/main/java/org/support/project/knowledge/indexer/impl/LuceneIndexer.java
+++ b/src/main/java/org/support/project/knowledge/indexer/impl/LuceneIndexer.java
@@ -72,6 +72,7 @@ public void writeIndex(IndexingValue indexingValue) throws Exception {
             try {
                 writer = new IndexWriter(dir, iwc);
                 addDoc(writer, indexingValue);
+                writer.commit();
             } finally {
                 if (writer != null) {
                     writer.close();
diff --git a/src/test/java/org/support/project/knowledge/TestCommon.java b/src/test/java/org/support/project/knowledge/TestCommon.java
index b0742e249..0976c59ac 100644
--- a/src/test/java/org/support/project/knowledge/TestCommon.java
+++ b/src/test/java/org/support/project/knowledge/TestCommon.java
@@ -5,6 +5,14 @@
 import java.util.List;
 import java.util.Locale;
 
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.ja.JapaneseAnalyzer;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.Version;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -13,16 +21,19 @@
 import org.support.project.common.config.ConfigLoader;
 import org.support.project.common.config.INT_FLAG;
 import org.support.project.common.exception.SerializeException;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
 import org.support.project.common.logic.H2DBServerLogic;
 import org.support.project.common.serialize.SerializeUtils;
 import org.support.project.common.test.OrderedRunner;
-import org.support.project.common.util.FileUtil;
 import org.support.project.common.util.RandomUtil;
+import org.support.project.common.util.StringUtils;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.dao.gen.DatabaseControlDao;
 import org.support.project.knowledge.deploy.InitDB;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.TemplateLogic;
 import org.support.project.knowledge.logic.UserLogicEx;
 import org.support.project.knowledge.vo.KnowledgeData;
 import org.support.project.ormapping.common.DBUserPool;
@@ -48,6 +59,9 @@
  */
 @RunWith(OrderedRunner.class)
 public abstract class TestCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(TestCommon.class);
+
     public static final String KNOWLEDGE_TEST_HOME = "KNOWLEDGE_TEST_HOME";
     /** login user for test */
     public static LoginedUser loginedUser = null;
@@ -121,6 +135,7 @@ public static void testConnection() throws SerializeException, IOException {
      * @throws Exception
      */
     public static void initData() throws Exception {
+        LOG.info("init data");
         loginedUser = new LoginedUser();
         loginedUser2 = new LoginedUser();
         loginedUser3 = new LoginedUser();
@@ -143,9 +158,22 @@ public static void initData() throws Exception {
         InitDB.main(new String[0]);
         
         // 全文検索エンジンのインデックスの消去
+        Analyzer analyzer = new JapaneseAnalyzer();
         AppConfig appConfig = ConfigLoader.load(AppConfig.APP_CONFIG, AppConfig.class);
         File indexDir = new File(appConfig.getIndexPath());
-        FileUtil.delete(indexDir);
+        Directory dir = FSDirectory.open(indexDir);
+        IndexWriterConfig iwc = new IndexWriterConfig(Version.LUCENE_4_10_2, analyzer);
+        iwc.setOpenMode(OpenMode.CREATE_OR_APPEND);
+        IndexWriter writer = null;
+        try {
+            writer = new IndexWriter(dir, iwc);
+            writer.deleteAll();
+            writer.commit();
+        } finally {
+            if (writer != null) {
+                writer.close();
+            }
+        }
         
         Integer[] rolesAdmin = {1}; // 2はユーザ、1はAdmin
         Integer[] roles = {2}; // 2はユーザ、1はAdmin
@@ -211,13 +239,25 @@ private static List<RolesEntity> addUser(LoginedUser user, String userName, Inte
      * @throws Exception
      */
     protected KnowledgesEntity insertKnowledge(String title, LoginedUser loginedUser) throws Exception {
+        int publicFlag = KnowledgeLogic.PUBLIC_FLAG_PUBLIC;
+        int typeId = TemplateLogic.TYPE_ID_KNOWLEDGE;
+        return insertKnowledge(title, loginedUser, typeId, publicFlag);
+    }
+    protected KnowledgesEntity insertKnowledge(String title, LoginedUser loginedUser, int typeId, int publicFlag) throws Exception {
+        String viewersStr = "";
+        return insertKnowledge(title, loginedUser, typeId, publicFlag, viewersStr);
+    }
+    protected KnowledgesEntity insertKnowledge(String title, LoginedUser loginedUser, int typeId, int publicFlag, String viewersStr) throws Exception {
         KnowledgesEntity entity = new KnowledgesEntity();
         entity.setTitle(title);
         entity.setContent("contens of " + title);
-        entity.setTypeId(-100);
-        entity.setPublicFlag(KnowledgeLogic.PUBLIC_FLAG_PUBLIC);
+        entity.setTypeId(typeId);
+        entity.setPublicFlag(publicFlag);
         KnowledgeData data = new KnowledgeData();
         data.setKnowledge(entity);
+        if (StringUtils.isNotEmpty(viewersStr)) {
+            data.setViewers(viewersStr);
+        }
         entity = KnowledgeLogic.get().insert(data, loginedUser);
         return entity;
     }
diff --git a/src/test/java/org/support/project/knowledge/integration/Integration01Test.java b/src/test/java/org/support/project/knowledge/integration/Integration01Test.java
index a7e1220e4..fc6045683 100644
--- a/src/test/java/org/support/project/knowledge/integration/Integration01Test.java
+++ b/src/test/java/org/support/project/knowledge/integration/Integration01Test.java
@@ -34,6 +34,11 @@
 import org.support.project.web.entity.UserNotificationsEntity;
 import org.support.project.web.entity.UsersEntity;
 
+
+/**
+ * ユーザを2つ追加し、片方のユーザで公開のKnowledgeを登録し、通知や記事が参照できることを確認する
+ * @author koda
+ */
 @RunWith(OrderedRunner.class)
 public class Integration01Test extends TestCommon {
     /** ログ */
@@ -176,7 +181,7 @@ public void testCheckUserNotification() throws Exception {
     @Test
     @Order(order = 7)
     public void testKnowledgeView() throws Exception {
-        LOG.info("通知確認");
+        LOG.info("記事を参照");
         LoginedUser user = getLoginUser("integration-test-user-01");
         List<KnowledgesEntity> knowledges = KnowledgeLogic.get().searchKnowledge(null, user, 0, 100);
         Assert.assertEquals(1, knowledges.size());
diff --git a/src/test/java/org/support/project/knowledge/integration/Integration02Test.java b/src/test/java/org/support/project/knowledge/integration/Integration02Test.java
new file mode 100644
index 000000000..45fb49ce7
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/Integration02Test.java
@@ -0,0 +1,186 @@
+package org.support.project.knowledge.integration;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.test.OrderedRunner;
+import org.support.project.knowledge.TestCommon;
+import org.support.project.knowledge.bat.NotifyMailBat;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.AuthType;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.NotifyConfigsDao;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.NotifyConfigsEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.TemplateLogic;
+import org.support.project.knowledge.logic.notification.QueueNotification;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+/**
+ * ユーザを2つ追加し、片方のユーザで非公開のKnowledgeを登録し、通知や記事が参照できることを確認する
+ * @author koda
+ *
+ */
+@RunWith(OrderedRunner.class)
+public class Integration02Test extends TestCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(Integration02Test.class);
+    
+    private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
+    
+    /**
+     * ユーザを2つ登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        UsersEntity user = addUser("integration-test-user-01");
+        UsersEntity check = UsersDao.get().selectOnUserKey(user.getUserKey());
+        Assert.assertNotNull(check);
+        Assert.assertEquals(user.getUserKey(), check.getUserKey());
+        Assert.assertEquals(user.getLocaleKey(), check.getLocaleKey());
+        Assert.assertEquals(user.getMailAddress(), check.getMailAddress());
+        Assert.assertEquals(user.getUserName(), check.getUserName());
+        
+        UsersEntity user2 = addUser("integration-test-user-02");
+        check = UsersDao.get().selectOnUserKey(user2.getUserKey());
+        Assert.assertNotNull(check);
+        Assert.assertEquals(user2.getUserKey(), check.getUserKey());
+        Assert.assertEquals(user2.getLocaleKey(), check.getLocaleKey());
+        Assert.assertEquals(user2.getMailAddress(), check.getMailAddress());
+        Assert.assertEquals(user2.getUserName(), check.getUserName());
+    }
+    
+    /**
+     * 登録されたユーザの通知設定を参照
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 2)
+    public void testCheckNotify() throws Exception {
+        LOG.info("通知設定確認");
+        testCheckNotify("integration-test-user-01");
+        testCheckNotify("integration-test-user-02");
+    }
+    private void testCheckNotify(String key) {
+        UsersEntity user = UsersDao.get().selectOnUserKey(key);
+        NotifyConfigsEntity notify = NotifyConfigsDao.get().selectOnKey(user.getUserId());
+        //LOG.info(notify.toString());
+        Assert.assertNotNull(notify);
+        Assert.assertEquals(1, notify.getNotifyMail().intValue());
+        Assert.assertEquals(0, notify.getNotifyDesktop().intValue());
+        Assert.assertEquals(1, notify.getMyItemComment().intValue());
+        Assert.assertEquals(1, notify.getMyItemLike().intValue());
+        Assert.assertEquals(1, notify.getMyItemStock().intValue());
+        Assert.assertEquals(1, notify.getToItemSave().intValue());
+        Assert.assertEquals(1, notify.getToItemComment().intValue());
+        Assert.assertEquals(0, notify.getToItemIgnorePublic().intValue());
+        Assert.assertEquals(0, notify.getStockItemSave().intValue());
+        Assert.assertEquals(0, notify.getStokeItemComment().intValue());
+    }
+
+    /**
+     * 記事を登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 3)
+    public void testInsertKnowledge() throws Exception {
+        LOG.info("記事投稿");
+        LoginedUser loginUser = getLoginUser("integration-test-user-01");
+        DBUserPool.get().setUser(loginUser.getUserId()); // 操作ユーザのIDを指定
+        
+        KnowledgesEntity knowledge = super.insertKnowledge("integration-test-knowledge-01", loginUser,
+                TemplateLogic.TYPE_ID_KNOWLEDGE, KnowledgeLogic.PUBLIC_FLAG_PRIVATE);
+        
+        KnowledgesEntity check = KnowledgesDao.get().selectOnKey(knowledge.getKnowledgeId());
+        Assert.assertNotNull(check);
+        Assert.assertEquals(knowledge.getKnowledgeId(), check.getKnowledgeId());
+        Assert.assertEquals("integration-test-knowledge-01", check.getTitle());
+        Assert.assertEquals(loginUser.getUserId(), check.getInsertUser());
+        knowledgeId = knowledge.getKnowledgeId();
+    }
+    
+    /**
+     * 通知情報が登録されていることを確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 4)
+    public void testCheckNotifyQueue() throws Exception {
+        LOG.info("通知キュー確認");
+        NotifyQueuesEntity notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
+        Assert.assertNotNull(notify);
+    }
+    
+    /**
+     * 通知を処理
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 5)
+    public void testExecNotifyQueue() throws Exception {
+        LOG.info("通知キューを処理");
+        MailConfigsEntity mailConfig = new MailConfigsEntity(AppConfig.get().getSystemName());
+        mailConfig.setHost("example.com");
+        mailConfig.setPort(25);
+        mailConfig.setAuthType(AuthType.None.getValue());
+        MailConfigsDao.get().insert(mailConfig); // メール送信設定
+        
+        NotifyMailBat.main(null);
+        NotifyQueuesEntity notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
+        Assert.assertNull(notify);
+    }
+    
+    /**
+     * ユーザに通知が届いていることを確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 6)
+    public void testCheckUserNotification() throws Exception {
+        LOG.info("通知確認");
+        NotificationsEntity notification = NotificationsDao.get().selectOnKey(new Long(1)); // 1件も通知がないはず
+        Assert.assertNull(notification);
+    }
+    
+    /**
+     * 記事を参照できる
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 7)
+    public void testKnowledgeView() throws Exception {
+        LOG.info("記事を参照");
+        LoginedUser user = getLoginUser("integration-test-user-01");
+        List<KnowledgesEntity> knowledges = KnowledgeLogic.get().searchKnowledge(null, user, 0, 100);
+        Assert.assertEquals(1, knowledges.size());
+        
+        KnowledgesEntity knowledge = KnowledgeLogic.get().select(knowledges.get(0).getKnowledgeId(), user);
+        Assert.assertNotNull(knowledge);
+        Assert.assertEquals(knowledgeId, knowledge.getKnowledgeId().intValue());
+        
+        user = getLoginUser("integration-test-user-02");
+        knowledges = KnowledgeLogic.get().searchKnowledge(null, user, 0, 100);
+        Assert.assertEquals(0, knowledges.size()); // 登録者以外は参照できない
+    }
+    
+    
+}
diff --git a/src/test/java/org/support/project/knowledge/integration/Integration03Test.java b/src/test/java/org/support/project/knowledge/integration/Integration03Test.java
new file mode 100644
index 000000000..21a71957f
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/Integration03Test.java
@@ -0,0 +1,174 @@
+package org.support.project.knowledge.integration;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.test.OrderedRunner;
+import org.support.project.knowledge.TestCommon;
+import org.support.project.knowledge.bat.NotifyMailBat;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.AuthType;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.TargetLogic;
+import org.support.project.knowledge.logic.TemplateLogic;
+import org.support.project.knowledge.logic.notification.QueueNotification;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.UserNotificationsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UserNotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+/**
+ * ユーザを3つ追加し、片方のユーザで保護のKnowledgeを登録し、通知や記事が参照できることを確認する
+ * @author koda
+ *
+ */
+@RunWith(OrderedRunner.class)
+public class Integration03Test extends TestCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(Integration03Test.class);
+    
+    private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
+    
+    /**
+     * ユーザを2つ登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        addUser("integration-test-user-01");
+        addUser("integration-test-user-02");
+        addUser("integration-test-user-03");
+    }
+
+    /**
+     * 記事を登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 3)
+    public void testInsertKnowledge() throws Exception {
+        LOG.info("記事投稿");
+        LoginedUser loginUser = getLoginUser("integration-test-user-01");
+        DBUserPool.get().setUser(loginUser.getUserId()); // 操作ユーザのIDを指定
+        
+        LoginedUser user3 = getLoginUser("integration-test-user-03");
+        String viewStr = TargetLogic.ID_PREFIX_USER + loginUser.getUserId();
+        viewStr += "," + TargetLogic.ID_PREFIX_USER + user3.getUserId();
+        KnowledgesEntity knowledge = super.insertKnowledge("integration-test-knowledge-01", loginUser,
+                TemplateLogic.TYPE_ID_KNOWLEDGE, KnowledgeLogic.PUBLIC_FLAG_PROTECT, viewStr);
+        
+        KnowledgesEntity check = KnowledgesDao.get().selectOnKey(knowledge.getKnowledgeId());
+        Assert.assertNotNull(check);
+        Assert.assertEquals(knowledge.getKnowledgeId(), check.getKnowledgeId());
+        Assert.assertEquals("integration-test-knowledge-01", check.getTitle());
+        Assert.assertEquals(loginUser.getUserId(), check.getInsertUser());
+        knowledgeId = knowledge.getKnowledgeId();
+    }
+    
+    /**
+     * 通知情報が登録されていることを確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 4)
+    public void testCheckNotifyQueue() throws Exception {
+        LOG.info("通知キュー確認");
+        NotifyQueuesEntity notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
+        Assert.assertNotNull(notify);
+    }
+    
+    /**
+     * 通知を処理
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 5)
+    public void testExecNotifyQueue() throws Exception {
+        LOG.info("通知キューを処理");
+        MailConfigsEntity mailConfig = new MailConfigsEntity(AppConfig.get().getSystemName());
+        mailConfig.setHost("example.com");
+        mailConfig.setPort(25);
+        mailConfig.setAuthType(AuthType.None.getValue());
+        MailConfigsDao.get().insert(mailConfig); // メール送信設定
+        
+        NotifyMailBat.main(null);
+        NotifyQueuesEntity notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
+        Assert.assertNull(notify);
+    }
+    
+    /**
+     * ユーザに通知が届いていることを確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 6)
+    public void testCheckUserNotification() throws Exception {
+        LOG.info("通知確認");
+        NotificationsEntity notification = NotificationsDao.get().selectOnKey(new Long(1)); // 1件だけ通知が登録されているはず
+        Assert.assertNotNull(notification);
+        Assert.assertEquals(MailLogic.NOTIFY_INSERT_KNOWLEDGE, notification.getTitle());
+        
+        UsersEntity user = UsersDao.get().selectOnUserKey("integration-test-user-01");
+        UserNotificationsEntity userNotification = UserNotificationsDao.get().selectOnKey(notification.getNo(), user.getUserId());
+        Assert.assertNotNull(userNotification);
+        user = UsersDao.get().selectOnUserKey("integration-test-user-03");
+        userNotification = UserNotificationsDao.get().selectOnKey(notification.getNo(), user.getUserId());
+        Assert.assertNotNull(userNotification);
+        user = UsersDao.get().selectOnUserKey("integration-test-user-02");
+        userNotification = UserNotificationsDao.get().selectOnKey(notification.getNo(), user.getUserId());
+        Assert.assertNull(userNotification);
+        
+        int count = MailsDao.get().selectCountAll();
+        Assert.assertEquals(2, count);
+    }
+    
+    /**
+     * 記事を参照できる
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 7)
+    public void testKnowledgeView() throws Exception {
+        LOG.info("記事を参照");
+        LoginedUser user = getLoginUser("integration-test-user-01");
+        List<KnowledgesEntity> knowledges = KnowledgeLogic.get().searchKnowledge(null, user, 0, 100);
+        Assert.assertEquals(1, knowledges.size());
+        
+        KnowledgesEntity knowledge = KnowledgeLogic.get().select(knowledges.get(0).getKnowledgeId(), user);
+        Assert.assertNotNull(knowledge);
+        Assert.assertEquals(knowledgeId, knowledge.getKnowledgeId().intValue());
+        
+        user = getLoginUser("integration-test-user-03");
+        knowledges = KnowledgeLogic.get().searchKnowledge(null, user, 0, 100);
+        Assert.assertEquals(1, knowledges.size());
+        
+        knowledge = KnowledgeLogic.get().select(knowledges.get(0).getKnowledgeId(), user);
+        Assert.assertNotNull(knowledge);
+        Assert.assertEquals(knowledgeId, knowledge.getKnowledgeId().intValue());
+        
+        user = getLoginUser("integration-test-user-02");
+        knowledges = KnowledgeLogic.get().searchKnowledge(null, user, 0, 100);
+        Assert.assertEquals(0, knowledges.size());
+    }
+    
+    
+}
diff --git a/src/test/java/org/support/project/knowledge/integration/Integration04Test.java b/src/test/java/org/support/project/knowledge/integration/Integration04Test.java
new file mode 100644
index 000000000..c030dd40d
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/Integration04Test.java
@@ -0,0 +1,162 @@
+package org.support.project.knowledge.integration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.test.OrderedRunner;
+import org.support.project.knowledge.TestCommon;
+import org.support.project.knowledge.bat.NotifyMailBat;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.AuthType;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.CommentsEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.knowledge.logic.notification.QueueNotification;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.dao.MailsDao;
+import org.support.project.web.dao.NotificationsDao;
+import org.support.project.web.dao.UserNotificationsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.entity.UserNotificationsEntity;
+import org.support.project.web.entity.UsersEntity;
+
+
+/**
+ * 記事登録後に、コメントを登録
+ * @author koda
+ */
+@RunWith(OrderedRunner.class)
+public class Integration04Test extends TestCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(Integration04Test.class);
+    
+    private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
+    
+    /**
+     * ユーザを2つ登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        MailConfigsEntity mailConfig = new MailConfigsEntity(AppConfig.get().getSystemName());
+        mailConfig.setHost("example.com");
+        mailConfig.setPort(25);
+        mailConfig.setAuthType(AuthType.None.getValue());
+        MailConfigsDao.get().insert(mailConfig); // メール送信設定
+
+        addUser("integration-test-user-01");
+        addUser("integration-test-user-02");
+    }
+    
+    /**
+     * 記事を登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 3)
+    public void testInsertKnowledge() throws Exception {
+        LOG.info("記事投稿");
+        LoginedUser loginUser = getLoginUser("integration-test-user-01");
+        DBUserPool.get().setUser(loginUser.getUserId()); // 操作ユーザのIDを指定
+        
+        KnowledgesEntity knowledge = super.insertKnowledge("integration-test-knowledge-01", loginUser);
+        knowledgeId = knowledge.getKnowledgeId();
+        
+        NotifyQueuesEntity notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
+        Assert.assertNotNull(notify);
+        NotifyMailBat.main(null);
+        notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
+        Assert.assertNull(notify);
+
+        NotificationsEntity notification = NotificationsDao.get().selectOnKey(new Long(1)); // 1件だけ通知が登録されているはず
+        Assert.assertNotNull(notification);
+        
+        UsersEntity user = UsersDao.get().selectOnUserKey("integration-test-user-01");
+        UserNotificationsEntity userNotification = UserNotificationsDao.get().selectOnKey(notification.getNo(), user.getUserId());
+        Assert.assertNotNull(userNotification);
+        user = UsersDao.get().selectOnUserKey("integration-test-user-02");
+        userNotification = UserNotificationsDao.get().selectOnKey(notification.getNo(), user.getUserId());
+        Assert.assertNotNull(userNotification);
+        
+        int count = MailsDao.get().selectCountAll();
+        Assert.assertEquals(2, count);
+    }
+    
+    /**
+     * 記事を参照できる
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 7)
+    public void testKnowledgeView() throws Exception {
+        LOG.info("記事を参照");
+        LoginedUser user = getLoginUser("integration-test-user-01");
+        List<KnowledgesEntity> knowledges = KnowledgeLogic.get().searchKnowledge(null, user, 0, 100);
+        Assert.assertEquals(1, knowledges.size());
+        
+        KnowledgesEntity knowledge = KnowledgeLogic.get().select(knowledges.get(0).getKnowledgeId(), user);
+        Assert.assertNotNull(knowledge);
+        Assert.assertEquals(knowledgeId, knowledge.getKnowledgeId().intValue());
+        
+        user = getLoginUser("integration-test-user-02");
+        knowledges = KnowledgeLogic.get().searchKnowledge(null, user, 0, 100);
+        Assert.assertEquals(1, knowledges.size());
+        
+        knowledge = KnowledgeLogic.get().select(knowledges.get(0).getKnowledgeId(), user);
+        Assert.assertNotNull(knowledge);
+        Assert.assertEquals(knowledgeId, knowledge.getKnowledgeId().intValue());
+    }
+    
+    /**
+     * コメント追加
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 8)
+    public void testInsertComment() throws Exception {
+        LoginedUser user = getLoginUser("integration-test-user-02");
+        CommentsEntity comment = KnowledgeLogic.get().saveComment(knowledgeId, "コメント", new ArrayList<>(), user);
+        
+        NotifyQueuesEntity notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_COMMENT, comment.getCommentNo());
+        Assert.assertNotNull(notify);
+        NotifyMailBat.main(null);
+        notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_COMMENT, comment.getCommentNo());
+        Assert.assertNull(notify);
+        
+        NotificationsEntity notification = NotificationsDao.get().selectOnKey(new Long(2));
+        Assert.assertNotNull(notification);
+        Assert.assertEquals(MailLogic.NOTIFY_INSERT_COMMENT_MYITEM, notification.getTitle());
+        
+        user = getLoginUser("integration-test-user-01");
+        UserNotificationsEntity userNotification = UserNotificationsDao.get().selectOnKey(notification.getNo(), user.getUserId());
+        Assert.assertNotNull(userNotification);
+
+        notification = NotificationsDao.get().selectOnKey(new Long(3));
+        Assert.assertNotNull(notification);
+        Assert.assertEquals(MailLogic.NOTIFY_INSERT_COMMENT, notification.getTitle());
+        
+        user = getLoginUser("integration-test-user-02");
+        userNotification = UserNotificationsDao.get().selectOnKey(notification.getNo(), user.getUserId());
+        Assert.assertNotNull(userNotification);
+    }
+    
+    
+
+    
+    
+}

From 453bd3a919e976844b9240284f5f871e23809bea Mon Sep 17 00:00:00 2001
From: Monota <monota.oss@gmail.com>
Date: Sat, 23 Sep 2017 12:37:00 +0900
Subject: [PATCH 080/138] Fix keypress events does not occur on pushing arrow
 keys.

---
 src/main/webapp/js/slide.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/js/slide.js b/src/main/webapp/js/slide.js
index 91f5d8960..f8c5cd300 100644
--- a/src/main/webapp/js/slide.js
+++ b/src/main/webapp/js/slide.js
@@ -140,7 +140,7 @@ function showSlides(n, slideId) {
 $(document).on({
 	'mouseenter': function () {
 		var id = $(this).attr('id');
-		$(window).on('keypress', function (e) {
+		$(window).on('keydown', function (e) {
 			e.preventDefault();
 
 			if (37 == e.keyCode) {
@@ -153,6 +153,6 @@ $(document).on({
 		});
 	},
 	'mouseleave': function () {
-		$(window).off('keypress');
+		$(window).off('keydown');
 	}
 }, '.slideshow-area');

From 18e20c579f8e4a0557c8c4a1a3dd0cf030c7b847 Mon Sep 17 00:00:00 2001
From: Monota <monota.oss@gmail.com>
Date: Sat, 23 Sep 2017 12:39:27 +0900
Subject: [PATCH 081/138] Fix when Add dropdown is clicked, Add button becomes
 hard to see.

---
 src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp b/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp
index 1ad46ab11..f627b1087 100644
--- a/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp
+++ b/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp
@@ -67,10 +67,10 @@
             <ul class="nav navbar-nav navbar-right">
                 <li class="navButton navAddButton">
                     <div class="btn-group">
-                        <a href="<%= request.getContextPath() %>/protect.knowledge/view_add<%= jspUtil.out("params") %>" class="btn btn-info" id="navAddButtonLink">
+                        <button type="button" onclick="location.href='<%= request.getContextPath() %>/protect.knowledge/view_add<%= jspUtil.out("params") %>'" class="btn btn-info" id="navAddButtonLink" tabindex="-1">
                             <i class="fa fa-plus-circle"></i>&nbsp;
                             <span class="navListButtonText"><%= jspUtil.label("knowledge.navbar.add.knowledge") %></span>
-                        </a>
+                        </button>
                         <a href="#" class="btn btn-info dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="caret"></span>
                         </a>

From a6d438cc6893e6760a1f8499a36e18ed4282ef9e Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 25 Sep 2017 23:52:51 +0900
Subject: [PATCH 082/138] Add integration test

---
 .../project/knowledge/logic/AccountLogic.java |   1 -
 .../support/project/knowledge/TestCommon.java |  16 +-
 .../integration/IntegrationCommon.java        |  74 ++++
 .../integration/IntegrationPostTest.java      | 365 ++++++++++++++++++
 ...ostCommentPublicLogicIntegrationTest.java} |   6 +-
 .../PostPrivateLogicIntegrationTest.java}     |   6 +-
 .../PostProtectLogicIntegrationTest.java}     |   6 +-
 .../PostPublicLogicIntegrationTest.java}      |   6 +-
 .../control/open/KnowledgeControlTest.java    |   3 +-
 9 files changed, 468 insertions(+), 15 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
 create mode 100644 src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
 rename src/test/java/org/support/project/knowledge/{integration/Integration04Test.java => logic/integration/PostCommentPublicLogicIntegrationTest.java} (96%)
 rename src/test/java/org/support/project/knowledge/{integration/Integration02Test.java => logic/integration/PostPrivateLogicIntegrationTest.java} (97%)
 rename src/test/java/org/support/project/knowledge/{integration/Integration03Test.java => logic/integration/PostProtectLogicIntegrationTest.java} (97%)
 rename src/test/java/org/support/project/knowledge/{integration/Integration01Test.java => logic/integration/PostPublicLogicIntegrationTest.java} (97%)
 rename src/test/java/org/support/project/knowledge/{ => test}/control/open/KnowledgeControlTest.java (94%)

diff --git a/src/main/java/org/support/project/knowledge/logic/AccountLogic.java b/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
index b0995c5c8..515a7b619 100644
--- a/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/AccountLogic.java
@@ -3,7 +3,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
diff --git a/src/test/java/org/support/project/knowledge/TestCommon.java b/src/test/java/org/support/project/knowledge/TestCommon.java
index 0976c59ac..cb20679da 100644
--- a/src/test/java/org/support/project/knowledge/TestCommon.java
+++ b/src/test/java/org/support/project/knowledge/TestCommon.java
@@ -15,8 +15,10 @@
 import org.apache.lucene.util.Version;
 import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.runner.RunWith;
 import org.support.project.common.config.ConfigLoader;
 import org.support.project.common.config.INT_FLAG;
@@ -26,6 +28,7 @@
 import org.support.project.common.logic.H2DBServerLogic;
 import org.support.project.common.serialize.SerializeUtils;
 import org.support.project.common.test.OrderedRunner;
+import org.support.project.common.test.TestWatcher;
 import org.support.project.common.util.RandomUtil;
 import org.support.project.common.util.StringUtils;
 import org.support.project.knowledge.config.AppConfig;
@@ -79,6 +82,8 @@ public abstract class TestCommon {
     /** login user for test */
     public static LoginedUser groupuser2 = null;
     
+    @Rule
+    public TestWatcher watchman = new TestWatcher();
     
     /**
      * @BeforeClass
@@ -277,7 +282,16 @@ protected UsersEntity addUser(String userKey) {
         user.setUserName("Integration Test User 01");
         user.setPassword(IDGen.get().gen("hoge"));
         String[] roles = {"user"};
-        return UserLogicEx.get().insert(user, roles);
+        user = UserLogicEx.get().insert(user, roles);
+        
+        UsersEntity check = UsersDao.get().selectOnUserKey(user.getUserKey());
+        Assert.assertNotNull(check);
+        Assert.assertEquals(user.getUserKey(), check.getUserKey());
+        Assert.assertEquals(user.getLocaleKey(), check.getLocaleKey());
+        Assert.assertEquals(user.getMailAddress(), check.getMailAddress());
+        Assert.assertEquals(user.getUserName(), check.getUserName());
+        
+        return user;
     }
     /**
      * 登録されているユーザのログインユーザ情報を取得
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
new file mode 100644
index 000000000..31503c722
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
@@ -0,0 +1,74 @@
+package org.support.project.knowledge.integration;
+
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.knowledge.TestCommon;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.AuthType;
+import org.support.project.web.common.InvokeTarget;
+import org.support.project.web.dao.MailConfigsDao;
+import org.support.project.web.entity.MailConfigsEntity;
+import org.support.project.web.exception.CallControlException;
+import org.support.project.web.exception.InvalidParamException;
+import org.support.project.web.logic.CallControlLogic;
+
+import net.arnx.jsonic.JSONException;
+
+public abstract class IntegrationCommon extends TestCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(IntegrationCommon.class);
+    /**
+     * @BeforeClass
+     * @throws Exception
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        TestCommon.setUpBeforeClass();
+        String controlPackage = "org.support.project.knowledge.control,org.support.project.web.control";
+        String classSuffix = "Control";
+        String ignoreRegularExpression = "^/ws|^/template|^/bower|css$|js$|ico$|html$";
+        CallControlLogic.get().init(controlPackage, classSuffix, true, ignoreRegularExpression);
+        
+        MailConfigsEntity mailConfig = new MailConfigsEntity(AppConfig.get().getSystemName());
+        mailConfig.setHost("example.com");
+        mailConfig.setPort(25);
+        mailConfig.setAuthType(AuthType.None.getValue());
+        MailConfigsDao.get().insert(mailConfig); // メール送信設定
+    }
+    /**
+     * コントローラーを呼び出し
+     * @param request
+     * @param response
+     * @param clazz
+     * @return
+     * @throws InstantiationException
+     * @throws IllegalAccessException
+     * @throws JSONException
+     * @throws NoSuchAlgorithmException
+     * @throws CallControlException
+     * @throws IOException
+     * @throws InvalidParamException
+     */
+    protected <T> T invoke(HttpServletRequest request, HttpServletResponse response, Class<T> clazz)
+            throws InstantiationException, IllegalAccessException, JSONException, NoSuchAlgorithmException,
+            CallControlException, IOException, InvalidParamException {
+        InvokeTarget invoke = CallControlLogic.get().searchInvokeTarget(request, response);
+        Assert.assertNotNull(invoke);
+        Object result = invoke.invoke();
+        LOG.info(result);
+        Assert.assertNotNull(result);
+        if (!result.getClass().isAssignableFrom(clazz)) {
+            Assert.fail("Result is not " + clazz.getSimpleName());
+        }
+        return (T) result;
+    }
+
+}
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
new file mode 100644
index 000000000..4dd7096f5
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
@@ -0,0 +1,365 @@
+package org.support.project.knowledge.integration;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.knowledge.bat.NotifyMailBat;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.notification.QueueNotification;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.boundary.ForwardBoundary;
+import org.support.project.web.boundary.JsonBoundary;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.logic.HttpRequestCheckLogic;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+import org.support.project.web.test.stub.StubHttpServletRequest;
+import org.support.project.web.test.stub.StubHttpServletResponse;
+
+/**
+ * 
+ * @author koda
+ */
+public class IntegrationPostTest extends IntegrationCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(IntegrationCommon.class);
+    
+    private static final String INTEGRATION_TEST_USER_02 = "integration-test-user-02";
+    private static final String INTEGRATION_TEST_USER_01 = "integration-test-user-01";
+    
+    private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
+    
+    /**
+     * ユーザを登録
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        addUser(INTEGRATION_TEST_USER_01);
+        addUser(INTEGRATION_TEST_USER_02);
+    }
+
+    /**
+     * 未ログインユーザで、Knowledge一覧を開く(1件も無し）
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 2)
+    public void testAccessListByNoLoginUser() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.knowledge/list");
+        request.setMethod("get");
+        
+        invoke(request, response, ForwardBoundary.class);
+        
+        List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
+        Assert.assertNotNull(knowledges);
+        Assert.assertEquals(0, knowledges.size());
+    }
+
+    /**
+     * ログインユーザでKnowledge一覧を開く(1件も無し）
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 3)
+    public void testAccessListByLoginedUser() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.knowledge/list");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(INTEGRATION_TEST_USER_01, request, response);
+        
+        invoke(request, response, ForwardBoundary.class);
+        
+        List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
+        Assert.assertNotNull(knowledges);
+        Assert.assertEquals(0, knowledges.size());
+    }
+    
+    /**
+     * ログインユーザで、通知の確認（1件なし）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 4)
+    public void testInitNotificationByLoginedUser() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.notification/list");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(INTEGRATION_TEST_USER_01, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
+        Assert.assertNotNull(notifications);
+        Assert.assertEquals(0, notifications.size());
+    }
+
+    /**
+     * CPの確認（ユーザ1と2）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 5)
+    public void testInitCPByLoginedUser() throws Exception {
+        LoginedUser user = super.getLoginUser(INTEGRATION_TEST_USER_01);
+        
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.account/info/" + user.getUserId());
+        request.setMethod("get");
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/open/account/account.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        Assert.assertEquals((long) 0, request.getAttribute("point"));
+        
+        LoginedUser user2 = super.getLoginUser(INTEGRATION_TEST_USER_02);
+        request.setServletPath("open.account/info/" + user2.getUserId());
+        
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/open/account/account.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        Assert.assertEquals((long) 0, request.getAttribute("point"));
+    }
+
+    
+    
+    
+    /**
+     * ユーザ2で「公開」の記事を1件追加
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 100)
+    public void testPostPublic() throws Exception {
+        // 登録画面へアクセスできること(パスのルーティングのみ確認）
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_add");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(INTEGRATION_TEST_USER_02, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+
+        // 保存失敗（登録する値を何もセットしていない）
+        request.setServletPath("protect.knowledge/save");
+        request.setMethod("post");
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(400, sendObject.getCode().intValue());
+
+        // 保存
+        request.addParameter("title", "タイトル");
+        request.addParameter("content", "内容");
+        request.addParameter("publicFlag", String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PUBLIC));
+        
+        jsonBoundary = invoke(request, response, JsonBoundary.class);
+        sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(200, sendObject.getCode().intValue());
+        
+        knowledgeId = new Long(sendObject.getResult());
+    }
+
+    /**
+     * 未ログインユーザで、Knowledgeを参照
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 101)
+    public void testAccessListByNoLoginUser2() throws Exception {
+        // 一覧を表示
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.knowledge/list");
+        request.setMethod("get");
+        
+        invoke(request, response, ForwardBoundary.class);
+        
+        List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
+        Assert.assertNotNull(knowledges);
+        Assert.assertEquals(1, knowledges.size());
+
+        KnowledgesEntity knowledge = knowledges.get(0);
+        Assert.assertEquals("タイトル", knowledge.getTitle());
+        Assert.assertEquals("内容", knowledge.getContent());
+        Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, knowledge.getPublicFlag().intValue());
+
+        // 詳細表示
+        request.setServletPath("open.knowledge/view/" + knowledge.getKnowledgeId());
+        
+        invoke(request, response, ForwardBoundary.class);
+        
+        Assert.assertEquals("タイトル", request.getAttribute("title"));
+        Assert.assertEquals("<p>内容</p>\n", request.getAttribute("content")); // Markdownが処理されている
+        Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, request.getAttribute("publicFlag"));
+    }
+
+    /**
+     * ログインユーザでKnowledgeを参照
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 102)
+    public void testAccessListByLoginedUser2() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.knowledge/list");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(INTEGRATION_TEST_USER_01, request, response);
+        
+        invoke(request, response, ForwardBoundary.class);
+        
+        List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
+        Assert.assertNotNull(knowledges);
+        Assert.assertEquals(1, knowledges.size());
+
+        KnowledgesEntity knowledge = knowledges.get(0);
+        Assert.assertEquals("タイトル", knowledge.getTitle());
+        Assert.assertEquals("内容", knowledge.getContent());
+        Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, knowledge.getPublicFlag().intValue());
+
+        // 詳細表示
+        request.setServletPath("open.knowledge/view/" + knowledge.getKnowledgeId());
+        invoke(request, response, ForwardBoundary.class);
+        
+        Assert.assertEquals("タイトル", request.getAttribute("title"));
+        Assert.assertEquals("<p>内容</p>\n", request.getAttribute("content")); // Markdownが処理されている
+        Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, request.getAttribute("publicFlag"));
+    }
+    
+    /**
+     * ログインユーザで、通知の確認(未だ何も届いていない）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 200)
+    public void testNothingNotificationByLoginedUser1() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.notification/list");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(INTEGRATION_TEST_USER_01, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
+        Assert.assertNotNull(notifications);
+        Assert.assertEquals(0, notifications.size());
+    }
+
+    /**
+     * ログインユーザ2で、通知の確認(未だ何も届いていない）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 201)
+    public void testNothingNotificationByLoginedUser2() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.notification/list");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(INTEGRATION_TEST_USER_02, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
+        Assert.assertNotNull(notifications);
+        Assert.assertEquals(0, notifications.size());
+    }
+    
+    /**
+     * 通知を処理
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 202)
+    public void testExecNotification() throws Exception {
+        NotifyQueuesEntity notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
+        Assert.assertNotNull(notify);
+        NotifyMailBat.main(null);
+        notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
+        Assert.assertNull(notify);
+    }
+
+    /**
+     * ログインユーザで、通知の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 203)
+    public void testNotificationByLoginedUser1() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.notification/list");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(INTEGRATION_TEST_USER_01, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
+        Assert.assertNotNull(notifications);
+        Assert.assertEquals(1, notifications.size()); // 登録通知が届いている
+    }
+
+    /**
+     * ログインユーザ2で、通知の確認
+     * TODO 登録者本人には、通知を出さなくても良いかも（今のところ出している）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 204)
+    public void testNotificationByLoginedUser2() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.notification/list");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(INTEGRATION_TEST_USER_02, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
+        Assert.assertNotNull(notifications);
+        Assert.assertEquals(1, notifications.size()); // 登録通知が届いている
+    }
+    
+    
+}
diff --git a/src/test/java/org/support/project/knowledge/integration/Integration04Test.java b/src/test/java/org/support/project/knowledge/logic/integration/PostCommentPublicLogicIntegrationTest.java
similarity index 96%
rename from src/test/java/org/support/project/knowledge/integration/Integration04Test.java
rename to src/test/java/org/support/project/knowledge/logic/integration/PostCommentPublicLogicIntegrationTest.java
index c030dd40d..20949f331 100644
--- a/src/test/java/org/support/project/knowledge/integration/Integration04Test.java
+++ b/src/test/java/org/support/project/knowledge/logic/integration/PostCommentPublicLogicIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.support.project.knowledge.integration;
+package org.support.project.knowledge.logic.integration;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,9 +39,9 @@
  * @author koda
  */
 @RunWith(OrderedRunner.class)
-public class Integration04Test extends TestCommon {
+public class PostCommentPublicLogicIntegrationTest extends TestCommon {
     /** ログ */
-    private static final Log LOG = LogFactory.getLog(Integration04Test.class);
+    private static final Log LOG = LogFactory.getLog(PostCommentPublicLogicIntegrationTest.class);
     
     private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
     
diff --git a/src/test/java/org/support/project/knowledge/integration/Integration02Test.java b/src/test/java/org/support/project/knowledge/logic/integration/PostPrivateLogicIntegrationTest.java
similarity index 97%
rename from src/test/java/org/support/project/knowledge/integration/Integration02Test.java
rename to src/test/java/org/support/project/knowledge/logic/integration/PostPrivateLogicIntegrationTest.java
index 45fb49ce7..cf64e7f92 100644
--- a/src/test/java/org/support/project/knowledge/integration/Integration02Test.java
+++ b/src/test/java/org/support/project/knowledge/logic/integration/PostPrivateLogicIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.support.project.knowledge.integration;
+package org.support.project.knowledge.logic.integration;
 
 import java.util.List;
 
@@ -37,9 +37,9 @@
  *
  */
 @RunWith(OrderedRunner.class)
-public class Integration02Test extends TestCommon {
+public class PostPrivateLogicIntegrationTest extends TestCommon {
     /** ログ */
-    private static final Log LOG = LogFactory.getLog(Integration02Test.class);
+    private static final Log LOG = LogFactory.getLog(PostPrivateLogicIntegrationTest.class);
     
     private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
     
diff --git a/src/test/java/org/support/project/knowledge/integration/Integration03Test.java b/src/test/java/org/support/project/knowledge/logic/integration/PostProtectLogicIntegrationTest.java
similarity index 97%
rename from src/test/java/org/support/project/knowledge/integration/Integration03Test.java
rename to src/test/java/org/support/project/knowledge/logic/integration/PostProtectLogicIntegrationTest.java
index 21a71957f..e579a2ea3 100644
--- a/src/test/java/org/support/project/knowledge/integration/Integration03Test.java
+++ b/src/test/java/org/support/project/knowledge/logic/integration/PostProtectLogicIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.support.project.knowledge.integration;
+package org.support.project.knowledge.logic.integration;
 
 import java.util.List;
 
@@ -40,9 +40,9 @@
  *
  */
 @RunWith(OrderedRunner.class)
-public class Integration03Test extends TestCommon {
+public class PostProtectLogicIntegrationTest extends TestCommon {
     /** ログ */
-    private static final Log LOG = LogFactory.getLog(Integration03Test.class);
+    private static final Log LOG = LogFactory.getLog(PostProtectLogicIntegrationTest.class);
     
     private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
     
diff --git a/src/test/java/org/support/project/knowledge/integration/Integration01Test.java b/src/test/java/org/support/project/knowledge/logic/integration/PostPublicLogicIntegrationTest.java
similarity index 97%
rename from src/test/java/org/support/project/knowledge/integration/Integration01Test.java
rename to src/test/java/org/support/project/knowledge/logic/integration/PostPublicLogicIntegrationTest.java
index fc6045683..1b7967cc7 100644
--- a/src/test/java/org/support/project/knowledge/integration/Integration01Test.java
+++ b/src/test/java/org/support/project/knowledge/logic/integration/PostPublicLogicIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.support.project.knowledge.integration;
+package org.support.project.knowledge.logic.integration;
 
 import java.util.List;
 
@@ -40,9 +40,9 @@
  * @author koda
  */
 @RunWith(OrderedRunner.class)
-public class Integration01Test extends TestCommon {
+public class PostPublicLogicIntegrationTest extends TestCommon {
     /** ログ */
-    private static final Log LOG = LogFactory.getLog(Integration01Test.class);
+    private static final Log LOG = LogFactory.getLog(PostPublicLogicIntegrationTest.class);
     
     private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
     
diff --git a/src/test/java/org/support/project/knowledge/control/open/KnowledgeControlTest.java b/src/test/java/org/support/project/knowledge/test/control/open/KnowledgeControlTest.java
similarity index 94%
rename from src/test/java/org/support/project/knowledge/control/open/KnowledgeControlTest.java
rename to src/test/java/org/support/project/knowledge/test/control/open/KnowledgeControlTest.java
index fc5fb9476..76181d818 100644
--- a/src/test/java/org/support/project/knowledge/control/open/KnowledgeControlTest.java
+++ b/src/test/java/org/support/project/knowledge/test/control/open/KnowledgeControlTest.java
@@ -1,4 +1,4 @@
-package org.support.project.knowledge.control.open;
+package org.support.project.knowledge.test.control.open;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,6 +14,7 @@
 import org.support.project.common.test.TestCase;
 import org.support.project.knowledge.TestCommon;
 import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.control.open.KnowledgeControl;
 import org.support.project.web.exception.InvalidParamException;
 import org.support.project.web.test.stub.ControlContainer;
 import org.support.project.web.test.stub.StubCookie;

From e351db76489c0bd5bb40c3e387b0166e83b7d336 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 26 Sep 2017 23:19:49 +0900
Subject: [PATCH 083/138] Add integration test

---
 .../control/protect/KnowledgeControl.java     |   1 -
 .../integration/IntegrationCommon.java        | 240 ++++++++-
 .../integration/IntegrationPostTest.java      | 480 +++++++++++++-----
 3 files changed, 574 insertions(+), 147 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index 862c8108d..02befaf1c 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -3,7 +3,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
index 31503c722..bdb76e7a8 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
@@ -1,7 +1,8 @@
 package org.support.project.knowledge.integration;
 
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -10,21 +11,38 @@
 import org.junit.BeforeClass;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.StringUtils;
 import org.support.project.knowledge.TestCommon;
+import org.support.project.knowledge.bat.NotifyMailBat;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.AuthType;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.vo.LikeCount;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.boundary.ForwardBoundary;
+import org.support.project.web.boundary.JsonBoundary;
+import org.support.project.web.boundary.RedirectBoundary;
 import org.support.project.web.common.InvokeTarget;
 import org.support.project.web.dao.MailConfigsDao;
 import org.support.project.web.entity.MailConfigsEntity;
-import org.support.project.web.exception.CallControlException;
-import org.support.project.web.exception.InvalidParamException;
+import org.support.project.web.entity.NotificationsEntity;
 import org.support.project.web.logic.CallControlLogic;
-
-import net.arnx.jsonic.JSONException;
+import org.support.project.web.logic.HttpRequestCheckLogic;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+import org.support.project.web.test.stub.StubHttpServletRequest;
+import org.support.project.web.test.stub.StubHttpServletResponse;
 
 public abstract class IntegrationCommon extends TestCommon {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(IntegrationCommon.class);
+    
+    private static Map<String, Long> userPointMap = new HashMap<>();
+    private static Map<Long, Long> knowledgePointMap = new HashMap<>();
+    private static Map<String, Integer> userNotificationCountMap = new HashMap<>();
+
+    
     /**
      * @BeforeClass
      * @throws Exception
@@ -49,26 +67,214 @@ public static void setUpBeforeClass() throws Exception {
      * @param response
      * @param clazz
      * @return
-     * @throws InstantiationException
-     * @throws IllegalAccessException
-     * @throws JSONException
-     * @throws NoSuchAlgorithmException
-     * @throws CallControlException
-     * @throws IOException
-     * @throws InvalidParamException
+     * @throws Exception
      */
-    protected <T> T invoke(HttpServletRequest request, HttpServletResponse response, Class<T> clazz)
-            throws InstantiationException, IllegalAccessException, JSONException, NoSuchAlgorithmException,
-            CallControlException, IOException, InvalidParamException {
+    protected <T> T invoke(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) throws Exception {
         InvokeTarget invoke = CallControlLogic.get().searchInvokeTarget(request, response);
         Assert.assertNotNull(invoke);
         Object result = invoke.invoke();
         LOG.info(result);
         Assert.assertNotNull(result);
         if (!result.getClass().isAssignableFrom(clazz)) {
-            Assert.fail("Result is not " + clazz.getSimpleName());
+            Assert.fail("Result is not " + clazz.getSimpleName() + ". actual: " + result.getClass().getSimpleName());
         }
         return (T) result;
     }
+    /**
+     * CP確認
+     * @param userKey
+     * @param cp
+     * @throws Exception
+     */
+    protected void assertCP(String userKey, long cp) throws Exception {
+        LoginedUser user = super.getLoginUser(userKey);
+        
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.account/info/" + user.getUserId());
+        request.setMethod("get");
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/open/account/account.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        if (!userPointMap.containsKey(userKey)) {
+            userPointMap.put(userKey, new Long(0));
+        }
+        long now = userPointMap.get(userKey);
+        now = now + cp;
+        userPointMap.put(userKey, now);
+        Assert.assertEquals(now, request.getAttribute("point"));
+    }
+    /**
+     * 記事のCPを確認
+     * （記事にアクセス可能なユーザを指定すること）
+     * @param userKey
+     * @param knowledgeId
+     * @param cp
+     * @throws Exception
+     */
+    protected void assertKnowledgeCP(String userKey, long knowledgeId, long cp) throws Exception {
+        StubHttpServletRequest request = openKnowledge(userKey, knowledgeId);
+        if (!knowledgePointMap.containsKey(knowledgeId)) {
+            knowledgePointMap.put(knowledgeId, new Long(0));
+        }
+        long now = knowledgePointMap.get(knowledgeId);
+        now = now + cp;
+        knowledgePointMap.put(knowledgeId, now);
+        Assert.assertEquals(now, request.getAttribute("point"));
+    }
+    /**
+     * ユーザに届いている通知の件数を確認
+     * @param userKey
+     * @param add
+     * @throws Exception
+     */
+    protected void assertNotificationCount(String userKey, int add) throws Exception {
+        List<NotificationsEntity> notifications = getNotification(userKey);
+        
+        if (!userNotificationCountMap.containsKey(userKey)) {
+            userNotificationCountMap.put(userKey, 0);
+        }
+        int now = userNotificationCountMap.get(userKey);
+        now = now + add;
+        userNotificationCountMap.put(userKey, now);
+        Assert.assertEquals(now, notifications.size());
+    }
+    
+    
+    /**
+     * 通知を取得
+     * @param userKey
+     * @return
+     * @throws Exception
+     */
+    protected List<NotificationsEntity> getNotification(String userKey) throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.notification/list");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(userKey, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
+        Assert.assertNotNull(notifications);
+        return notifications;
+    }
+    /**
+     * 記事の一覧を取得
+     * @param userKey
+     * @return
+     * @throws Exception 
+     */
+    protected StubHttpServletRequest openKnowledges(String userKey) throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.knowledge/list");
+        request.setMethod("get");
+        if (StringUtils.isNotEmpty(userKey)) {
+            DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+            auth.setSession(userKey, request, response);
+        }
+        invoke(request, response, ForwardBoundary.class);
+        return request;
+    }
+    
+    /**
+     * 記事の参照ページを開く
+     * @param userKey
+     * @return
+     * @throws Exception
+     */
+    protected StubHttpServletRequest openKnowledge(String userKey, long knowledgeId) throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.knowledge/view/" + knowledgeId);
+        request.setMethod("get");
+        if (StringUtils.isNotEmpty(userKey)) {
+            DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+            auth.setSession(userKey, request, response);
+        }
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/open/knowledge/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        return request;
+    }
+    /**
+     * いいねを押下
+     * @param userKey
+     * @param knowledgeId
+     * @return
+     * @throws Exception
+     */
+    protected LikeCount like(String userKey, long knowledgeId) throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.knowledge/like/" + knowledgeId);
+        request.setMethod("post");
+        if (StringUtils.isNotEmpty(userKey)) {
+            DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+            auth.setSession(userKey, request, response);
+        }
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        return (LikeCount) boundary.getObj();
+    }
+    /**
+     * コメントにイイネを押す
+     * @param integrationTestUser02
+     * @param knowledgeId
+     * @param commentNo
+     * @return
+     */
+    protected LikeCount likeComment(String userKey, long knowledgeId, Long commentNo) throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.knowledge/likecomment/" + commentNo);
+        request.setMethod("post");
+        if (StringUtils.isNotEmpty(userKey)) {
+            DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+            auth.setSession(userKey, request, response);
+        }
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        return (LikeCount) boundary.getObj();
+    }
+    
+    
+    /**
+     * コメント登録
+     * @param userKey
+     * @param knowledgeId
+     * @param comment
+     * @throws Exception
+     */
+    protected void comment(String userKey, long knowledgeId, String comment) throws Exception {
+        if (userKey == null) {
+            Assert.fail("post comment must be logined");
+        }
+        StubHttpServletRequest request = openKnowledge(userKey, knowledgeId); //CSRF
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/comment/" + knowledgeId);
+        request.setMethod("post");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(userKey, request, response);
+        request.addParameter("addcomment", "コメント");
+        
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        
+        RedirectBoundary boundary = invoke(request, response, RedirectBoundary.class);
+        Assert.assertNotNull(boundary);
+    }
+    
+    /**
+     * キューにある通知を処理する
+     * @throws Exception
+     */
+    protected void execNotificationQueue() throws Exception {
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        Assert.assertEquals(1, list.size());
+        NotifyMailBat.main(null);
+        list = NotifyQueuesDao.get().selectAll();
+        Assert.assertEquals(0, list.size());
+    }
 
 }
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
index 4dd7096f5..b414dbfbb 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
@@ -8,13 +8,10 @@
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.test.Order;
 import org.support.project.common.util.PropertyUtil;
-import org.support.project.knowledge.bat.NotifyMailBat;
-import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
-import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
-import org.support.project.knowledge.logic.notification.QueueNotification;
-import org.support.project.web.bean.LoginedUser;
+import org.support.project.knowledge.vo.LikeCount;
 import org.support.project.web.bean.MessageResult;
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.boundary.JsonBoundary;
@@ -32,8 +29,9 @@ public class IntegrationPostTest extends IntegrationCommon {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(IntegrationCommon.class);
     
-    private static final String INTEGRATION_TEST_USER_02 = "integration-test-user-02";
     private static final String INTEGRATION_TEST_USER_01 = "integration-test-user-01";
+    private static final String INTEGRATION_TEST_USER_02 = "integration-test-user-02";
+    private static final String INTEGRATION_TEST_USER_03 = "integration-test-user-03";
     
     private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
     
@@ -48,6 +46,7 @@ public void testUserInsert() throws Exception {
         LOG.info("ユーザ登録");
         addUser(INTEGRATION_TEST_USER_01);
         addUser(INTEGRATION_TEST_USER_02);
+        addUser(INTEGRATION_TEST_USER_03);
     }
 
     /**
@@ -58,13 +57,7 @@ public void testUserInsert() throws Exception {
     @Test
     @Order(order = 2)
     public void testAccessListByNoLoginUser() throws Exception {
-        StubHttpServletRequest request = new StubHttpServletRequest();
-        StubHttpServletResponse response = new StubHttpServletResponse(request);
-        request.setServletPath("open.knowledge/list");
-        request.setMethod("get");
-        
-        invoke(request, response, ForwardBoundary.class);
-        
+        StubHttpServletRequest request = openKnowledges(null);
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(0, knowledges.size());
@@ -78,15 +71,7 @@ public void testAccessListByNoLoginUser() throws Exception {
     @Test
     @Order(order = 3)
     public void testAccessListByLoginedUser() throws Exception {
-        StubHttpServletRequest request = new StubHttpServletRequest();
-        StubHttpServletResponse response = new StubHttpServletResponse(request);
-        request.setServletPath("open.knowledge/list");
-        request.setMethod("get");
-        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
-        auth.setSession(INTEGRATION_TEST_USER_01, request, response);
-        
-        invoke(request, response, ForwardBoundary.class);
-        
+        StubHttpServletRequest request = openKnowledges(INTEGRATION_TEST_USER_01);
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(0, knowledges.size());
@@ -121,27 +106,9 @@ public void testInitNotificationByLoginedUser() throws Exception {
     @Test
     @Order(order = 5)
     public void testInitCPByLoginedUser() throws Exception {
-        LoginedUser user = super.getLoginUser(INTEGRATION_TEST_USER_01);
-        
-        StubHttpServletRequest request = new StubHttpServletRequest();
-        StubHttpServletResponse response = new StubHttpServletResponse(request);
-        request.setServletPath("open.account/info/" + user.getUserId());
-        request.setMethod("get");
-        
-        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
-        Assert.assertEquals("/WEB-INF/views/open/account/account.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
-        Assert.assertEquals((long) 0, request.getAttribute("point"));
-        
-        LoginedUser user2 = super.getLoginUser(INTEGRATION_TEST_USER_02);
-        request.setServletPath("open.account/info/" + user2.getUserId());
-        
-        boundary = invoke(request, response, ForwardBoundary.class);
-        Assert.assertEquals("/WEB-INF/views/open/account/account.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
-        Assert.assertEquals((long) 0, request.getAttribute("point"));
+        assertCP(INTEGRATION_TEST_USER_01, 0);
+        assertCP(INTEGRATION_TEST_USER_02, 0);
     }
-
-    
-    
     
     /**
      * ユーザ2で「公開」の記事を1件追加
@@ -187,37 +154,40 @@ public void testPostPublic() throws Exception {
         
         knowledgeId = new Long(sendObject.getResult());
     }
+    
+    /**
+     * CPの確認（ユーザ1と2）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 101)
+    public void testCPAfterPost() throws Exception {
+        assertCP(INTEGRATION_TEST_USER_01, 0);
+        assertCP(INTEGRATION_TEST_USER_02, 50);
+        assertKnowledgeCP(null, knowledgeId, 50);
+    }
+    
+    
 
     /**
      * 未ログインユーザで、Knowledgeを参照
-     * 
      * @throws Exception
      */
     @Test
-    @Order(order = 101)
+    @Order(order = 102)
     public void testAccessListByNoLoginUser2() throws Exception {
-        // 一覧を表示
-        StubHttpServletRequest request = new StubHttpServletRequest();
-        StubHttpServletResponse response = new StubHttpServletResponse(request);
-        request.setServletPath("open.knowledge/list");
-        request.setMethod("get");
-        
-        invoke(request, response, ForwardBoundary.class);
-        
+        // 一覧表示画面を開き、
+        StubHttpServletRequest request = openKnowledges(null);
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(1, knowledges.size());
-
         KnowledgesEntity knowledge = knowledges.get(0);
         Assert.assertEquals("タイトル", knowledge.getTitle());
         Assert.assertEquals("内容", knowledge.getContent());
         Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, knowledge.getPublicFlag().intValue());
-
-        // 詳細表示
-        request.setServletPath("open.knowledge/view/" + knowledge.getKnowledgeId());
-        
-        invoke(request, response, ForwardBoundary.class);
         
+        // 詳細表示
+        request = openKnowledge(null, knowledgeId);
         Assert.assertEquals("タイトル", request.getAttribute("title"));
         Assert.assertEquals("<p>内容</p>\n", request.getAttribute("content")); // Markdownが処理されている
         Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, request.getAttribute("publicFlag"));
@@ -225,39 +195,78 @@ public void testAccessListByNoLoginUser2() throws Exception {
 
     /**
      * ログインユーザでKnowledgeを参照
-     * 
      * @throws Exception
      */
     @Test
-    @Order(order = 102)
+    @Order(order = 103)
     public void testAccessListByLoginedUser2() throws Exception {
-        StubHttpServletRequest request = new StubHttpServletRequest();
-        StubHttpServletResponse response = new StubHttpServletResponse(request);
-        request.setServletPath("open.knowledge/list");
-        request.setMethod("get");
-        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
-        auth.setSession(INTEGRATION_TEST_USER_01, request, response);
-        
-        invoke(request, response, ForwardBoundary.class);
-        
+        // 一覧表示画面を開き、
+        StubHttpServletRequest request = openKnowledges(INTEGRATION_TEST_USER_01);
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(1, knowledges.size());
-
         KnowledgesEntity knowledge = knowledges.get(0);
         Assert.assertEquals("タイトル", knowledge.getTitle());
         Assert.assertEquals("内容", knowledge.getContent());
         Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, knowledge.getPublicFlag().intValue());
-
+        
         // 詳細表示
-        request.setServletPath("open.knowledge/view/" + knowledge.getKnowledgeId());
-        invoke(request, response, ForwardBoundary.class);
+        request = openKnowledge(INTEGRATION_TEST_USER_01, knowledgeId);
+        Assert.assertEquals("タイトル", request.getAttribute("title"));
+        Assert.assertEquals("<p>内容</p>\n", request.getAttribute("content")); // Markdownが処理されている
+        Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, request.getAttribute("publicFlag"));
+    }
+    
+    /**
+     * CPの確認（ユーザ1と2）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 104)
+    public void testCPAfterRead() throws Exception {
+        assertCP(INTEGRATION_TEST_USER_01, 1);
+        assertCP(INTEGRATION_TEST_USER_02, 1);
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 1);
+    }
+    
+    /**
+     * ログインユーザでKnowledgeを再度参照
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 105)
+    public void testReAccessListByLoginedUser2() throws Exception {
+        // 一覧表示画面を開き、
+        StubHttpServletRequest request = openKnowledges(INTEGRATION_TEST_USER_01);
+        List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
+        Assert.assertNotNull(knowledges);
+        Assert.assertEquals(1, knowledges.size());
+        KnowledgesEntity knowledge = knowledges.get(0);
+        Assert.assertEquals("タイトル", knowledge.getTitle());
+        Assert.assertEquals("内容", knowledge.getContent());
+        Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, knowledge.getPublicFlag().intValue());
         
+        // 詳細表示
+        request = openKnowledge(INTEGRATION_TEST_USER_01, knowledgeId);
         Assert.assertEquals("タイトル", request.getAttribute("title"));
         Assert.assertEquals("<p>内容</p>\n", request.getAttribute("content")); // Markdownが処理されている
         Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, request.getAttribute("publicFlag"));
     }
     
+    /**
+     * CPの確認（ユーザ1と2）
+     * 同じユーザで再度開いてもポイントはつかない
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 106)
+    public void testCPAfterReRead() throws Exception {
+        assertCP(INTEGRATION_TEST_USER_01, 0); // 変化無し
+        assertCP(INTEGRATION_TEST_USER_02, 0); // 変化無し
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0);
+    }
+    
+    
     /**
      * ログインユーザで、通知の確認(未だ何も届いていない）
      * @throws Exception
@@ -265,21 +274,8 @@ public void testAccessListByLoginedUser2() throws Exception {
     @Test
     @Order(order = 200)
     public void testNothingNotificationByLoginedUser1() throws Exception {
-        StubHttpServletRequest request = new StubHttpServletRequest();
-        StubHttpServletResponse response = new StubHttpServletResponse(request);
-        request.setServletPath("protect.notification/list");
-        request.setMethod("get");
-        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
-        auth.setSession(INTEGRATION_TEST_USER_01, request, response);
-        
-        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
-        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
-        
-        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
-        Assert.assertNotNull(notifications);
-        Assert.assertEquals(0, notifications.size());
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 0);
     }
-
     /**
      * ログインユーザ2で、通知の確認(未だ何も届いていない）
      * @throws Exception
@@ -287,19 +283,7 @@ public void testNothingNotificationByLoginedUser1() throws Exception {
     @Test
     @Order(order = 201)
     public void testNothingNotificationByLoginedUser2() throws Exception {
-        StubHttpServletRequest request = new StubHttpServletRequest();
-        StubHttpServletResponse response = new StubHttpServletResponse(request);
-        request.setServletPath("protect.notification/list");
-        request.setMethod("get");
-        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
-        auth.setSession(INTEGRATION_TEST_USER_02, request, response);
-        
-        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
-        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
-        
-        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
-        Assert.assertNotNull(notifications);
-        Assert.assertEquals(0, notifications.size());
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 0);
     }
     
     /**
@@ -309,11 +293,7 @@ public void testNothingNotificationByLoginedUser2() throws Exception {
     @Test
     @Order(order = 202)
     public void testExecNotification() throws Exception {
-        NotifyQueuesEntity notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
-        Assert.assertNotNull(notify);
-        NotifyMailBat.main(null);
-        notify = NotifyQueuesDao.get().selectOnTypeAndId(QueueNotification.TYPE_KNOWLEDGE_INSERT, knowledgeId);
-        Assert.assertNull(notify);
+        execNotificationQueue();
     }
 
     /**
@@ -323,19 +303,7 @@ public void testExecNotification() throws Exception {
     @Test
     @Order(order = 203)
     public void testNotificationByLoginedUser1() throws Exception {
-        StubHttpServletRequest request = new StubHttpServletRequest();
-        StubHttpServletResponse response = new StubHttpServletResponse(request);
-        request.setServletPath("protect.notification/list");
-        request.setMethod("get");
-        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
-        auth.setSession(INTEGRATION_TEST_USER_01, request, response);
-        
-        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
-        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
-        
-        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
-        Assert.assertNotNull(notifications);
-        Assert.assertEquals(1, notifications.size()); // 登録通知が届いている
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 1);
     }
 
     /**
@@ -346,20 +314,274 @@ public void testNotificationByLoginedUser1() throws Exception {
     @Test
     @Order(order = 204)
     public void testNotificationByLoginedUser2() throws Exception {
-        StubHttpServletRequest request = new StubHttpServletRequest();
-        StubHttpServletResponse response = new StubHttpServletResponse(request);
-        request.setServletPath("protect.notification/list");
-        request.setMethod("get");
-        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
-        auth.setSession(INTEGRATION_TEST_USER_02, request, response);
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+    }
+    
+    /**
+     * 未ログインユーザにて、イイネを押下
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 300)
+    public void testLikeByNoLoginUser() throws Exception {
+        LikeCount like = like(null, knowledgeId);
+        Assert.assertEquals((long) 1, like.getCount().longValue());
+    }
+    /**
+     * CPの確認（ユーザ1と2）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 301)
+    public void testCPAfterLikeNotLogin() throws Exception {
+        assertCP(INTEGRATION_TEST_USER_01, 0); // 変化無し
+        assertCP(INTEGRATION_TEST_USER_02, 0); // 変化無し
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0);
+    }
+    
+    /**
+     * 通知を処理
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 302)
+    public void testNotificationAfterLikeByAnonymous() throws Exception {
+        execNotificationQueue();
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 0);
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+    }
+    
+    
+    /**
+     * ログインユーザ1にて、イイネを押下
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 303)
+    public void testLikeByLoginUser1() throws Exception {
+        LikeCount like = like(INTEGRATION_TEST_USER_01, knowledgeId);
+        Assert.assertEquals((long) 2, like.getCount().longValue());
+    }
+    
+    /**
+     * CPの確認（ユーザ1と2）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 304)
+    public void testCPAfterLikeLogined() throws Exception {
+        assertCP(INTEGRATION_TEST_USER_01, 2); // +2
+        assertCP(INTEGRATION_TEST_USER_02, 10); // +10
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 10);
+    }
+    
+    
+    /**
+     * 通知を処理
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 305)
+    public void testNotificationAfterLikeByUser1() throws Exception {
+        execNotificationQueue();
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 0);
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+    }
+    
+    
+    /**
+     * ログインユーザ2にて、イイネを押下
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 306)
+    public void testLikeByLoginUser2() throws Exception {
+        LikeCount like = like(INTEGRATION_TEST_USER_02, knowledgeId);
+        Assert.assertEquals((long) 3, like.getCount().longValue());
+    }
+    
+    /**
+     * CPの確認（ユーザ1と2）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 307)
+    public void testCPAfterLikeLogined2() throws Exception {
+        assertCP(INTEGRATION_TEST_USER_01, 0); // 変化無し
+        assertCP(INTEGRATION_TEST_USER_02, 2); // 自分で押しても +10 はつかない / アクション起こした +2 はつく
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0);
+    }
+    
+    /**
+     * 通知を処理
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 308)
+    public void testNotificationAfterLikeByUser2() throws Exception {
+        execNotificationQueue();
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 0);
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+    }
+    
+    /**
+     * ログインユーザ1にて、イイネを押下（再実行)
+     * 
+     * TODO 再度実行してもポイントなどはつかないが、通知は押した回数分送っている
+     * 一度送った場合は、そのユーザが何回いいねを押しても通知しない方がよさげ
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 309)
+    public void testReLikeByLoginUser1() throws Exception {
+        LikeCount like = like(INTEGRATION_TEST_USER_01, knowledgeId);
+        Assert.assertEquals((long) 4, like.getCount().longValue());
         
-        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
-        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        assertCP(INTEGRATION_TEST_USER_01, 0); // 変化無し
+        assertCP(INTEGRATION_TEST_USER_02, 0); // 変化無し
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0); // 変化無し
+
+        execNotificationQueue();
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 0);
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+    }
+    
+    
+    /**
+     * ログインユーザ1にて、コメント追加
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 400)
+    public void testPostCommentByLoginUser1() throws Exception {
+        // コメントが登録されていないこと
+        StubHttpServletRequest request = openKnowledge(INTEGRATION_TEST_USER_01, knowledgeId);
+        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
+        Assert.assertEquals(0, comments.size()); // 閲覧者にもデフォルト通知（初期設定）
         
-        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
-        Assert.assertNotNull(notifications);
-        Assert.assertEquals(1, notifications.size()); // 登録通知が届いている
+        // コメントが登録できること
+        comment(INTEGRATION_TEST_USER_01, knowledgeId, "コメント");
+        
+        // CP確認
+        assertCP(INTEGRATION_TEST_USER_01, 20); // コメント追加者 +20
+        assertCP(INTEGRATION_TEST_USER_02, 0); // コメントを追加した記事の作者は変化無し
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 20); // +20
+        
+        // 通知の確認
+        execNotificationQueue();
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 1);
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+        
+        // コメントが登録されていないこと
+        request = openKnowledge(INTEGRATION_TEST_USER_01, knowledgeId);
+        comments = (List<CommentsEntity>) request.getAttribute("comments");
+        Assert.assertEquals(1, comments.size()); // 閲覧者にもデフォルト通知（初期設定）
+    }
+
+    
+    /**
+     * ログインユーザ2でコメントにいいね
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 401)
+    public void testLikeCommentByLoginUser2() throws Exception {
+        StubHttpServletRequest request = openKnowledge(INTEGRATION_TEST_USER_02, knowledgeId);
+        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
+        CommentsEntity comment = comments.get(0);
+        
+        LikeCount like = likeComment(INTEGRATION_TEST_USER_02, knowledgeId, comment.getCommentNo());
+        Assert.assertEquals((long) 1, like.getCount().longValue());
+        
+        assertCP(INTEGRATION_TEST_USER_01, 10); // +10
+        assertCP(INTEGRATION_TEST_USER_02, 2); // +2(押した)
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0); // ユーザ2は記事の作者なので、作者が押してもポイントは増えない（コメントであっても）
+
+        execNotificationQueue();
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 1); // コメント登録者に通知
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 0);
+    }
+
+
+    /**
+     * ログインユーザ3でコメントにいいね
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 402)
+    public void testLikeCommentByLoginUser3() throws Exception {
+        StubHttpServletRequest request = openKnowledge(INTEGRATION_TEST_USER_03, knowledgeId);
+        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
+        CommentsEntity comment = comments.get(0);
+        
+        LikeCount like = likeComment(INTEGRATION_TEST_USER_03, knowledgeId, comment.getCommentNo());
+        Assert.assertEquals((long) 2, like.getCount().longValue());
+        
+        assertCP(INTEGRATION_TEST_USER_01, 10); // +10
+        assertCP(INTEGRATION_TEST_USER_02, 1); // 参照
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 11); // イイネ + ユーザ3での参照
+
+        execNotificationQueue();
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 1); // コメント登録者に通知
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 0);
+    }
+
+
+    /**
+     * ログインユーザ1でコメントにいいね(登録者)
+     * 
+     * TODO コメントの場合、いいねを作者が押すと、アクションポイント(+2)がつかない？
+     * TODO 自分のコメントであっても、記事の作者と違うので、記事にポイント(+10)がつくがおかしくない？
+     * TODO 自分でいいねを押しても通知が届いてしまう
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 403)
+    public void testLikeCommentByLoginUser1() throws Exception {
+        StubHttpServletRequest request = openKnowledge(INTEGRATION_TEST_USER_01, knowledgeId);
+        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
+        CommentsEntity comment = comments.get(0);
+        
+        LikeCount like = likeComment(INTEGRATION_TEST_USER_01, knowledgeId, comment.getCommentNo());
+        Assert.assertEquals((long) 3, like.getCount().longValue());
+        
+        assertCP(INTEGRATION_TEST_USER_01, 0); // ポイントつかない？
+        assertCP(INTEGRATION_TEST_USER_02, 0); 
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 10);
+
+        execNotificationQueue();
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 1); // コメント登録者に通知
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 0);
+    }
+    
+
+    /**
+     * 未ログインユーザでコメントにいいね
+     * 
+     * 未ログインユーザの場合ポイントつかない
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 404)
+    public void testLikeCommentByAnonymous() throws Exception {
+        StubHttpServletRequest request = openKnowledge(null, knowledgeId);
+        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
+        CommentsEntity comment = comments.get(0);
+        LikeCount like = likeComment(null, knowledgeId, comment.getCommentNo());
+        Assert.assertEquals((long) 4, like.getCount().longValue());
+        
+        assertCP(INTEGRATION_TEST_USER_01, 0);
+        assertCP(INTEGRATION_TEST_USER_02, 0); 
+        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0);
+
+        execNotificationQueue();
+        assertNotificationCount(INTEGRATION_TEST_USER_01, 1); // コメント登録者に通知
+        assertNotificationCount(INTEGRATION_TEST_USER_02, 0);
     }
     
     
+
 }

From dafec74c57d76f7816fff120cac66d095ca38bae Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 28 Sep 2017 02:41:05 +0900
Subject: [PATCH 084/138] Add integration test

---
 .../knowledge/control/api/AttachControl.java  |   2 +-
 .../knowledge/control/api/GroupsControl.java  |   3 +-
 .../control/api/KnowledgesControl.java        |   8 +-
 .../knowledge/control/api/SampleControl.java  |   2 +-
 .../knowledge/control/api/UsersControl.java   |   2 +-
 .../control/open/KnowledgeControl.java        |   4 +-
 .../control/protect/TokenControl.java         |   3 +-
 .../logic/KnowledgeDataEditLogic.java         |   6 +
 .../knowledge/logic/KnowledgeLogic.java       |   1 +
 .../project/knowledge/vo/api/Knowledge.java   |   3 +-
 .../integration/IntegrationAPITest.java       | 118 +++++++
 .../integration/IntegrationCommon.java        | 227 +++++++++++++-
 .../integration/IntegrationPostTest.java      | 294 +++++++++++-------
 .../knowledge/integration/post_knowledge.json |   5 +
 .../knowledge/integration/put_knowledge.json  |   5 +
 15 files changed, 547 insertions(+), 136 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/integration/IntegrationAPITest.java
 create mode 100644 src/test/resources/org/support/project/knowledge/integration/post_knowledge.json
 create mode 100644 src/test/resources/org/support/project/knowledge/integration/put_knowledge.json

diff --git a/src/main/java/org/support/project/knowledge/control/api/AttachControl.java b/src/main/java/org/support/project/knowledge/control/api/AttachControl.java
index 4ac6ecaf8..38fad5617 100644
--- a/src/main/java/org/support/project/knowledge/control/api/AttachControl.java
+++ b/src/main/java/org/support/project/knowledge/control/api/AttachControl.java
@@ -14,7 +14,7 @@ public class AttachControl extends ApiControl {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(AttachControl.class);
 
-    @Get(path="api/attachments")
+    @Get(path="api/attachments", publishToken="")
     public Boundary index() {
         return get();
     }
diff --git a/src/main/java/org/support/project/knowledge/control/api/GroupsControl.java b/src/main/java/org/support/project/knowledge/control/api/GroupsControl.java
index 52e97db82..902dc9309 100644
--- a/src/main/java/org/support/project/knowledge/control/api/GroupsControl.java
+++ b/src/main/java/org/support/project/knowledge/control/api/GroupsControl.java
@@ -22,14 +22,13 @@
 import org.support.project.web.control.ApiControl;
 import org.support.project.web.control.service.Get;
 import org.support.project.web.entity.GroupsEntity;
-import org.support.project.web.entity.UsersEntity;
 
 @DI(instance = Instance.Prototype)
 public class GroupsControl extends ApiControl {
     /**
      * List groups
      */
-    @Get(path="api/groups")
+    @Get(path="api/groups", publishToken="")
     public Boundary index() {
         return get();
     }
diff --git a/src/main/java/org/support/project/knowledge/control/api/KnowledgesControl.java b/src/main/java/org/support/project/knowledge/control/api/KnowledgesControl.java
index 5ef8d6778..e76bbb1e4 100644
--- a/src/main/java/org/support/project/knowledge/control/api/KnowledgesControl.java
+++ b/src/main/java/org/support/project/knowledge/control/api/KnowledgesControl.java
@@ -32,7 +32,7 @@ public class KnowledgesControl extends ApiControl {
     /** ログ */
     private static Log LOG = LogFactory.getLog(ControlManagerFilter.class);
     
-    @Get(path="api/knowledges")
+    @Get(path="api/knowledges", publishToken="")
     public Boundary index() {
         return get();
     }
@@ -71,7 +71,7 @@ public Boundary getSingle(String id) {
     /**
      * Post knowledges
      */
-    @Post(path="api/knowledges", checkReferer=false)
+    @Post(path="api/knowledges", checkReferer=false, subscribeToken="")
     public Boundary post() {
         try {
             KnowledgeDetail data = getJsonObject(KnowledgeDetail.class);
@@ -91,7 +91,7 @@ public Boundary post() {
     /**
      * Put knowledges
      */
-    @Put(path="api/knowledges", checkReferer=false)
+    @Put(path="api/knowledges", checkReferer=false, subscribeToken="")
     public Boundary put() {
         try {
             Long id = getPathLong();
@@ -114,7 +114,7 @@ public Boundary put() {
     /**
      * Delete knowledges
      */
-    @Delete(path="api/knowledges", checkReferer=false)
+    @Delete(path="api/knowledges", checkReferer=false, subscribeToken="")
     public Boundary delete() {
         try {
             Long id = getPathLong();
diff --git a/src/main/java/org/support/project/knowledge/control/api/SampleControl.java b/src/main/java/org/support/project/knowledge/control/api/SampleControl.java
index b73af7b5d..5611fb8bd 100644
--- a/src/main/java/org/support/project/knowledge/control/api/SampleControl.java
+++ b/src/main/java/org/support/project/knowledge/control/api/SampleControl.java
@@ -12,7 +12,7 @@ public class SampleControl extends Control {
     /**
      * サンプル
      */
-    @Get(path="api/sample")
+    @Get(path="api/sample", publishToken="")
     public Boundary index() {
         Msg msg = new Msg("Hi, " + getLoginedUser().getLoginUser().getUserName()  + ", this is api sample.");
         return send(msg);
diff --git a/src/main/java/org/support/project/knowledge/control/api/UsersControl.java b/src/main/java/org/support/project/knowledge/control/api/UsersControl.java
index 0013a42fc..06f140f13 100644
--- a/src/main/java/org/support/project/knowledge/control/api/UsersControl.java
+++ b/src/main/java/org/support/project/knowledge/control/api/UsersControl.java
@@ -24,7 +24,7 @@ public class UsersControl extends ApiControl {
     /**
      * List users
      */
-    @Get(path="api/users")
+    @Get(path="api/users", publishToken="")
     public Boundary index() {
         return get();
     }
diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 756265758..98d2e2267 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -658,7 +658,7 @@ public Boundary stocks() throws InvalidParamException {
      * @return
      * @throws InvalidParamException
      */
-    @Post
+    @Post(subscribeToken="knowledge")
     public Boundary like() throws InvalidParamException {
         Long knowledgeId = super.getPathLong(Long.valueOf(-1));
         KnowledgeLogic knowledgeLogic = KnowledgeLogic.get();
@@ -676,7 +676,7 @@ public Boundary like() throws InvalidParamException {
      * @return
      * @throws InvalidParamException 
      */
-    @Post
+    @Post(subscribeToken="knowledge")
     public Boundary likecomment() throws InvalidParamException {
         Long commentNo = super.getPathLong(Long.valueOf(-1));
         KnowledgeLogic knowledgeLogic = KnowledgeLogic.get();
diff --git a/src/main/java/org/support/project/knowledge/control/protect/TokenControl.java b/src/main/java/org/support/project/knowledge/control/protect/TokenControl.java
index 53a7734ea..5a8b48beb 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/TokenControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/TokenControl.java
@@ -8,7 +8,6 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
-import org.support.project.common.util.DateUtils;
 import org.support.project.common.util.RandomUtil;
 import org.support.project.common.util.StringUtils;
 import org.support.project.di.DI;
@@ -35,6 +34,7 @@ private DateFormat gateDayFormat() {
      */
     @Get
     public Boundary index() {
+        LOG.trace("access to index");
         String expires = "";
         TokensEntity entity = TokensDao.get().selectOnUserId(getLoginUserId());
         if (entity == null) {
@@ -54,6 +54,7 @@ public Boundary index() {
      */
     @Post
     public Boundary save() {
+        LOG.trace("access to save");
         String expires = getParam("expires");
         if (StringUtils.isEmpty(expires)) {
             expires = "9999-12-31";
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeDataEditLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeDataEditLogic.java
index 36564bb1d..43f58a042 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeDataEditLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeDataEditLogic.java
@@ -50,6 +50,9 @@ private KnowledgeData conv(KnowledgeDetail data) throws InvalidParamException {
         KnowledgesEntity entity = new KnowledgesEntity();
         PropertyUtil.copyPropertyValue(data, entity);
         
+        // 必須チェックエラーになるので、初期値をセット（更新時は、KnowledgeLogicのupdateの中でDBに保存されている値を保持するようにセットしなおしている）
+        entity.setPoint(0);
+        
         List<ValidateError> errors = entity.validate();
         if (errors != null && !errors.isEmpty()) {
             StringJoinBuilder<String> builder = new StringJoinBuilder<>();
@@ -100,6 +103,9 @@ private KnowledgeData conv(KnowledgeDetail data) throws InvalidParamException {
     }
     
     private String convTargets(Target viewers) {
+        if (viewers == null) {
+            return "";
+        }
         StringJoinBuilder<String> builder = new StringJoinBuilder<>();
         List<NameId> groups = viewers.getGroups();
         if (groups != null) {
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index a7400a7ae..03ae458b2 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -252,6 +252,7 @@ public KnowledgesEntity update(KnowledgeData data, LoginedUser loginedUser) thro
 
         // ナレッッジを更新
         data.getKnowledge().setNotifyStatus(db.getNotifyStatus()); // 通知フラグはDBの値を引き継ぐ
+        data.getKnowledge().setPoint(db.getPoint()); // ポイントもDBの値を引き継ぐ
         KnowledgesEntity updatedEntity = knowledgesDao.update(data.getKnowledge());
         // ユーザのアクセス権を解除
         knowledgeUsersDao.deleteOnKnowledgeId(updatedEntity.getKnowledgeId());
diff --git a/src/main/java/org/support/project/knowledge/vo/api/Knowledge.java b/src/main/java/org/support/project/knowledge/vo/api/Knowledge.java
index d69c7238d..ef468a3c4 100644
--- a/src/main/java/org/support/project/knowledge/vo/api/Knowledge.java
+++ b/src/main/java/org/support/project/knowledge/vo/api/Knowledge.java
@@ -1,6 +1,7 @@
 package org.support.project.knowledge.vo.api;
 
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
 
 public class Knowledge {
@@ -26,7 +27,7 @@ public class Knowledge {
     private Timestamp updateDatetime;
     
     /** タグ */
-    private List<String> tags;
+    private List<String> tags = new ArrayList<>();
     
     /** テンプレート名 */
     private String template;
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationAPITest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationAPITest.java
new file mode 100644
index 000000000..1d5bd13e2
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationAPITest.java
@@ -0,0 +1,118 @@
+package org.support.project.knowledge.integration;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.knowledge.vo.api.Knowledge;
+import org.support.project.web.boundary.ForwardBoundary;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+import org.support.project.web.test.stub.StubHttpServletRequest;
+import org.support.project.web.test.stub.StubHttpServletResponse;
+
+public class IntegrationAPITest extends IntegrationCommon {
+    
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(IntegrationAPITest.class);
+    
+    private static final String USER_01 = "integration-test-user-01";
+
+    /**
+     * ユーザを登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        addUser(USER_01);
+        
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(USER_01, request, response);
+        // 参照画面を開く(CSRF Token)
+        request.setServletPath("protect.token/index");
+        request.setMethod("get");
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/token/index.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        // アクセスTokenを発行
+        request.setServletPath("protect.token/save");
+        request.setMethod("post");
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/token/index.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+
+        String token = (String) request.getAttribute("token");
+        Assert.assertNotNull(token);
+    }
+    
+    /**
+     * KnowledgeをPost
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 10)
+    public void testPost() throws Exception {
+        long knowledgeId = knowledgePostOnAPI(USER_01, "post_knowledge.json");
+        Assert.assertEquals(1, knowledgeId);
+    }
+    
+    /**
+     * Knowledgeを参照
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 11)
+    public void testViewAfterPost() throws Exception {
+        Knowledge result = knowledgeGetOnAPI(USER_01, 1);
+        Assert.assertEquals((long) 1, result.getKnowledgeId().longValue());
+        Assert.assertEquals("タイトル", result.getTitle());
+        Assert.assertEquals("コンテンツ", result.getContent());
+    }
+    
+    /**
+     * KnowledgeをPut
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 20)
+    public void testPut() throws Exception {
+        knowledgePutOnAPI(USER_01, "put_knowledge.json", 1);
+    }
+    
+    /**
+     * Knowledgeを参照
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 21)
+    public void testViewAfterPut() throws Exception {
+        Knowledge result = knowledgeGetOnAPI(USER_01, 1);
+        Assert.assertEquals((long) 1, result.getKnowledgeId().longValue());
+        Assert.assertEquals("タイトル更新", result.getTitle());
+        Assert.assertEquals("コンテンツ更新", result.getContent());
+    }
+    
+    /**
+     * KnowledgeをPut
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 30)
+    public void testDelete() throws Exception {
+        knowledgeDeleteOnAPI(USER_01, 1);
+    }
+    
+    /**
+     * Knowledgeを参照
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 31)
+    public void testViewAfterDelete() throws Exception {
+        knowledgeGetOnAPI(USER_01, 0);
+    }
+}
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
index bdb76e7a8..b661e6272 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
@@ -1,5 +1,6 @@
 package org.support.project.knowledge.integration;
 
+import java.io.ByteArrayInputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -11,6 +12,7 @@
 import org.junit.BeforeClass;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.FileUtil;
 import org.support.project.common.util.PropertyUtil;
 import org.support.project.common.util.StringUtils;
 import org.support.project.knowledge.TestCommon;
@@ -18,9 +20,13 @@
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.AuthType;
 import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.vo.LikeCount;
+import org.support.project.knowledge.vo.api.Knowledge;
 import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.Msg;
+import org.support.project.web.bean.NameId;
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.boundary.JsonBoundary;
 import org.support.project.web.boundary.RedirectBoundary;
@@ -38,10 +44,13 @@ public abstract class IntegrationCommon extends TestCommon {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(IntegrationCommon.class);
     
+    private static boolean isInitCallControlLogic = false;
+    
     private static Map<String, Long> userPointMap = new HashMap<>();
     private static Map<Long, Long> knowledgePointMap = new HashMap<>();
     private static Map<String, Integer> userNotificationCountMap = new HashMap<>();
-
+    private static Map<Long, Integer> knowledgeLikeMap = new HashMap<>();
+    private static Map<Long, Integer> commentLikeMap = new HashMap<>();
     
     /**
      * @BeforeClass
@@ -50,16 +59,20 @@ public abstract class IntegrationCommon extends TestCommon {
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
         TestCommon.setUpBeforeClass();
-        String controlPackage = "org.support.project.knowledge.control,org.support.project.web.control";
-        String classSuffix = "Control";
-        String ignoreRegularExpression = "^/ws|^/template|^/bower|css$|js$|ico$|html$";
-        CallControlLogic.get().init(controlPackage, classSuffix, true, ignoreRegularExpression);
         
         MailConfigsEntity mailConfig = new MailConfigsEntity(AppConfig.get().getSystemName());
         mailConfig.setHost("example.com");
         mailConfig.setPort(25);
         mailConfig.setAuthType(AuthType.None.getValue());
         MailConfigsDao.get().insert(mailConfig); // メール送信設定
+
+        if (!isInitCallControlLogic) {
+            String controlPackage = "org.support.project.knowledge.control,org.support.project.web.control";
+            String classSuffix = "Control";
+            String ignoreRegularExpression = "^/ws|^/template|^/bower|css$|js$|ico$|html$";
+            CallControlLogic.get().init(controlPackage, classSuffix, true, ignoreRegularExpression);
+            isInitCallControlLogic = true;
+        }
     }
     /**
      * コントローラーを呼び出し
@@ -206,8 +219,8 @@ protected StubHttpServletRequest openKnowledge(String userKey, long knowledgeId)
      * @return
      * @throws Exception
      */
-    protected LikeCount like(String userKey, long knowledgeId) throws Exception {
-        StubHttpServletRequest request = new StubHttpServletRequest();
+    private LikeCount like(String userKey, long knowledgeId) throws Exception {
+        StubHttpServletRequest request = openKnowledge(userKey, knowledgeId); //CSRF
         StubHttpServletResponse response = new StubHttpServletResponse(request);
         request.setServletPath("open.knowledge/like/" + knowledgeId);
         request.setMethod("post");
@@ -218,6 +231,23 @@ protected LikeCount like(String userKey, long knowledgeId) throws Exception {
         JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
         return (LikeCount) boundary.getObj();
     }
+    /**
+     * いいねを押下し、いいねの件数が+1されていることを確認
+     * @param userKey
+     * @param knowledgeId
+     * @throws Exception
+     */
+    protected void addLike(String userKey, long knowledgeId) throws Exception {
+        if (!knowledgeLikeMap.containsKey(knowledgeId)) {
+            knowledgeLikeMap.put(knowledgeId, 0);
+        }
+        int now = knowledgeLikeMap.get(knowledgeId);
+        now = now + 1;
+        knowledgeLikeMap.put(knowledgeId, now);
+        LikeCount like = like(userKey, knowledgeId);
+        Assert.assertEquals(now, like.getCount().longValue());
+    }
+    
     /**
      * コメントにイイネを押す
      * @param integrationTestUser02
@@ -225,8 +255,8 @@ protected LikeCount like(String userKey, long knowledgeId) throws Exception {
      * @param commentNo
      * @return
      */
-    protected LikeCount likeComment(String userKey, long knowledgeId, Long commentNo) throws Exception {
-        StubHttpServletRequest request = new StubHttpServletRequest();
+    private LikeCount likeComment(String userKey, long knowledgeId, Long commentNo) throws Exception {
+        StubHttpServletRequest request = openKnowledge(userKey, knowledgeId); // CSRF
         StubHttpServletResponse response = new StubHttpServletResponse(request);
         request.setServletPath("open.knowledge/likecomment/" + commentNo);
         request.setMethod("post");
@@ -238,6 +268,38 @@ protected LikeCount likeComment(String userKey, long knowledgeId, Long commentNo
         return (LikeCount) boundary.getObj();
     }
     
+    /**
+     * コメントにイイネを押し、いいねの件数が+1されていることを確認
+     * @param userKey
+     * @param knowledgeId
+     * @throws Exception
+     */
+    protected void addLikeComment(String userKey, long knowledgeId, long commentNo) throws Exception {
+        if (!commentLikeMap.containsKey(commentNo)) {
+            commentLikeMap.put(commentNo, 0);
+        }
+        int now = commentLikeMap.get(commentNo);
+        now = now + 1;
+        commentLikeMap.put(commentNo, now);
+        
+        LikeCount like = likeComment(userKey, knowledgeId, commentNo);
+        Assert.assertEquals(now, like.getCount().longValue());
+    }
+    /**
+     * コメントにイイネを押し、いいねの件数が+1されていることを確認
+     * @param userKey
+     * @param knowledgeId
+     * @throws Exception
+     */
+    protected void addLatestLikeComment(String userKey, long knowledgeId) throws Exception {
+        CommentsEntity comment = getLatestComment(userKey, knowledgeId);
+        if (comment == null) {
+            Assert.fail("comment not exists");
+        }
+        addLikeComment(userKey, knowledgeId, comment.getCommentNo());
+    }
+    
+    
     
     /**
      * コメント登録
@@ -251,6 +313,9 @@ protected void comment(String userKey, long knowledgeId, String comment) throws
             Assert.fail("post comment must be logined");
         }
         StubHttpServletRequest request = openKnowledge(userKey, knowledgeId); //CSRF
+        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
+        int commentCount = comments.size();
+        
         StubHttpServletResponse response = new StubHttpServletResponse(request);
         request.setServletPath("protect.knowledge/comment/" + knowledgeId);
         request.setMethod("post");
@@ -263,8 +328,27 @@ protected void comment(String userKey, long knowledgeId, String comment) throws
         
         RedirectBoundary boundary = invoke(request, response, RedirectBoundary.class);
         Assert.assertNotNull(boundary);
+        
+        // 登録確認（1件追加されている）
+        request = openKnowledge(userKey, knowledgeId);
+        comments = (List<CommentsEntity>) request.getAttribute("comments");
+        Assert.assertEquals(commentCount +1, comments.size());
+    }
+    /**
+     * 最新のコメントを取得
+     * @param userKey
+     * @param knowledgeId
+     * @return
+     * @throws Exception
+     */
+    protected CommentsEntity getLatestComment(String userKey, long knowledgeId) throws Exception {
+        StubHttpServletRequest request = openKnowledge(userKey, knowledgeId);
+        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
+        CommentsEntity comment = comments.get(comments.size() - 1);
+        return comment;
     }
     
+    
     /**
      * キューにある通知を処理する
      * @throws Exception
@@ -276,5 +360,130 @@ protected void execNotificationQueue() throws Exception {
         list = NotifyQueuesDao.get().selectAll();
         Assert.assertEquals(0, list.size());
     }
+    
+    /**
+     * WebAPIでKnowledgeをPOST（新規登録）
+     * @param userKey
+     * @param jsonResource
+     * @return
+     * @throws Exception
+     */
+    protected long knowledgePostOnAPI(String userKey, String jsonResource) throws Exception {
+        String json = FileUtil.read(this.getClass().getResourceAsStream(jsonResource));
+        LOG.info(json);
+        
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(userKey, request, response);
+        request.setServletPath("api/knowledges");
+        request.setMethod("post");
+        request.setInputstream(new ByteArrayInputStream(json.getBytes("utf-8")));
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        Object result = boundary.getObj();
+        LOG.info(result);
+        if (result instanceof NameId) {
+            NameId nameId = (NameId) boundary.getObj();
+            return new Long(nameId.getId());
+        }
+        Assert.fail("result is not NameId object.");
+        return -1;
+    }
+    /**
+     * WebAPIでKnowledgeをPUT（更新）
+     * @param userKey
+     * @param jsonResource
+     * @return
+     * @throws Exception
+     */
+    protected void knowledgePutOnAPI(String userKey, String jsonResource, long knowledgeId) throws Exception {
+        String json = FileUtil.read(this.getClass().getResourceAsStream(jsonResource));
+        LOG.info(json);
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(userKey, request, response);
+        request.setServletPath("api/knowledges/" + knowledgeId);
+        request.setMethod("put");
+        request.setInputstream(new ByteArrayInputStream(json.getBytes("utf-8")));
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        Object result = boundary.getObj();
+        LOG.info(result);
+        if (result instanceof Msg) {
+            Msg msg = (Msg) boundary.getObj();
+            Assert.assertEquals("updated", msg.getMsg());
+        } else {
+            Assert.fail("result is not Msg object.");
+        }
+    }
+    /**
+     * WebAPIでKnowledgeをDelete
+     * @param userKey
+     * @param knowledgeId
+     * @return
+     * @throws Exception
+     */
+    protected void knowledgeDeleteOnAPI(String userKey, long knowledgeId) throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(userKey, request, response);
+        request.setServletPath("api/knowledges/" + knowledgeId);
+        request.setMethod("delete");
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        Object result = boundary.getObj();
+        LOG.info(result);
+        if (result instanceof Msg) {
+            Msg msg = (Msg) boundary.getObj();
+            Assert.assertEquals("deleted", msg.getMsg());
+        } else {
+            Assert.fail("result is not Msg object.");
+        }
+    }
+    /**
+     * Knowledgeの一覧を取得し、一覧の最初のものを取得（リストの先頭は、最後に登録したもの）
+     * 同時に一覧で取得できる件数はチェックする
+     * 0件が期待値であった場合、Nullを返す
+     * @param userKey
+     * @param count
+     * @return
+     * @throws Exception
+     */
+    protected Knowledge knowledgeGetOnAPI(String userKey, int count) throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(userKey, request, response);
+        // 一覧取得
+        request.setServletPath("api/knowledges");
+        request.setMethod("get");
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        Object result = boundary.getObj();
+        long lastestKnowledgeId = -1;
+        if (result instanceof List) {
+            List<Knowledge> results = (List<Knowledge>) boundary.getObj();
+            Assert.assertEquals(count, results.size());
+            if (count > 0) {
+                lastestKnowledgeId = results.get(0).getKnowledgeId();
+            }
+        } else {
+            Assert.fail("result is not List object.");
+        }
+        if (count > 0) {
+            request.setServletPath("api/knowledges/" + lastestKnowledgeId);
+            request.setMethod("get");
+            boundary = invoke(request, response, JsonBoundary.class);
+            result = boundary.getObj();
+            if (result instanceof Knowledge) {
+                Knowledge knowledge = (Knowledge) boundary.getObj();
+                return knowledge;
+            } else {
+                Assert.fail("result is not Knowledge object.");
+            }
+        }
+        return null;
+    }
+    
+    
 
 }
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
index b414dbfbb..75c4ad8eb 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
@@ -27,11 +27,11 @@
  */
 public class IntegrationPostTest extends IntegrationCommon {
     /** ログ */
-    private static final Log LOG = LogFactory.getLog(IntegrationCommon.class);
+    private static final Log LOG = LogFactory.getLog(IntegrationPostTest.class);
     
-    private static final String INTEGRATION_TEST_USER_01 = "integration-test-user-01";
-    private static final String INTEGRATION_TEST_USER_02 = "integration-test-user-02";
-    private static final String INTEGRATION_TEST_USER_03 = "integration-test-user-03";
+    private static final String COMMENT_POST_USER = "integration-test-user-01";
+    private static final String KNOWLEDGE_POST_USER = "integration-test-user-02";
+    private static final String READ_USER = "integration-test-user-03";
     
     private static long knowledgeId; // テストメソッド単位にインスタンスが歳生成されるようなので、staticで保持する
     
@@ -44,9 +44,9 @@ public class IntegrationPostTest extends IntegrationCommon {
     @Order(order = 1)
     public void testUserInsert() throws Exception {
         LOG.info("ユーザ登録");
-        addUser(INTEGRATION_TEST_USER_01);
-        addUser(INTEGRATION_TEST_USER_02);
-        addUser(INTEGRATION_TEST_USER_03);
+        addUser(COMMENT_POST_USER);
+        addUser(KNOWLEDGE_POST_USER);
+        addUser(READ_USER);
     }
 
     /**
@@ -71,7 +71,7 @@ public void testAccessListByNoLoginUser() throws Exception {
     @Test
     @Order(order = 3)
     public void testAccessListByLoginedUser() throws Exception {
-        StubHttpServletRequest request = openKnowledges(INTEGRATION_TEST_USER_01);
+        StubHttpServletRequest request = openKnowledges(COMMENT_POST_USER);
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(0, knowledges.size());
@@ -89,7 +89,7 @@ public void testInitNotificationByLoginedUser() throws Exception {
         request.setServletPath("protect.notification/list");
         request.setMethod("get");
         DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
-        auth.setSession(INTEGRATION_TEST_USER_01, request, response);
+        auth.setSession(COMMENT_POST_USER, request, response);
         
         ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
         Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
@@ -106,8 +106,8 @@ public void testInitNotificationByLoginedUser() throws Exception {
     @Test
     @Order(order = 5)
     public void testInitCPByLoginedUser() throws Exception {
-        assertCP(INTEGRATION_TEST_USER_01, 0);
-        assertCP(INTEGRATION_TEST_USER_02, 0);
+        assertCP(COMMENT_POST_USER, 0);
+        assertCP(KNOWLEDGE_POST_USER, 0);
     }
     
     /**
@@ -124,7 +124,7 @@ public void testPostPublic() throws Exception {
         request.setServletPath("protect.knowledge/view_add");
         request.setMethod("get");
         DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
-        auth.setSession(INTEGRATION_TEST_USER_02, request, response);
+        auth.setSession(KNOWLEDGE_POST_USER, request, response);
         
         ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
         Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
@@ -162,8 +162,8 @@ public void testPostPublic() throws Exception {
     @Test
     @Order(order = 101)
     public void testCPAfterPost() throws Exception {
-        assertCP(INTEGRATION_TEST_USER_01, 0);
-        assertCP(INTEGRATION_TEST_USER_02, 50);
+        assertCP(COMMENT_POST_USER, 0);
+        assertCP(KNOWLEDGE_POST_USER, 50);
         assertKnowledgeCP(null, knowledgeId, 50);
     }
     
@@ -201,7 +201,7 @@ public void testAccessListByNoLoginUser2() throws Exception {
     @Order(order = 103)
     public void testAccessListByLoginedUser2() throws Exception {
         // 一覧表示画面を開き、
-        StubHttpServletRequest request = openKnowledges(INTEGRATION_TEST_USER_01);
+        StubHttpServletRequest request = openKnowledges(COMMENT_POST_USER);
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(1, knowledges.size());
@@ -211,7 +211,7 @@ public void testAccessListByLoginedUser2() throws Exception {
         Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, knowledge.getPublicFlag().intValue());
         
         // 詳細表示
-        request = openKnowledge(INTEGRATION_TEST_USER_01, knowledgeId);
+        request = openKnowledge(COMMENT_POST_USER, knowledgeId);
         Assert.assertEquals("タイトル", request.getAttribute("title"));
         Assert.assertEquals("<p>内容</p>\n", request.getAttribute("content")); // Markdownが処理されている
         Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, request.getAttribute("publicFlag"));
@@ -224,9 +224,9 @@ public void testAccessListByLoginedUser2() throws Exception {
     @Test
     @Order(order = 104)
     public void testCPAfterRead() throws Exception {
-        assertCP(INTEGRATION_TEST_USER_01, 1);
-        assertCP(INTEGRATION_TEST_USER_02, 1);
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 1);
+        assertCP(COMMENT_POST_USER, 1);
+        assertCP(KNOWLEDGE_POST_USER, 1);
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 1);
     }
     
     /**
@@ -237,7 +237,7 @@ public void testCPAfterRead() throws Exception {
     @Order(order = 105)
     public void testReAccessListByLoginedUser2() throws Exception {
         // 一覧表示画面を開き、
-        StubHttpServletRequest request = openKnowledges(INTEGRATION_TEST_USER_01);
+        StubHttpServletRequest request = openKnowledges(COMMENT_POST_USER);
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(1, knowledges.size());
@@ -247,7 +247,7 @@ public void testReAccessListByLoginedUser2() throws Exception {
         Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, knowledge.getPublicFlag().intValue());
         
         // 詳細表示
-        request = openKnowledge(INTEGRATION_TEST_USER_01, knowledgeId);
+        request = openKnowledge(COMMENT_POST_USER, knowledgeId);
         Assert.assertEquals("タイトル", request.getAttribute("title"));
         Assert.assertEquals("<p>内容</p>\n", request.getAttribute("content")); // Markdownが処理されている
         Assert.assertEquals(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, request.getAttribute("publicFlag"));
@@ -261,9 +261,9 @@ public void testReAccessListByLoginedUser2() throws Exception {
     @Test
     @Order(order = 106)
     public void testCPAfterReRead() throws Exception {
-        assertCP(INTEGRATION_TEST_USER_01, 0); // 変化無し
-        assertCP(INTEGRATION_TEST_USER_02, 0); // 変化無し
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0);
+        assertCP(COMMENT_POST_USER, 0); // 変化無し
+        assertCP(KNOWLEDGE_POST_USER, 0); // 変化無し
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 0);
     }
     
     
@@ -274,7 +274,7 @@ public void testCPAfterReRead() throws Exception {
     @Test
     @Order(order = 200)
     public void testNothingNotificationByLoginedUser1() throws Exception {
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 0);
+        assertNotificationCount(COMMENT_POST_USER, 0);
     }
     /**
      * ログインユーザ2で、通知の確認(未だ何も届いていない）
@@ -283,7 +283,7 @@ public void testNothingNotificationByLoginedUser1() throws Exception {
     @Test
     @Order(order = 201)
     public void testNothingNotificationByLoginedUser2() throws Exception {
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 0);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 0);
     }
     
     /**
@@ -303,7 +303,7 @@ public void testExecNotification() throws Exception {
     @Test
     @Order(order = 203)
     public void testNotificationByLoginedUser1() throws Exception {
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 1);
+        assertNotificationCount(COMMENT_POST_USER, 1);
     }
 
     /**
@@ -314,7 +314,7 @@ public void testNotificationByLoginedUser1() throws Exception {
     @Test
     @Order(order = 204)
     public void testNotificationByLoginedUser2() throws Exception {
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
     }
     
     /**
@@ -324,8 +324,7 @@ public void testNotificationByLoginedUser2() throws Exception {
     @Test
     @Order(order = 300)
     public void testLikeByNoLoginUser() throws Exception {
-        LikeCount like = like(null, knowledgeId);
-        Assert.assertEquals((long) 1, like.getCount().longValue());
+        addLike(null, knowledgeId);
     }
     /**
      * CPの確認（ユーザ1と2）
@@ -334,9 +333,9 @@ public void testLikeByNoLoginUser() throws Exception {
     @Test
     @Order(order = 301)
     public void testCPAfterLikeNotLogin() throws Exception {
-        assertCP(INTEGRATION_TEST_USER_01, 0); // 変化無し
-        assertCP(INTEGRATION_TEST_USER_02, 0); // 変化無し
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0);
+        assertCP(COMMENT_POST_USER, 0); // 変化無し
+        assertCP(KNOWLEDGE_POST_USER, 0); // 変化無し
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 0);
     }
     
     /**
@@ -347,8 +346,8 @@ public void testCPAfterLikeNotLogin() throws Exception {
     @Order(order = 302)
     public void testNotificationAfterLikeByAnonymous() throws Exception {
         execNotificationQueue();
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 0);
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+        assertNotificationCount(COMMENT_POST_USER, 0);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
     }
     
     
@@ -359,8 +358,7 @@ public void testNotificationAfterLikeByAnonymous() throws Exception {
     @Test
     @Order(order = 303)
     public void testLikeByLoginUser1() throws Exception {
-        LikeCount like = like(INTEGRATION_TEST_USER_01, knowledgeId);
-        Assert.assertEquals((long) 2, like.getCount().longValue());
+        addLike(COMMENT_POST_USER, knowledgeId);
     }
     
     /**
@@ -370,9 +368,9 @@ public void testLikeByLoginUser1() throws Exception {
     @Test
     @Order(order = 304)
     public void testCPAfterLikeLogined() throws Exception {
-        assertCP(INTEGRATION_TEST_USER_01, 2); // +2
-        assertCP(INTEGRATION_TEST_USER_02, 10); // +10
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 10);
+        assertCP(COMMENT_POST_USER, 2); // +2
+        assertCP(KNOWLEDGE_POST_USER, 10); // +10
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 10);
     }
     
     
@@ -384,8 +382,8 @@ public void testCPAfterLikeLogined() throws Exception {
     @Order(order = 305)
     public void testNotificationAfterLikeByUser1() throws Exception {
         execNotificationQueue();
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 0);
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+        assertNotificationCount(COMMENT_POST_USER, 0);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
     }
     
     
@@ -396,8 +394,7 @@ public void testNotificationAfterLikeByUser1() throws Exception {
     @Test
     @Order(order = 306)
     public void testLikeByLoginUser2() throws Exception {
-        LikeCount like = like(INTEGRATION_TEST_USER_02, knowledgeId);
-        Assert.assertEquals((long) 3, like.getCount().longValue());
+        addLike(KNOWLEDGE_POST_USER, knowledgeId);
     }
     
     /**
@@ -407,9 +404,9 @@ public void testLikeByLoginUser2() throws Exception {
     @Test
     @Order(order = 307)
     public void testCPAfterLikeLogined2() throws Exception {
-        assertCP(INTEGRATION_TEST_USER_01, 0); // 変化無し
-        assertCP(INTEGRATION_TEST_USER_02, 2); // 自分で押しても +10 はつかない / アクション起こした +2 はつく
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0);
+        assertCP(COMMENT_POST_USER, 0); // 変化無し
+        assertCP(KNOWLEDGE_POST_USER, 2); // 自分で押しても +10 はつかない / アクション起こした +2 はつく
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 0);
     }
     
     /**
@@ -420,8 +417,8 @@ public void testCPAfterLikeLogined2() throws Exception {
     @Order(order = 308)
     public void testNotificationAfterLikeByUser2() throws Exception {
         execNotificationQueue();
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 0);
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+        assertNotificationCount(COMMENT_POST_USER, 0);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
     }
     
     /**
@@ -435,101 +432,90 @@ public void testNotificationAfterLikeByUser2() throws Exception {
     @Test
     @Order(order = 309)
     public void testReLikeByLoginUser1() throws Exception {
-        LikeCount like = like(INTEGRATION_TEST_USER_01, knowledgeId);
-        Assert.assertEquals((long) 4, like.getCount().longValue());
+        addLike(COMMENT_POST_USER, knowledgeId);
         
-        assertCP(INTEGRATION_TEST_USER_01, 0); // 変化無し
-        assertCP(INTEGRATION_TEST_USER_02, 0); // 変化無し
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0); // 変化無し
+        assertCP(COMMENT_POST_USER, 0); // 変化無し
+        assertCP(KNOWLEDGE_POST_USER, 0); // 変化無し
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 0); // 変化無し
 
         execNotificationQueue();
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 0);
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+        assertNotificationCount(COMMENT_POST_USER, 0);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
     }
     
     
     /**
-     * ログインユーザ1にて、コメント追加
+     * コメント登録者でコメント登録
      * @throws Exception
      */
     @Test
     @Order(order = 400)
     public void testPostCommentByLoginUser1() throws Exception {
         // コメントが登録されていないこと
-        StubHttpServletRequest request = openKnowledge(INTEGRATION_TEST_USER_01, knowledgeId);
+        StubHttpServletRequest request = openKnowledge(COMMENT_POST_USER, knowledgeId);
         List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
         Assert.assertEquals(0, comments.size()); // 閲覧者にもデフォルト通知（初期設定）
         
         // コメントが登録できること
-        comment(INTEGRATION_TEST_USER_01, knowledgeId, "コメント");
+        comment(COMMENT_POST_USER, knowledgeId, "コメント");
         
         // CP確認
-        assertCP(INTEGRATION_TEST_USER_01, 20); // コメント追加者 +20
-        assertCP(INTEGRATION_TEST_USER_02, 0); // コメントを追加した記事の作者は変化無し
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 20); // +20
+        assertCP(COMMENT_POST_USER, 20); // コメント追加者 +20
+        assertCP(KNOWLEDGE_POST_USER, 0); // コメントを追加した記事の作者は変化無し
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 20); // +20
         
         // 通知の確認
         execNotificationQueue();
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 1);
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 1);
+        assertNotificationCount(COMMENT_POST_USER, 1);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
         
         // コメントが登録されていないこと
-        request = openKnowledge(INTEGRATION_TEST_USER_01, knowledgeId);
+        request = openKnowledge(COMMENT_POST_USER, knowledgeId);
         comments = (List<CommentsEntity>) request.getAttribute("comments");
         Assert.assertEquals(1, comments.size()); // 閲覧者にもデフォルト通知（初期設定）
     }
 
     
     /**
-     * ログインユーザ2でコメントにいいね
+     * コメント登録者のコメントに、記事登録者がイイネを押す
      * @throws Exception
      */
     @Test
     @Order(order = 401)
     public void testLikeCommentByLoginUser2() throws Exception {
-        StubHttpServletRequest request = openKnowledge(INTEGRATION_TEST_USER_02, knowledgeId);
-        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
-        CommentsEntity comment = comments.get(0);
-        
-        LikeCount like = likeComment(INTEGRATION_TEST_USER_02, knowledgeId, comment.getCommentNo());
-        Assert.assertEquals((long) 1, like.getCount().longValue());
+        addLatestLikeComment(KNOWLEDGE_POST_USER, knowledgeId);
         
-        assertCP(INTEGRATION_TEST_USER_01, 10); // +10
-        assertCP(INTEGRATION_TEST_USER_02, 2); // +2(押した)
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0); // ユーザ2は記事の作者なので、作者が押してもポイントは増えない（コメントであっても）
+        assertCP(COMMENT_POST_USER, 10); // +10
+        assertCP(KNOWLEDGE_POST_USER, 2); // +2(押した)
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 0); // ユーザ2は記事の作者なので、作者が押してもポイントは増えない（コメントであっても）
 
         execNotificationQueue();
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 1); // コメント登録者に通知
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 0);
+        assertNotificationCount(COMMENT_POST_USER, 1); // コメント登録者に通知
+        assertNotificationCount(KNOWLEDGE_POST_USER, 0);
     }
 
 
     /**
-     * ログインユーザ3でコメントにいいね
+     * コメント登録者のコメントに、参照ユーザがイイネを押す
      * @throws Exception
      */
     @Test
     @Order(order = 402)
     public void testLikeCommentByLoginUser3() throws Exception {
-        StubHttpServletRequest request = openKnowledge(INTEGRATION_TEST_USER_03, knowledgeId);
-        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
-        CommentsEntity comment = comments.get(0);
-        
-        LikeCount like = likeComment(INTEGRATION_TEST_USER_03, knowledgeId, comment.getCommentNo());
-        Assert.assertEquals((long) 2, like.getCount().longValue());
+        addLatestLikeComment(READ_USER, knowledgeId);
         
-        assertCP(INTEGRATION_TEST_USER_01, 10); // +10
-        assertCP(INTEGRATION_TEST_USER_02, 1); // 参照
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 11); // イイネ + ユーザ3での参照
+        assertCP(COMMENT_POST_USER, 10); // +10
+        assertCP(KNOWLEDGE_POST_USER, 1); // 参照
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 11); // イイネ + ユーザ3での参照
 
         execNotificationQueue();
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 1); // コメント登録者に通知
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 0);
+        assertNotificationCount(COMMENT_POST_USER, 1); // コメント登録者に通知
+        assertNotificationCount(KNOWLEDGE_POST_USER, 0);
     }
 
 
     /**
-     * ログインユーザ1でコメントにいいね(登録者)
+     * コメント登録者のコメントに、自分自身でイイネを押す
      * 
      * TODO コメントの場合、いいねを作者が押すと、アクションポイント(+2)がつかない？
      * TODO 自分のコメントであっても、記事の作者と違うので、記事にポイント(+10)がつくがおかしくない？
@@ -540,48 +526,128 @@ public void testLikeCommentByLoginUser3() throws Exception {
     @Test
     @Order(order = 403)
     public void testLikeCommentByLoginUser1() throws Exception {
-        StubHttpServletRequest request = openKnowledge(INTEGRATION_TEST_USER_01, knowledgeId);
-        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
-        CommentsEntity comment = comments.get(0);
-        
-        LikeCount like = likeComment(INTEGRATION_TEST_USER_01, knowledgeId, comment.getCommentNo());
-        Assert.assertEquals((long) 3, like.getCount().longValue());
+        addLatestLikeComment(COMMENT_POST_USER, knowledgeId);
         
-        assertCP(INTEGRATION_TEST_USER_01, 0); // ポイントつかない？
-        assertCP(INTEGRATION_TEST_USER_02, 0); 
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 10);
+        assertCP(COMMENT_POST_USER, 0); // ポイントつかない？
+        assertCP(KNOWLEDGE_POST_USER, 0); 
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 10);
 
         execNotificationQueue();
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 1); // コメント登録者に通知
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 0);
+        assertNotificationCount(COMMENT_POST_USER, 1); // コメント登録者に通知
+        assertNotificationCount(KNOWLEDGE_POST_USER, 0);
     }
     
 
     /**
-     * 未ログインユーザでコメントにいいね
-     * 
+     * コメント登録者のコメントに、未ログインユーザがイイネを押す
      * 未ログインユーザの場合ポイントつかない
-     * 
      * @throws Exception
      */
     @Test
     @Order(order = 404)
     public void testLikeCommentByAnonymous() throws Exception {
-        StubHttpServletRequest request = openKnowledge(null, knowledgeId);
-        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
-        CommentsEntity comment = comments.get(0);
-        LikeCount like = likeComment(null, knowledgeId, comment.getCommentNo());
-        Assert.assertEquals((long) 4, like.getCount().longValue());
+        addLatestLikeComment(null, knowledgeId);
         
-        assertCP(INTEGRATION_TEST_USER_01, 0);
-        assertCP(INTEGRATION_TEST_USER_02, 0); 
-        assertKnowledgeCP(INTEGRATION_TEST_USER_01, knowledgeId, 0);
+        assertCP(COMMENT_POST_USER, 0);
+        assertCP(KNOWLEDGE_POST_USER, 0); 
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 0);
 
         execNotificationQueue();
-        assertNotificationCount(INTEGRATION_TEST_USER_01, 1); // コメント登録者に通知
-        assertNotificationCount(INTEGRATION_TEST_USER_02, 0);
+        assertNotificationCount(COMMENT_POST_USER, 1); // コメント登録者に通知
+        assertNotificationCount(KNOWLEDGE_POST_USER, 0);
+    }
+    
+    /**
+     * 記事登録者が自分自身の記事にコメント追加
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 500)
+    public void testPostCommentByLoginUser2() throws Exception {
+        // コメントが登録できること
+        comment(KNOWLEDGE_POST_USER, knowledgeId, "コメント");
+        
+        // CP確認
+        assertCP(COMMENT_POST_USER, 0);
+        assertCP(KNOWLEDGE_POST_USER, 20);
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 20); // +20
+        
+        // 通知の確認
+        execNotificationQueue();
+        assertNotificationCount(COMMENT_POST_USER, 1);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
     }
     
+    /**
+     * 記事登録者が登録したコメントに、コメント登録者がイイネを押す
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 501)
+    public void testLikeCommentByCommentUserToKnowledgeUser() throws Exception {
+        addLatestLikeComment(COMMENT_POST_USER, knowledgeId);
+        
+        assertCP(COMMENT_POST_USER, 2);
+        assertCP(KNOWLEDGE_POST_USER, 10); 
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 10);
+
+        execNotificationQueue();
+        assertNotificationCount(COMMENT_POST_USER, 0);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
+    }
+    /**
+     * 記事登録者が登録したコメントに、自分自身でイイネを押す
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 502)
+    public void testLikeCommentByKnowledgeUserToKnowledgeUser() throws Exception {
+        addLatestLikeComment(KNOWLEDGE_POST_USER, knowledgeId);
+        
+        assertCP(COMMENT_POST_USER, 0);
+        assertCP(KNOWLEDGE_POST_USER, 0); // アクションポイントもつかない？
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 0);
+
+        execNotificationQueue();
+        assertNotificationCount(COMMENT_POST_USER, 0);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
+    }
+
+    /**
+     * 記事登録者が登録したコメントに、参照ユーザでイイネを押す
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 503)
+    public void testLikeCommentByReadUserToKnowledgeUser() throws Exception {
+        addLatestLikeComment(READ_USER, knowledgeId);
+        
+        assertCP(COMMENT_POST_USER, 0);
+        assertCP(KNOWLEDGE_POST_USER, 10);
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 10);
+
+        execNotificationQueue();
+        assertNotificationCount(COMMENT_POST_USER, 0);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
+    }
+    
+    /**
+     * 記事登録者が登録したコメントに、未ログインユーザでイイネを押す
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 504)
+    public void testLikeCommentByNotLoginToKnowledgeUser() throws Exception {
+        addLatestLikeComment(null, knowledgeId);
+        
+        assertCP(COMMENT_POST_USER, 0);
+        assertCP(KNOWLEDGE_POST_USER, 0);
+        assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 0);
+
+        execNotificationQueue();
+        assertNotificationCount(COMMENT_POST_USER, 0);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
+    }
     
 
 }
diff --git a/src/test/resources/org/support/project/knowledge/integration/post_knowledge.json b/src/test/resources/org/support/project/knowledge/integration/post_knowledge.json
new file mode 100644
index 000000000..118e04259
--- /dev/null
+++ b/src/test/resources/org/support/project/knowledge/integration/post_knowledge.json
@@ -0,0 +1,5 @@
+{
+    "content": "コンテンツ",
+    "template": "knowledge",
+    "title": "タイトル"
+}
diff --git a/src/test/resources/org/support/project/knowledge/integration/put_knowledge.json b/src/test/resources/org/support/project/knowledge/integration/put_knowledge.json
new file mode 100644
index 000000000..aca4afda1
--- /dev/null
+++ b/src/test/resources/org/support/project/knowledge/integration/put_knowledge.json
@@ -0,0 +1,5 @@
+{
+    "content": "コンテンツ更新",
+    "template": "knowledge",
+    "title": "タイトル更新"
+}

From 5433ce633f7670acef8fbec7e0b6ffbbf49f04bb Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 28 Sep 2017 02:43:54 +0900
Subject: [PATCH 085/138] Change version label

---
 src/main/resources/appresource.properties    | 2 +-
 src/main/resources/appresource_ja.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index db6b7ecb7..2c9ef0d6f 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -59,7 +59,7 @@ message.allready.started=Already started.
 message.confirm.delete=Are you sure you want to delete?
 
 # Common Label
-label.version=v1.11.0 pre1
+label.version=v1.11.0 pre2
 label.login=Sign in
 label.previous= Previous
 label.next=Next
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index bd393a2f4..f31e42d5d 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -59,7 +59,7 @@ message.allready.started=すでに開始済です
 message.confirm.delete=本当に削除しますか?
 
 # Common Label
-label.version=v1.11.0 pre1
+label.version=v1.11.0 pre2
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ

From 7921abbc9ce84589598322a53e007b5660b8d349 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 29 Sep 2017 07:29:40 +0900
Subject: [PATCH 086/138] Add integration test

---
 .../control/protect/EventControl.java         |   6 +-
 .../control/protect/KnowledgeControl.java     |   5 +-
 .../knowledge/logic/KnowledgeLogic.java       |  14 +-
 .../logic/activity/ActivityLogic.java         |  10 +-
 .../activity/KnowledgeEventActivity.java      |   9 +-
 .../support/project/knowledge/TestCommon.java |  20 ++
 .../knowledge/dao/NotifyConfigsDaoTest.java   |  13 +
 .../integration/IntegrationCommon.java        |  12 +-
 .../integration/IntegrationEventTest.java     | 256 ++++++++++++++++++
 .../integration/IntegrationPostTest.java      |   1 -
 10 files changed, 326 insertions(+), 20 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/integration/IntegrationEventTest.java

diff --git a/src/main/java/org/support/project/knowledge/control/protect/EventControl.java b/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
index 5f2e47958..51cce0c80 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/EventControl.java
@@ -1,7 +1,5 @@
 package org.support.project.knowledge.control.protect;
 
-import java.util.Date;
-
 import org.support.project.common.util.DateUtils;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -24,7 +22,7 @@ public class EventControl extends Control {
      * @return
      * @throws InvalidParamException
      */
-    @Put
+    @Put(subscribeToken = "knowledge")
     public Boundary participation() throws InvalidParamException {
         Long knowledgeId = getPathLong();
         Boolean result = EventsLogic.get().participation(knowledgeId, getLoginUserId());
@@ -46,7 +44,7 @@ public Boundary participation() throws InvalidParamException {
      * @return
      * @throws InvalidParamException
      */
-    @Delete
+    @Delete(subscribeToken = "knowledge")
     public Boundary nonparticipation() throws InvalidParamException {
         Long knowledgeId = getPathLong();
         EventsLogic.get().removeParticipation(knowledgeId, getLoginUserId());
diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index 02befaf1c..31686311c 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -214,7 +214,6 @@ private Boundary add(KnowledgesEntity entity) throws Exception, ParseException {
         LOG.trace("save");
 
         KnowledgesEntity insertedEntity = knowledgeLogic.insert(data, super.getLoginedUser());
-        ActivityLogic.get().processKnowledgeSaveActivity(getLoginedUser(), DateUtils.now(), insertedEntity);
         
         return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK,
                 String.valueOf(insertedEntity.getKnowledgeId()), "message.success.insert");
@@ -308,9 +307,8 @@ private Boundary update(KnowledgesEntity entity) throws Exception {
                 }
             }
         }
-        
+        // 更新実行
         KnowledgesEntity updatedEntity = knowledgeLogic.update(data, super.getLoginedUser());
-        ActivityLogic.get().processKnowledgeSaveActivity(getLoginedUser(), DateUtils.now(), updatedEntity);
         
         if (data.isUpdateContent()) {
             return sendMsg(MessageStatus.Success, HttpStatus.SC_200_OK,
@@ -494,7 +492,6 @@ public Boundary comment() throws Exception {
         }
 
         CommentsEntity commentsEntity = KnowledgeLogic.get().saveComment(knowledgeId, comment, fileNos, getLoginedUser());
-        ActivityLogic.get().processActivity(Activity.COMMENT_INSERT, getLoginedUser(), DateUtils.now(), commentsEntity);
 
         return super.redirect(getRequest().getContextPath() + "/open.knowledge/view/" + knowledgeId + params);
     }
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index 03ae458b2..7f621e2d6 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -3,7 +3,6 @@
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -65,6 +64,8 @@
 import org.support.project.knowledge.entity.TemplateMastersEntity;
 import org.support.project.knowledge.entity.ViewHistoriesEntity;
 import org.support.project.knowledge.indexer.IndexingValue;
+import org.support.project.knowledge.logic.activity.Activity;
+import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.knowledge.logic.hook.AfterSaveHook;
 import org.support.project.knowledge.logic.hook.BeforeSaveHook;
 import org.support.project.knowledge.logic.hook.HookFactory;
@@ -230,6 +231,10 @@ public KnowledgesEntity insert(KnowledgeData data, LoginedUser loginedUser) thro
         for (AfterSaveHook afterSaveHook : afterSaveHooks) {
             afterSaveHook.afterSave(data, loginedUser);
         }
+        
+        // CPの処理
+        ActivityLogic.get().processKnowledgeSaveActivity(loginedUser, DateUtils.now(), insertedEntity);
+        
         return insertedEntity;
     }
 
@@ -311,6 +316,10 @@ public KnowledgesEntity update(KnowledgeData data, LoginedUser loginedUser) thro
         for (AfterSaveHook afterSaveHook : afterSaveHooks) {
             afterSaveHook.afterSave(data, loginedUser);
         }
+        
+        // CP
+        ActivityLogic.get().processKnowledgeSaveActivity(loginedUser, DateUtils.now(), updatedEntity);
+        
         return updatedEntity;
     }
 
@@ -1275,6 +1284,9 @@ public CommentsEntity saveComment(Long knowledgeId, String comment, List<Long> f
         // 通知
         NotifyLogic.get().notifyOnKnowledgeComment(knowledgeId, commentsEntity);
         
+        //ポイント
+        ActivityLogic.get().processActivity(Activity.COMMENT_INSERT, loginedUser, DateUtils.now(), commentsEntity);
+        
         return commentsEntity;
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index 9b9cfa15a..4a9bb47d8 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -123,11 +123,15 @@ public void processActivity(Activity activity, LoginedUser eventUser, Date event
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void processKnowledgeSaveActivity(LoginedUser eventUser, Date eventDateTime, KnowledgesEntity knowledge) {
         Activity activity = null;
-        if (knowledge.getPublicFlag().intValue() == KnowledgeLogic.PUBLIC_FLAG_PUBLIC) {
+        int publicFlag = KnowledgeLogic.PUBLIC_FLAG_PRIVATE;
+        if (knowledge.getPublicFlag() != null) {
+            publicFlag = knowledge.getPublicFlag();
+        }
+        if (publicFlag == KnowledgeLogic.PUBLIC_FLAG_PUBLIC) {
             activity = Activity.KNOWLEDGE_POST_PUBLIC;
-        } else if (knowledge.getPublicFlag().intValue() == KnowledgeLogic.PUBLIC_FLAG_PROTECT) {
+        } else if (publicFlag == KnowledgeLogic.PUBLIC_FLAG_PROTECT) {
             activity = Activity.KNOWLEDGE_POST_PROTECTED;
-        } else if (knowledge.getPublicFlag().intValue() == KnowledgeLogic.PUBLIC_FLAG_PRIVATE) {
+        } else if (publicFlag == KnowledgeLogic.PUBLIC_FLAG_PRIVATE) {
             activity = Activity.KNOWLEDGE_POST_PRIVATE;
         }
         if (activity == null) {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
index 3e1975360..7f5a2d327 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
@@ -30,7 +30,7 @@ private int getPoint() {
             return point;
         }
         // 参加者人数により増減
-        int point = 10;
+        int point = 5;
         long count = ParticipantsDao.get().selectUniqueUserCountOnKnowledgeId(getKnowledge().getKnowledgeId());
         int add = 0;
         if (count > 100) {
@@ -50,8 +50,8 @@ private int getPoint() {
 
     @Override
     protected Activity getActivity() {
-        LOG.debug("Start add point process on answer knowledge.");
-        return Activity.KNOWLEDGE_ANSWER;
+        LOG.debug("Start add point process on event knowledge.");
+        return Activity.KNOWLEDGE_EVENT_ADD;
     }
     @Override
     protected TypeAndPoint getTypeAndPointForActivityExecuter() {
@@ -66,9 +66,6 @@ protected TypeAndPoint getTypeAndPointForKnowledgeOwner() {
     }
     @Override
     protected TypeAndPoint getTypeAndPointForKnowledge() {
-        if (eventUser.getUserId().intValue() == getKnowledge().getInsertUser().intValue()) {
-            return null;
-        }
         return new TypeAndPoint(TYPE_KNOWLEDGE_JOINED, getPoint());
     }
 
diff --git a/src/test/java/org/support/project/knowledge/TestCommon.java b/src/test/java/org/support/project/knowledge/TestCommon.java
index cb20679da..6175744e7 100644
--- a/src/test/java/org/support/project/knowledge/TestCommon.java
+++ b/src/test/java/org/support/project/knowledge/TestCommon.java
@@ -155,13 +155,26 @@ public static void initData() throws Exception {
         groupuser1.setLocale(Locale.ENGLISH);
         groupuser2.setLocale(Locale.ENGLISH);
 
+        synchronized (KNOWLEDGE_TEST_HOME) {
+            Thread.sleep(100);
+        }
+        
         // DBを完全初期化
         DatabaseControlDao dao1 = new DatabaseControlDao();
         dao1.dropAllTable();
         org.support.project.web.dao.gen.DatabaseControlDao dao2 = new org.support.project.web.dao.gen.DatabaseControlDao();
         dao2.dropAllTable();
+        
+        synchronized (KNOWLEDGE_TEST_HOME) {
+            Thread.sleep(100);
+        }
+        
         InitDB.main(new String[0]);
         
+        synchronized (KNOWLEDGE_TEST_HOME) {
+            Thread.sleep(100);
+        }
+        
         // 全文検索エンジンのインデックスの消去
         Analyzer analyzer = new JapaneseAnalyzer();
         AppConfig appConfig = ConfigLoader.load(AppConfig.APP_CONFIG, AppConfig.class);
@@ -273,6 +286,13 @@ protected KnowledgesEntity insertKnowledge(String title, LoginedUser loginedUser
      * @return
      */
     protected UsersEntity addUser(String userKey) {
+        synchronized (this) {
+            try {
+                Thread.sleep(200);
+            } catch (InterruptedException e) {
+            }
+        }
+        
         UsersEntity user = new UsersEntity();
         user.setAuthLdap(INT_FLAG.OFF.getValue());
         user.setEncrypted(false);
diff --git a/src/test/java/org/support/project/knowledge/dao/NotifyConfigsDaoTest.java b/src/test/java/org/support/project/knowledge/dao/NotifyConfigsDaoTest.java
index 1fb31895c..3a2dd39ea 100644
--- a/src/test/java/org/support/project/knowledge/dao/NotifyConfigsDaoTest.java
+++ b/src/test/java/org/support/project/knowledge/dao/NotifyConfigsDaoTest.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.support.project.common.config.INT_FLAG;
 import org.support.project.common.test.AssertEx;
@@ -18,6 +19,18 @@ public class NotifyConfigsDaoTest extends TestCommon {
     private static final int LIMIT = 100;
     private static final int OFFSET = 0;
     
+    /**
+     * @BeforeClass
+     * @throws Exception
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        synchronized (KNOWLEDGE_TEST_HOME) {
+            Thread.sleep(500);
+        }
+        TestCommon.setUpBeforeClass();
+    }
+    
     @Test
     @Order(order = 1)
     public void testNotify1() throws Exception {
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
index b661e6272..c1edb98cf 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
@@ -60,6 +60,12 @@ public abstract class IntegrationCommon extends TestCommon {
     public static void setUpBeforeClass() throws Exception {
         TestCommon.setUpBeforeClass();
         
+        userPointMap = new HashMap<>();
+        knowledgePointMap = new HashMap<>();
+        userNotificationCountMap = new HashMap<>();
+        knowledgeLikeMap = new HashMap<>();
+        commentLikeMap = new HashMap<>();
+        
         MailConfigsEntity mailConfig = new MailConfigsEntity(AppConfig.get().getSystemName());
         mailConfig.setHost("example.com");
         mailConfig.setPort(25);
@@ -84,9 +90,12 @@ public static void setUpBeforeClass() throws Exception {
      */
     protected <T> T invoke(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) throws Exception {
         InvokeTarget invoke = CallControlLogic.get().searchInvokeTarget(request, response);
+        if (invoke == null) {
+            LOG.error("InvokeTarget is not find. [Method]" + request.getMethod() + " [Path]" + request.getServletPath());
+        }
         Assert.assertNotNull(invoke);
         Object result = invoke.invoke();
-        LOG.info(result);
+        LOG.trace(result);
         Assert.assertNotNull(result);
         if (!result.getClass().isAssignableFrom(clazz)) {
             Assert.fail("Result is not " + clazz.getSimpleName() + ". actual: " + result.getClass().getSimpleName());
@@ -153,6 +162,7 @@ protected void assertNotificationCount(String userKey, int add) throws Exception
     }
     
     
+    
     /**
      * 通知を取得
      * @param userKey
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationEventTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationEventTest.java
new file mode 100644
index 000000000..14a7184cb
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationEventTest.java
@@ -0,0 +1,256 @@
+package org.support.project.knowledge.integration;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.support.project.common.config.Resources;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.logic.EventsLogic;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.TemplateLogic;
+import org.support.project.web.bean.LabelValue;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.boundary.ForwardBoundary;
+import org.support.project.web.boundary.JsonBoundary;
+import org.support.project.web.common.HttpUtil;
+import org.support.project.web.logic.HttpRequestCheckLogic;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+import org.support.project.web.test.stub.StubHttpServletRequest;
+import org.support.project.web.test.stub.StubHttpServletResponse;
+
+/**
+ * 
+ * @author koda
+ */
+public class IntegrationEventTest extends IntegrationCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(IntegrationEventTest.class);
+    
+    private static final String POST_USER = "integration-test-user-01";
+    private static final String JOIN_USER = "integration-test-user-02";
+    
+    private static long knowledgeId;
+    
+    /**
+     * ユーザを登録
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        addUser(POST_USER);
+        addUser(JOIN_USER);
+    }
+    
+    /**
+     * イベント登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 100)
+    public void testPostEventPublic() throws Exception {
+        // 登録画面へアクセスできること(パスのルーティングのみ確認）
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_add");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+
+        // 保存
+        request.setServletPath("protect.knowledge/save");
+        request.setMethod("post");
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        request.addParameter("title", "タイトル");
+        request.addParameter("content", "内容");
+        request.addParameter("publicFlag", String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PUBLIC));
+        request.addParameter("typeId", String.valueOf(TemplateLogic.TYPE_ID_EVENT));
+        request.addParameter("item_" + EventsLogic.ITEM_NO_DATE, "2017-10-01");
+        request.addParameter("item_" + EventsLogic.ITEM_NO_START, "10:00");
+        request.addParameter("item_" + EventsLogic.ITEM_NO_END, "12:00");
+        request.addParameter("item_" + EventsLogic.ITEM_NO_TIMEZONE, "Asia/Tokyo");
+        request.addParameter("item_" + EventsLogic.ITEM_NO_THE_NUMBER_TO_BE_ACCEPTED, "10");
+        
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(200, sendObject.getCode().intValue());
+        
+        knowledgeId = new Long(sendObject.getResult());
+    }
+    
+    /**
+     * 投稿後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 101)
+    public void testAssertAfterPost() throws Exception {
+        assertCP(POST_USER, 50);
+        assertCP(JOIN_USER, 0);
+        assertKnowledgeCP(null, knowledgeId, 50);
+        
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(JOIN_USER, 1);
+    }
+    
+    /**
+     * 参加者が参加登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 200)
+    public void testJoinByJoinUser() throws Exception {
+        StubHttpServletRequest request = openKnowledges(JOIN_USER);
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
+        long knowledgeId = knowledges.get(0).getKnowledgeId();
+        request = openKnowledge(JOIN_USER, knowledgeId);
+        
+        request.setServletPath("protect.event/participation/" + knowledgeId);
+        request.setMethod("put");
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        LabelValue labelValue = (LabelValue) boundary.getObj();
+        Assert.assertEquals("true", labelValue.getValue());
+    }
+    
+    /**
+     * 参加登録後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 201)
+    public void testAssertAfterJoinbyJoinUser() throws Exception {
+        assertCP(POST_USER, 6); // 参照 +1 / 参加 +5
+        assertCP(JOIN_USER, 6);
+        assertKnowledgeCP(null, knowledgeId, 6);
+        
+        // execNotificationQueue(); 参加登録はキューでメール通知しないで、リアルタイムで処理している
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(JOIN_USER, 1);
+    }
+    
+    /**
+     * 参加者が参加取りやめ
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 202)
+    public void testReaveByJoinUser() throws Exception {
+        StubHttpServletRequest request = openKnowledges(JOIN_USER);
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
+        long knowledgeId = knowledges.get(0).getKnowledgeId();
+        request = openKnowledge(JOIN_USER, knowledgeId);
+        
+        request.setServletPath("protect.event/nonparticipation/" + knowledgeId);
+        request.setMethod("delete");
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        String msg = (String) boundary.getObj();
+        
+        Resources resources = Resources.getInstance(HttpUtil.getLocale(request));
+        Assert.assertEquals(resources.getResource("knowledge.view.msg.participate.delete"), msg);
+    }
+    
+    /**
+     * 参加取りやめ後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 203)
+    public void testAssertAfterReavebyJoinUser() throws Exception {
+        assertCP(POST_USER, 0);
+        assertCP(JOIN_USER, 0);
+        assertKnowledgeCP(null, knowledgeId, 0);
+        
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(JOIN_USER, 0);
+    }
+    
+    /**
+     * 再度、参加者が参加登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 204)
+    public void testReJoinByJoinUser() throws Exception {
+        StubHttpServletRequest request = openKnowledges(JOIN_USER);
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
+        long knowledgeId = knowledges.get(0).getKnowledgeId();
+        request = openKnowledge(JOIN_USER, knowledgeId);
+        
+        request.setServletPath("protect.event/participation/" + knowledgeId);
+        request.setMethod("put");
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        LabelValue labelValue = (LabelValue) boundary.getObj();
+        Assert.assertEquals("true", labelValue.getValue());
+    }
+    
+    /**
+     * 参加取りやめ後、再度参加登録の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 205)
+    public void testAssertAfterReJoinbyJoinUser() throws Exception {
+        assertCP(POST_USER, 0);
+        assertCP(JOIN_USER, 0);
+        assertKnowledgeCP(null, knowledgeId, 0);
+        
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(JOIN_USER, 1);
+    }
+    
+
+    /**
+     * 参加者が参加登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 300)
+    public void testJoinByPostUser() throws Exception {
+        StubHttpServletRequest request = openKnowledges(POST_USER);
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
+        long knowledgeId = knowledges.get(0).getKnowledgeId();
+        request = openKnowledge(POST_USER, knowledgeId);
+        
+        request.setServletPath("protect.event/participation/" + knowledgeId);
+        request.setMethod("put");
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        LabelValue labelValue = (LabelValue) boundary.getObj();
+        Assert.assertEquals("true", labelValue.getValue());
+    }
+    
+    /**
+     * 参加登録後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 301)
+    public void testAssertAfterJoinbyPostUser() throws Exception {
+        assertCP(POST_USER, 5);
+        assertCP(JOIN_USER, 0);
+        assertKnowledgeCP(null, knowledgeId, 5);
+        
+        // execNotificationQueue(); 参加登録はキューでメール通知しないで、リアルタイムで処理している
+        assertNotificationCount(POST_USER, 2);
+        assertNotificationCount(JOIN_USER, 0);
+    }
+
+}
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
index 75c4ad8eb..24db927fb 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
@@ -11,7 +11,6 @@
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
-import org.support.project.knowledge.vo.LikeCount;
 import org.support.project.web.bean.MessageResult;
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.boundary.JsonBoundary;

From c4842df97bf4a7ac684e5007b4ed00f951939423 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 29 Sep 2017 18:49:13 +0900
Subject: [PATCH 087/138] Add integration test

---
 .../control/open/KnowledgeControl.java        |   5 -
 .../logic/KnowledgeDataEditLogic.java         |   4 +
 .../knowledge/logic/KnowledgeLogic.java       |   6 +
 .../knowledge/logic/MailhookLogic.java        |   2 +-
 .../support/project/knowledge/TestCommon.java |   4 +-
 .../integration/IntegrationAPITest.java       |  50 ++++
 .../integration/IntegrationCommon.java        |  21 ++
 .../integration/IntegrationMailReadTest.java  | 170 +++++++++++
 .../integration/IntegrationPostTest.java      |   4 +-
 .../integration/IntegrationProtectTest.java   | 234 +++++++++++++++
 .../knowledge/stub/mail/StubAddress.java      |  32 ++
 .../knowledge/stub/mail/StubMessage.java      | 280 ++++++++++++++++++
 .../knowledge/integration/post_knowledge.json |   3 +-
 .../knowledge/integration/put_knowledge.json  |   3 +-
 14 files changed, 806 insertions(+), 12 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/integration/IntegrationMailReadTest.java
 create mode 100644 src/test/java/org/support/project/knowledge/integration/IntegrationProtectTest.java
 create mode 100644 src/test/java/org/support/project/knowledge/stub/mail/StubAddress.java
 create mode 100644 src/test/java/org/support/project/knowledge/stub/mail/StubMessage.java

diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 98d2e2267..f26c4a341 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -666,9 +666,6 @@ public Boundary like() throws InvalidParamException {
         LikeCount likeCount = new LikeCount();
         likeCount.setKnowledgeId(knowledgeId);
         likeCount.setCount(count);
-        
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, getLoginedUser(), DateUtils.now(),
-                KnowledgesDao.get().selectOnKey(knowledgeId));
         return send(likeCount);
     }
     /**
@@ -684,8 +681,6 @@ public Boundary likecomment() throws InvalidParamException {
         LikeCount likeCount = new LikeCount();
         likeCount.setCount(count);
         
-        ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, getLoginedUser(), DateUtils.now(),
-                CommentsDao.get().selectOnKey(commentNo));
         return send(likeCount);
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeDataEditLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeDataEditLogic.java
index 43f58a042..16ac74371 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeDataEditLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeDataEditLogic.java
@@ -160,6 +160,10 @@ public void update(KnowledgeDetail data, LoginedUser loginedUser) throws Excepti
         }
         // 画面での登録と形をあわせる
         KnowledgeData knowledge = conv(data);
+        // APIからデータ更新した場合、つねに「更新した」と判定する
+        // TODO この辺の判定処理は、後で共有化すること（KnowledgeControlで、ロジックを実装しすぎている）
+        knowledge.setUpdateContent(true);
+        knowledge.setNotifyUpdate(true);
         KnowledgeLogic.get().update(knowledge, loginedUser);
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index 7f621e2d6..7cac9f684 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -1179,6 +1179,9 @@ public Long addLike(Long knowledgeId, LoginedUser loginedUser, Locale locale) th
         // 通知
         NotifyLogic.get().notifyOnKnowledgeLiked(knowledgeId, likesEntity);
 
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, loginedUser, DateUtils.now(),
+                KnowledgesDao.get().selectOnKey(knowledgeId));
+
         return count;
     }
     /**
@@ -1209,6 +1212,9 @@ public Long addLikeComment(Long commentNo, LoginedUser loginedUser, Locale local
         // 通知
         NotifyLogic.get().notifyOnCommentLiked(like);
 
+        ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, loginedUser, DateUtils.now(),
+                CommentsDao.get().selectOnKey(commentNo));
+
         return count;
     }
     
diff --git a/src/main/java/org/support/project/knowledge/logic/MailhookLogic.java b/src/main/java/org/support/project/knowledge/logic/MailhookLogic.java
index d7c596ccf..7ba4d16cc 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailhookLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailhookLogic.java
@@ -646,7 +646,7 @@ private String readContent(Multipart multiPart) throws MessagingException, IOExc
      * @return
      * @throws Exception 
      */
-    private void checkConditionsAndPost(Message msg, List<MailHookConditionsEntity> conditions)
+    public void checkConditionsAndPost(Message msg, List<MailHookConditionsEntity> conditions)
             throws Exception {
         if (LOG.isDebugEnabled()) {
             Address[] in = msg.getFrom();
diff --git a/src/test/java/org/support/project/knowledge/TestCommon.java b/src/test/java/org/support/project/knowledge/TestCommon.java
index 6175744e7..37f22adb0 100644
--- a/src/test/java/org/support/project/knowledge/TestCommon.java
+++ b/src/test/java/org/support/project/knowledge/TestCommon.java
@@ -298,8 +298,8 @@ protected UsersEntity addUser(String userKey) {
         user.setEncrypted(false);
         user.setUserKey(userKey);
         user.setLocaleKey(Locale.JAPAN.toString());
-        user.setMailAddress("test@example.com");
-        user.setUserName("Integration Test User 01");
+        user.setMailAddress(RandomUtil.randamGen(8) + "@example.com");
+        user.setUserName("Test-" + RandomUtil.randamGen(8));
         user.setPassword(IDGen.get().gen("hoge"));
         String[] roles = {"user"};
         user = UserLogicEx.get().insert(user, roles);
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationAPITest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationAPITest.java
index 1d5bd13e2..d979ec097 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationAPITest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationAPITest.java
@@ -1,13 +1,18 @@
 package org.support.project.knowledge.integration;
 
+import java.util.List;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.test.Order;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.vo.api.Knowledge;
 import org.support.project.web.boundary.ForwardBoundary;
+import org.support.project.web.common.HttpStatus;
 import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
 import org.support.project.web.test.stub.StubHttpServletRequest;
 import org.support.project.web.test.stub.StubHttpServletResponse;
@@ -73,6 +78,20 @@ public void testViewAfterPost() throws Exception {
         Assert.assertEquals("コンテンツ", result.getContent());
     }
     
+    /**
+     * 登録後の状態を確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 12)
+    public void testCheckDataAfterPost() throws Exception {
+        assertCP(USER_01, 50);
+        assertKnowledgeCP(USER_01, 1, 50);
+
+        execNotificationQueue();
+        assertNotificationCount(USER_01, 1);
+    }
+    
     /**
      * KnowledgeをPut
      * @throws Exception
@@ -95,6 +114,20 @@ public void testViewAfterPut() throws Exception {
         Assert.assertEquals("タイトル更新", result.getTitle());
         Assert.assertEquals("コンテンツ更新", result.getContent());
     }
+
+    /**
+     * 更新後の状態を確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 22)
+    public void testCheckDataAfterPut() throws Exception {
+        assertCP(USER_01, 0);
+        assertKnowledgeCP(USER_01, 1, 0);
+
+        execNotificationQueue();
+        assertNotificationCount(USER_01, 1);
+    }
     
     /**
      * KnowledgeをPut
@@ -115,4 +148,21 @@ public void testDelete() throws Exception {
     public void testViewAfterDelete() throws Exception {
         knowledgeGetOnAPI(USER_01, 0);
     }
+    
+    /**
+     * 削除後の状態を確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 32)
+    public void testCheckDataAfterDelete() throws Exception {
+        assertCP(USER_01, 0);
+        assertNotAccessAble(USER_01, 1, HttpStatus.SC_404_NOT_FOUND);
+        
+        // 削除後には通知はでない
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        Assert.assertEquals(0, list.size());
+        assertNotificationCount(USER_01, 0);
+    }
+    
 }
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
index c1edb98cf..2637ca3f2 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
@@ -30,6 +30,8 @@
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.boundary.JsonBoundary;
 import org.support.project.web.boundary.RedirectBoundary;
+import org.support.project.web.boundary.SendMessageBoundary;
+import org.support.project.web.common.HttpStatus;
 import org.support.project.web.common.InvokeTarget;
 import org.support.project.web.dao.MailConfigsDao;
 import org.support.project.web.entity.MailConfigsEntity;
@@ -222,6 +224,25 @@ protected StubHttpServletRequest openKnowledge(String userKey, long knowledgeId)
         Assert.assertEquals("/WEB-INF/views/open/knowledge/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
         return request;
     }
+    /**
+     * 指定の記事にアクセスできないことを確認する
+     * @param userKey
+     * @param knowledgeId
+     * @throws Exception
+     */
+    protected void assertNotAccessAble(String userKey, long knowledgeId, int httpStatus) throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("open.knowledge/view/" + knowledgeId);
+        request.setMethod("get");
+        if (StringUtils.isNotEmpty(userKey)) {
+            DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+            auth.setSession(userKey, request, response);
+        }
+        SendMessageBoundary boundary = invoke(request, response, SendMessageBoundary.class);
+        Assert.assertEquals(httpStatus, boundary.getStatus());
+    }
+    
     /**
      * いいねを押下
      * @param userKey
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationMailReadTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationMailReadTest.java
new file mode 100644
index 000000000..950dec05a
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationMailReadTest.java
@@ -0,0 +1,170 @@
+package org.support.project.knowledge.integration;
+
+import java.util.List;
+
+import javax.mail.Address;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.knowledge.config.MailHookCondition;
+import org.support.project.knowledge.dao.MailHookConditionsDao;
+import org.support.project.knowledge.entity.CommentsEntity;
+import org.support.project.knowledge.entity.MailHookConditionsEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.MailhookLogic;
+import org.support.project.knowledge.stub.mail.StubAddress;
+import org.support.project.knowledge.stub.mail.StubMessage;
+import org.support.project.knowledge.vo.api.Knowledge;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.test.stub.StubHttpServletRequest;
+
+public class IntegrationMailReadTest extends IntegrationCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(IntegrationPostTest.class);
+    
+    private static final String CONFIG_USER = "CONFIG-USER";
+    private static final String POST_USER = "POST-USER";
+    private static final String COMMENT_USER = "COMMENT-USER";
+    
+    /**
+     * テスト用初期データが登録できること
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testInitDataInsert() throws Exception {
+        LOG.info("テストのためのデータ登録");
+        addUser(CONFIG_USER);
+        addUser(POST_USER);
+        addUser(COMMENT_USER);
+        LoginedUser user = super.getLoginUser(CONFIG_USER);
+        
+        // メールから投稿設定
+        MailHookConditionsEntity condition = new MailHookConditionsEntity();
+        condition.setHookId(MailhookLogic.MAIL_HOOK_ID);
+        condition.setConditionNo(-1);
+        condition.setConditionKind(MailHookCondition.Title.getValue());
+        condition.setCondition("[メールからの投稿]");
+        condition.setProcessUser(user.getUserId());
+        condition.setProcessUserKind(1);
+        condition.setPublicFlag(KnowledgeLogic.PUBLIC_FLAG_PUBLIC);
+        condition.setTags("メールから投稿");
+        MailhookLogic.get().saveCondition(condition);
+    }
+    
+    /**
+     * メールから投稿できること
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 100)
+    public void testPostFromMail() throws Exception {
+        LoginedUser user = super.getLoginUser(POST_USER);
+        List<MailHookConditionsEntity> conditions = MailHookConditionsDao.get().selectOnHookId(MailhookLogic.MAIL_HOOK_ID);
+        StubMessage msg = new StubMessage();
+        Address[] addresses = {new StubAddress(user.getLoginUser().getMailAddress())};
+        msg.addFrom(addresses);
+        Address[] recipients = {new StubAddress("to@example.com")};
+        msg.setAllRecipients(recipients);
+        msg.setContent("投稿の本文になる");
+        msg.setSubject("[メールからの投稿] タイトル");
+        msg.addHeader("Message-ID", "MailHookTest-01");
+        MailhookLogic.get().checkConditionsAndPost(msg, conditions);
+    }
+    /**
+     * Knowledgeを参照
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 101)
+    public void testViewAfterPost() throws Exception {
+        LoginedUser user = super.getLoginUser(POST_USER);
+        Knowledge result = knowledgeGetOnAPI(POST_USER, 1);
+        Assert.assertEquals((long) 1, result.getKnowledgeId().longValue());
+        Assert.assertEquals("[メールからの投稿] タイトル", result.getTitle());
+        Assert.assertEquals("投稿の本文になる", result.getContent());
+        Assert.assertEquals(user.getUserId(), result.getInsertUser());
+        
+        StubHttpServletRequest request = openKnowledge(POST_USER, 1);
+        @SuppressWarnings("unchecked")
+        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
+        Assert.assertEquals(0, comments.size());
+    }
+    
+    /**
+     * 登録後の状態を確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 102)
+    public void testCheckDataAfterPost() throws Exception {
+        assertCP(POST_USER, 50);
+        assertCP(COMMENT_USER, 0);
+        assertKnowledgeCP(POST_USER, 1, 50);
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(COMMENT_USER, 1);
+    }
+    
+    
+    /**
+     * メールからコメント登録できること
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 200)
+    public void testCommentFromMail() throws Exception {
+        LoginedUser user = super.getLoginUser(COMMENT_USER);
+        List<MailHookConditionsEntity> conditions = MailHookConditionsDao.get().selectOnHookId(MailhookLogic.MAIL_HOOK_ID);
+        StubMessage msg = new StubMessage();
+        Address[] addresses = {new StubAddress(user.getLoginUser().getMailAddress())};
+        msg.addFrom(addresses);
+        Address[] recipients = {new StubAddress("to@example.com")};
+        msg.setAllRecipients(recipients);
+        msg.setContent("コメント");
+        msg.setSubject("Re: [メールからの投稿] タイトル");
+        msg.addHeader("Message-ID", "MailHookTest-02");
+        msg.addHeader("References", "MailHookTest-01");
+        MailhookLogic.get().checkConditionsAndPost(msg, conditions);
+    }
+    /**
+     * Knowledgeを参照
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 201)
+    public void testViewAfterComment() throws Exception {
+        Knowledge result = knowledgeGetOnAPI(COMMENT_USER, 1);
+        Assert.assertEquals((long) 1, result.getKnowledgeId().longValue());
+        Assert.assertEquals("[メールからの投稿] タイトル", result.getTitle());
+        Assert.assertEquals("投稿の本文になる", result.getContent());
+        
+        LoginedUser user = super.getLoginUser(POST_USER); // 作成者チェック
+        Assert.assertEquals(user.getUserId(), result.getInsertUser());
+        
+        StubHttpServletRequest request = openKnowledge(POST_USER, 1);
+        @SuppressWarnings("unchecked")
+        List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
+        Assert.assertEquals(1, comments.size());
+    }
+    /**
+     * 登録後の状態を確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 202)
+    public void testCheckDataAfterComment() throws Exception {
+        assertCP(POST_USER, 0);
+        assertCP(COMMENT_USER, 20);
+        assertKnowledgeCP(POST_USER, 1, 20);
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(COMMENT_USER, 1);
+    }
+    
+}
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
index 24db927fb..e93f68c88 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
@@ -453,7 +453,7 @@ public void testPostCommentByLoginUser1() throws Exception {
         // コメントが登録されていないこと
         StubHttpServletRequest request = openKnowledge(COMMENT_POST_USER, knowledgeId);
         List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
-        Assert.assertEquals(0, comments.size()); // 閲覧者にもデフォルト通知（初期設定）
+        Assert.assertEquals(0, comments.size());
         
         // コメントが登録できること
         comment(COMMENT_POST_USER, knowledgeId, "コメント");
@@ -471,7 +471,7 @@ public void testPostCommentByLoginUser1() throws Exception {
         // コメントが登録されていないこと
         request = openKnowledge(COMMENT_POST_USER, knowledgeId);
         comments = (List<CommentsEntity>) request.getAttribute("comments");
-        Assert.assertEquals(1, comments.size()); // 閲覧者にもデフォルト通知（初期設定）
+        Assert.assertEquals(1, comments.size());
     }
 
     
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationProtectTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationProtectTest.java
new file mode 100644
index 000000000..86a92fe36
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationProtectTest.java
@@ -0,0 +1,234 @@
+package org.support.project.knowledge.integration;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.dao.TemplateItemsDao;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.TargetLogic;
+import org.support.project.knowledge.logic.TemplateLogic;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.boundary.ForwardBoundary;
+import org.support.project.web.boundary.JsonBoundary;
+import org.support.project.web.common.HttpStatus;
+import org.support.project.web.logic.HttpRequestCheckLogic;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+import org.support.project.web.test.stub.StubHttpServletRequest;
+import org.support.project.web.test.stub.StubHttpServletResponse;
+
+/**
+ * 
+ * @author koda
+ */
+public class IntegrationProtectTest extends IntegrationCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(IntegrationProtectTest.class);
+    
+    private static final String POST_USER = "integration-test-user-01";
+    private static final String USER1 = "integration-test-user-02";
+    
+    private static long knowledgeId;
+    
+    /**
+     * ユーザを登録
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        addUser(POST_USER);
+        addUser(USER1);
+    }
+    
+    /**
+     * 保護の記事を登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 100)
+    public void testPost() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_add");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+
+        // 保存
+        request.setServletPath("protect.knowledge/save");
+        request.setMethod("post");
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        request.addParameter("title", "タイトル");
+        request.addParameter("content", "内容");
+        request.addParameter("typeId", String.valueOf(TemplateLogic.TYPE_ID_BOOKMARK));
+        request.addParameter("item_" + TemplateItemsDao.ITEM_ID_BOOKMARK_URL, "https://information-supportproject.org/");
+        request.addParameter("publicFlag", String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PROTECT));
+        
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(200, sendObject.getCode().intValue());
+        
+        knowledgeId = new Long(sendObject.getResult());
+    }
+    
+    /**
+     * 投稿後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 101)
+    public void testAssertAfterPost() throws Exception {
+        assertCP(POST_USER, 30);
+        assertCP(USER1, 0);
+        assertKnowledgeCP(POST_USER, knowledgeId, 30);
+        assertNotAccessAble(USER1, knowledgeId, HttpStatus.SC_404_NOT_FOUND); // アクセス権が無い場合、403では無く404にしている
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(USER1, 0);
+    }
+    
+    /**
+     * 保護の記事を更新
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 200)
+    public void testUpdate() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_add");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+
+        // 保存
+        request.setServletPath("protect.knowledge/save");
+        request.setMethod("post");
+        request.addParameter("knowledgeId", String.valueOf(1));
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        request.addParameter("title", "タイトル");
+        request.addParameter("content", "内容");
+        request.addParameter("typeId", String.valueOf(TemplateLogic.TYPE_ID_BOOKMARK));
+        request.addParameter("item_" + TemplateItemsDao.ITEM_ID_BOOKMARK_URL, "https://information-supportproject.org/");
+        request.addParameter("publicFlag", String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PROTECT));
+        request.addParameter("updateContent", "true");
+        
+        LoginedUser user = super.getLoginUser(USER1);
+        request.addParameter("groups", TargetLogic.ID_PREFIX_USER + user.getUserId());
+        
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(200, sendObject.getCode().intValue());
+    }
+    
+    /**
+     * 更新後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 201)
+    public void testAssertAfterUpdate() throws Exception {
+        super.openKnowledge(USER1, 1); // USER1でアクセスできるようになっている
+        assertCP(POST_USER, 1);
+        assertCP(USER1, 1); // 参照でポイントアップ
+        assertKnowledgeCP(POST_USER, knowledgeId, 1);
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(USER1, 1);
+    }
+    
+    
+    /**
+     * 保護の記事を更新
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 300)
+    public void testUpdateOnlyMeta() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_add");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+
+        // 保存
+        request.setServletPath("protect.knowledge/save");
+        request.setMethod("post");
+        request.addParameter("knowledgeId", String.valueOf(1));
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        request.addParameter("title", "タイトル");
+        request.addParameter("content", "内容");
+        request.addParameter("typeId", String.valueOf(TemplateLogic.TYPE_ID_BOOKMARK));
+        request.addParameter("item_" + TemplateItemsDao.ITEM_ID_BOOKMARK_URL, "https://information-supportproject.org/");
+        request.addParameter("publicFlag", String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PROTECT));
+        request.addParameter("updateContent", "false");
+        
+        LoginedUser user = super.getLoginUser(USER1);
+        request.addParameter("groups", TargetLogic.ID_PREFIX_USER + user.getUserId());
+        
+        request.addParameter("tagNames", "タグのみを追加したパターン");
+        
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(200, sendObject.getCode().intValue());
+    }
+    
+    /**
+     * 更新後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 301)
+    public void testAssertAfterUpdateOnlyMeta() throws Exception {
+        StubHttpServletRequest request = super.openKnowledge(USER1, 1);
+        Assert.assertEquals("タグのみを追加したパターン", request.getAttribute("tagNames"));
+        
+        assertCP(POST_USER, 0);
+        assertCP(USER1, 0);
+        assertKnowledgeCP(POST_USER, knowledgeId, 0);
+
+        // 通知無し
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        Assert.assertEquals(0, list.size());
+        
+        assertNotificationCount(POST_USER, 0);
+        assertNotificationCount(USER1, 0);
+    }
+    
+    
+    
+}
diff --git a/src/test/java/org/support/project/knowledge/stub/mail/StubAddress.java b/src/test/java/org/support/project/knowledge/stub/mail/StubAddress.java
new file mode 100644
index 000000000..2a2304dd1
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/stub/mail/StubAddress.java
@@ -0,0 +1,32 @@
+package org.support.project.knowledge.stub.mail;
+
+import javax.mail.Address;
+
+public class StubAddress extends Address {
+    private String address;
+    
+    public StubAddress(String address) {
+        super();
+        this.address = address;
+    }
+
+
+    @Override
+    public String toString() {
+        return address;
+    }
+
+    
+    @Override
+    public String getType() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean equals(Object address) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+}
diff --git a/src/test/java/org/support/project/knowledge/stub/mail/StubMessage.java b/src/test/java/org/support/project/knowledge/stub/mail/StubMessage.java
new file mode 100644
index 000000000..64327673a
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/stub/mail/StubMessage.java
@@ -0,0 +1,280 @@
+package org.support.project.knowledge.stub.mail;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.activation.DataHandler;
+import javax.mail.Address;
+import javax.mail.Flags;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Multipart;
+
+public class StubMessage extends javax.mail.Message {
+    private Address[] addresses;
+    private Address[] recipients;
+    private String content;
+    private String subject;
+    private Map<String, List<String>> headers = new HashMap<>();
+
+    @Override
+    public Address[] getFrom() throws MessagingException {
+        return addresses;
+    }
+    @Override
+    public void addFrom(Address[] addresses) throws MessagingException {
+        this.addresses = addresses;
+    }
+    
+    /* (non-Javadoc)
+     * @see javax.mail.Message#getAllRecipients()
+     */
+    @Override
+    public Address[] getAllRecipients() throws MessagingException {
+        return recipients;
+    }
+    public void setAllRecipients(Address[] recipients) {
+        this.recipients = recipients;
+    }
+    @Override
+    public Object getContent() throws IOException, MessagingException {
+        return content;
+    }
+    public void setContent(String content) {
+        this.content = content;
+    }
+    @Override
+    public String getSubject() throws MessagingException {
+        return subject;
+    }
+
+    @Override
+    public void setSubject(String subject) throws MessagingException {
+        this.subject = subject;
+    }
+    @Override
+    public String[] getHeader(String header_name) throws MessagingException {
+        if (!headers.containsKey(header_name)) {
+            headers.put(header_name, new ArrayList<>());
+        }
+        List<String> header = headers.get(header_name);
+        return header.toArray(new String[0]);
+    }
+    @Override
+    public void addHeader(String header_name, String header_value) throws MessagingException {
+        if (!headers.containsKey(header_name)) {
+            headers.put(header_name, new ArrayList<>());
+        }
+        List<String> header = headers.get(header_name);
+        header.add(header_value);
+    }
+
+    
+    // ------------------------------------------------------------------------------------------------------------------
+    @Override
+    public void setHeader(String header_name, String header_value) throws MessagingException {
+    }
+    @Override
+    public void removeHeader(String header_name) throws MessagingException {
+    }
+    @Override
+    public void setFrom() throws MessagingException {
+    }
+    @Override
+    public void setFrom(Address address) throws MessagingException {
+    }
+    
+    
+    
+    
+    @Override
+    public int getSize() throws MessagingException {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getLineCount() throws MessagingException {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public String getContentType() throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean isMimeType(String mimeType) throws MessagingException {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public String getDisposition() throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void setDisposition(String disposition) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public String getDescription() throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void setDescription(String description) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public String getFileName() throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void setFileName(String filename) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException, MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public DataHandler getDataHandler() throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+
+    @Override
+    public void setDataHandler(DataHandler dh) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void setContent(Object obj, String type) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void setText(String text) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void setContent(Multipart mp) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void writeTo(OutputStream os) throws IOException, MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public Enumeration getAllHeaders() throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Enumeration getMatchingHeaders(String[] header_names) throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Enumeration getNonMatchingHeaders(String[] header_names) throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+
+
+    @Override
+    public Address[] getRecipients(RecipientType type) throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void setRecipients(RecipientType type, Address[] addresses) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void addRecipients(RecipientType type, Address[] addresses) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public Date getSentDate() throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void setSentDate(Date date) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public Date getReceivedDate() throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Flags getFlags() throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void setFlags(Flags flag, boolean set) throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public Message reply(boolean replyToAll) throws MessagingException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void saveChanges() throws MessagingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+}
diff --git a/src/test/resources/org/support/project/knowledge/integration/post_knowledge.json b/src/test/resources/org/support/project/knowledge/integration/post_knowledge.json
index 118e04259..732704271 100644
--- a/src/test/resources/org/support/project/knowledge/integration/post_knowledge.json
+++ b/src/test/resources/org/support/project/knowledge/integration/post_knowledge.json
@@ -1,5 +1,6 @@
 {
     "content": "コンテンツ",
     "template": "knowledge",
-    "title": "タイトル"
+    "title": "タイトル",
+    "publicFlag": 0
 }
diff --git a/src/test/resources/org/support/project/knowledge/integration/put_knowledge.json b/src/test/resources/org/support/project/knowledge/integration/put_knowledge.json
index aca4afda1..9b03f03d0 100644
--- a/src/test/resources/org/support/project/knowledge/integration/put_knowledge.json
+++ b/src/test/resources/org/support/project/knowledge/integration/put_knowledge.json
@@ -1,5 +1,6 @@
 {
     "content": "コンテンツ更新",
     "template": "knowledge",
-    "title": "タイトル更新"
+    "title": "タイトル更新",
+    "publicFlag": 0
 }

From 0b00be3eb3c5eb9b761b26297177df1db7fcaa92 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Fri, 29 Sep 2017 19:49:50 +0900
Subject: [PATCH 088/138] Change null safe to get notification count

---
 .../support/project/knowledge/control/Control.java    | 11 +++++++++--
 .../knowledge/control/open/IntervalControl.java       |  3 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/Control.java b/src/main/java/org/support/project/knowledge/control/Control.java
index 50d6151ac..3d5d048bf 100644
--- a/src/main/java/org/support/project/knowledge/control/Control.java
+++ b/src/main/java/org/support/project/knowledge/control/Control.java
@@ -56,8 +56,15 @@ public void setRequest(HttpServletRequest request) {
         
         // 通知の件数を取得
         if (getLoginedUser() != null) {
-            int count = NotificationLogic.get().countUnRead(getLoginUserId());
-            request.setAttribute(NOTIFY_UNREAD_COUNT, count);
+            try {
+                Integer count = NotificationLogic.get().countUnRead(getLoginUserId());
+                if (count == null) {
+                    count = 0;
+                }
+                request.setAttribute(NOTIFY_UNREAD_COUNT, count);
+            } catch (Exception e) {
+                LOG.warn("Error on get user notification count. " + e.getClass().getSimpleName());
+            }
         }
     }
 
diff --git a/src/main/java/org/support/project/knowledge/control/open/IntervalControl.java b/src/main/java/org/support/project/knowledge/control/open/IntervalControl.java
index 06449e903..855d7e708 100644
--- a/src/main/java/org/support/project/knowledge/control/open/IntervalControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/IntervalControl.java
@@ -2,14 +2,13 @@
 
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-import org.support.project.knowledge.control.Control;
 import org.support.project.web.bean.Msg;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.control.service.Get;
 import org.support.project.web.exception.InvalidParamException;
 
 @DI(instance = Instance.Prototype)
-public class IntervalControl extends Control {
+public class IntervalControl extends org.support.project.web.control.Control {
 
     @Get
     public Boundary access() throws InvalidParamException {

From 86bab1bdb535e499bee9807c53249bea191caa69 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sat, 30 Sep 2017 13:09:59 +0900
Subject: [PATCH 089/138] Add integration test

---
 .../dao/PointKnowledgeHistoriesDao.java       |  25 ++
 ...AbstractAddPointForKnowledgeProcessor.java |  40 ++-
 .../logic/activity/KnowledgesaveActivity.java |  35 +--
 .../integration/IntegrationProtectTest.java   |   2 +-
 .../integration/IntegrationUpdateTest.java    | 276 ++++++++++++++++++
 5 files changed, 335 insertions(+), 43 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/integration/IntegrationUpdateTest.java

diff --git a/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
index 49e460488..8bdb5ac37 100644
--- a/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
@@ -1,5 +1,8 @@
 package org.support.project.knowledge.dao;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.support.project.aop.Aspect;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
@@ -26,6 +29,28 @@ public long selectNumOnKnowledge(long knowledgeId) {
         String sql = "SELECT MAX(HISTORY_NO) FROM POINT_KNOWLEDGE_HISTORIES WHERE KNOWLEDGE_ID = ?";
         return executeQuerySingle(sql, Long.class, knowledgeId);
     }
+    public int selectBeforePoint(Long knowledgeId, int... types) {
+        StringBuilder sql = new StringBuilder();
+        List<Object> params = new ArrayList<>();
+        sql.append("SELECT SUM(POINT) FROM POINT_KNOWLEDGE_HISTORIES ");
+        sql.append("WHERE TYPE IN (");
+        boolean appended = false;
+        for (int i : types) {
+            if (appended) {
+                sql.append(", ");
+                
+            }
+            sql.append("?");
+            appended = true;
+            params.add(i);
+        }
+        sql.append(");");
+        Integer point =  executeQuerySingle(sql.toString(), Integer.class, params.toArray(new Object[0]));
+        if (point == null) {
+            point = 0;
+        }
+        return point;
+    }
 
 
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
index 1f8d8b5e5..81281df4e 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/AbstractAddPointForKnowledgeProcessor.java
@@ -1,5 +1,8 @@
 package org.support.project.knowledge.logic.activity;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.support.project.aop.Aspect;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
@@ -30,6 +33,13 @@ public void setKnowledge(KnowledgesEntity knowledge) {
     protected abstract TypeAndPoint getTypeAndPointForKnowledgeOwner();
     protected abstract TypeAndPoint getTypeAndPointForKnowledge();
     
+    private List<Activity> multiAbleActivities = new ArrayList<>();
+    public AbstractAddPointForKnowledgeProcessor() {
+        super();
+        multiAbleActivities.add(Activity.KNOWLEDGE_POST_PRIVATE);
+        multiAbleActivities.add(Activity.KNOWLEDGE_POST_PROTECTED);
+        multiAbleActivities.add(Activity.KNOWLEDGE_POST_PUBLIC);
+    }
     @Override
     @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
     public void execute() throws Exception {
@@ -37,36 +47,40 @@ public void execute() throws Exception {
             // ありえないけど念のため確認
             return;
         }
-        if (isExistsActivity(eventUser.getUserId(), getActivity(), String.valueOf(getKnowledge().getKnowledgeId()))) {
-            LOG.debug("This activity is already exists. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
-                    + " [knowledge]" + getKnowledge().getKnowledgeId());
-            // 既に指定のKnowledge登録済
-            return;
+        Activity activity = getActivity();
+        if (!multiAbleActivities.contains(activity)) {
+            if (isExistsActivity(eventUser.getUserId(), activity, String.valueOf(getKnowledge().getKnowledgeId()))) {
+                LOG.debug("This activity is already exists. [Activity]" + activity.toString() + " [user]" + eventUser.getUserId()
+                        + " [knowledge]" + getKnowledge().getKnowledgeId());
+                // 既に指定のKnowledge登録済
+                return;
+            }
         }
+        
         TypeAndPoint exec = getTypeAndPointForActivityExecuter();
         TypeAndPoint owner = getTypeAndPointForKnowledgeOwner();
         TypeAndPoint knowledge = getTypeAndPointForKnowledge();
         if (exec == null && owner == null && knowledge == null) {
             // ポイントをつける対象が無いので、処理終了
-            LOG.debug("This activity is not add point. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+            LOG.debug("This activity is not add point. [Activity]" + activity.toString() + " [user]" + eventUser.getUserId()
             + " [knowledge]" + getKnowledge().getKnowledgeId());
             return;
         }
-        LOG.debug("activity process started. [Activity]" + getActivity().toString() + " [user]" + eventUser.getUserId()
+        LOG.debug("activity process started. [Activity]" + activity.toString() + " [user]" + eventUser.getUserId()
         + " [knowledge]" + getKnowledge().getKnowledgeId());
         
         StringBuilder logmsg = new StringBuilder();
-        logmsg.append("Activity : " + getActivity().toString());
+        logmsg.append("Activity : " + activity.toString());
          // ポイント発行アクティビティを生成
-        ActivitiesEntity activity = addActivity(
-                getActivity(),
+        ActivitiesEntity activityEntry = addActivity(
+                activity,
                 String.valueOf(getKnowledge().getKnowledgeId()));
         
         // 実行したユーザのポイントアップ
         if (exec != null) {
             int point = addPointForUser(
                     eventUser.getUserId(), // ターゲットは、実行したユーザ
-                    activity.getActivityNo(),
+                    activityEntry.getActivityNo(),
                     exec.type,
                     exec.point);
             logmsg.append("\n\tAdd event user: [id]" + eventUser.getUserId() + " [type]" + exec.type + " [add]" + exec.point + " [result]" + point);
@@ -75,7 +89,7 @@ public void execute() throws Exception {
         if (owner != null) {
             int point = addPointForUser(
                     getKnowledge().getInsertUser(), // ターゲットは登録者
-                    activity.getActivityNo(),
+                    activityEntry.getActivityNo(),
                     owner.type,
                     owner.point);
             logmsg.append("\n\tAdd owner user: [id]" + getKnowledge().getInsertUser() + " [type]" + owner.type + " [add]" + owner.point + " [result]" + point);
@@ -84,7 +98,7 @@ public void execute() throws Exception {
         if (knowledge != null) {
             int point = addPointForKnowledge(
                     getKnowledge().getKnowledgeId(),
-                    activity.getActivityNo(),
+                    activityEntry.getActivityNo(),
                     knowledge.type,
                     knowledge.point);
             logmsg.append("\n\tAdd knowledge: [id]" + getKnowledge().getKnowledgeId() + " [type]" + knowledge.type + " [add]" + knowledge.point + " [result]" + point);
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
index 44188c66e..46c82b968 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
@@ -2,12 +2,10 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
-import org.support.project.common.util.StringUtils;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-import org.support.project.knowledge.dao.ActivitiesDao;
-import org.support.project.knowledge.entity.ActivitiesEntity;
+import org.support.project.knowledge.dao.PointKnowledgeHistoriesDao;
 
 /**
  * ナレッジ投稿時のポイント付与
@@ -50,32 +48,11 @@ private int getPoint() {
         if (point != 0) {
             return point;
         }
-        // 過去に登録した情報があるか検索
-        ActivitiesEntity before = ActivitiesDao.get().selectBefore(
-                super.eventUser.getUserId(),
-                String.valueOf(getKnowledge().getKnowledgeId()),
-                Activity.KNOWLEDGE_POST_PUBLIC.getValue(),
-                Activity.KNOWLEDGE_POST_PROTECTED.getValue(),
-                Activity.KNOWLEDGE_POST_PRIVATE.getValue()
-                );
-        int point = getKindPoint(getActivity().getValue());
-        if (before == null) {
-            if (getActivity() == Activity.KNOWLEDGE_POST_PRIVATE) {
-                // 過去に登録した履歴が無く、今回が非公開ならポイント付けない
-                return 0;
-            }
-            // 文章が多い力先はポイントが高いように調整(初めの一回なので、初めの一回を超えて
-            if (StringUtils.isNotEmpty(getKnowledge().getContent()) && getKnowledge().getContent().length() > 1000) {
-                int add = (getKnowledge().getContent().length() - 1000) / 100;
-                if (add > 100) {
-                    add = 100;
-                }
-                point += add;
-            }
-        } else {
-            point = point - getKindPoint(before.getKind());
-        }
-        this.point = point;
+        int beforePoint = PointKnowledgeHistoriesDao.get().selectBeforePoint(
+                getKnowledge().getKnowledgeId(), TYPE_KNOWLEDGE_POSTED_PUBLIC, TYPE_KNOWLEDGE_POSTED_PROTECT, TYPE_KNOWLEDGE_POSTED_PRIVATE);
+        int nowPoint = getKindPoint(getActivity().getValue());
+        point = nowPoint - beforePoint;
+        LOG.error("[POINT NOW]" + nowPoint + "  [POINT BEFORE]" + beforePoint + " [ADD RESULT]" + point);
         return point;
     }
     private int getTypeForExecuter() {
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationProtectTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationProtectTest.java
index 86a92fe36..b4dd28fe0 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationProtectTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationProtectTest.java
@@ -25,7 +25,7 @@
 import org.support.project.web.test.stub.StubHttpServletResponse;
 
 /**
- * 
+ * 保護の記事の操作のテスト
  * @author koda
  */
 public class IntegrationProtectTest extends IntegrationCommon {
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationUpdateTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationUpdateTest.java
new file mode 100644
index 000000000..53972a8f9
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationUpdateTest.java
@@ -0,0 +1,276 @@
+package org.support.project.knowledge.integration;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.TemplateLogic;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.boundary.ForwardBoundary;
+import org.support.project.web.boundary.JsonBoundary;
+import org.support.project.web.common.HttpStatus;
+import org.support.project.web.logic.HttpRequestCheckLogic;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+import org.support.project.web.test.stub.StubHttpServletRequest;
+import org.support.project.web.test.stub.StubHttpServletResponse;
+
+/**
+ * 記事をいろいろ変えてみた場合のテスト
+ * @author koda
+ */
+public class IntegrationUpdateTest extends IntegrationCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(IntegrationProtectTest.class);
+    
+    private static final String POST_USER = "integration-test-user-01";
+    private static final String USER1 = "integration-test-user-02";
+    private static long knowledgeId;
+    
+    /**
+     * 更新を実行
+     * @throws Exception
+     */
+    private void doUpdate(int publicflag, boolean updateContent) throws Exception {
+        // 編集画面を開く
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_add");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+
+        // 保存
+        request.setServletPath("protect.knowledge/save");
+        request.setMethod("post");
+        request.addParameter("knowledgeId", String.valueOf(1));
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        request.addParameter("title", "タイトル");
+        request.addParameter("content", "内容");
+        request.addParameter("typeId", String.valueOf(TemplateLogic.TYPE_ID_KNOWLEDGE));
+        request.addParameter("publicFlag", String.valueOf(publicflag));
+        request.addParameter("updateContent", String.valueOf(updateContent));
+        
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(200, sendObject.getCode().intValue());
+    }
+        
+    
+    /**
+     * ユーザを登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        addUser(POST_USER);
+        addUser(USER1);
+    }
+    /**
+     * 記事を登録(非公開）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 100)
+    public void testPostPrivate() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_add");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+
+        // 保存
+        request.setServletPath("protect.knowledge/save");
+        request.setMethod("post");
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        request.addParameter("title", "タイトル");
+        request.addParameter("content", "内容");
+        request.addParameter("typeId", String.valueOf(TemplateLogic.TYPE_ID_KNOWLEDGE));
+        request.addParameter("publicFlag", String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PRIVATE));
+        
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(200, sendObject.getCode().intValue());
+        
+        knowledgeId = new Long(sendObject.getResult());
+    }
+    
+    /**
+     * 投稿後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 101)
+    public void testAssertAfterPost() throws Exception {
+        assertCP(POST_USER, 0);
+        assertCP(USER1, 0);
+        assertKnowledgeCP(POST_USER, knowledgeId, 0); // POST_USERではアクセスできる（CPを確認できる）
+        assertNotAccessAble(USER1, knowledgeId, HttpStatus.SC_404_NOT_FOUND); // アクセス権が無い場合、403では無く404にしている
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 0);
+        assertNotificationCount(USER1, 0);
+    }
+    
+    
+    
+
+    /**
+     * 記事を更新
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 200)
+    public void testAssertAfterUpdatePrivateToProtect() throws Exception {
+        doUpdate(KnowledgeLogic.PUBLIC_FLAG_PROTECT, true);
+        assertCP(POST_USER, 30);
+        assertCP(USER1, 0);
+        assertKnowledgeCP(POST_USER, knowledgeId, 30); // POST_USERではアクセスできる（CPを確認できる）
+        assertNotAccessAble(USER1, knowledgeId, HttpStatus.SC_404_NOT_FOUND); // アクセス権が無い場合、403では無く404にしている
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(USER1, 0);
+    }
+
+    /**
+     * 記事を更新
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 300)
+    public void testAssertAfterUpdateProtectToPublic() throws Exception {
+        doUpdate(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, true);
+        
+        assertKnowledgeCP(POST_USER, knowledgeId, 20); // POST_USERではアクセスできる（CPを確認できる）
+        assertKnowledgeCP(USER1, knowledgeId, 1); //参照したので１ポイント追加
+        
+        assertCP(POST_USER, 21);
+        assertCP(USER1, 1);
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(USER1, 1);
+    }
+    
+    /**
+     * 記事を更新(公開→公開）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 400)
+    public void testAssertAfterUpdatePublicToPublic() throws Exception {
+        doUpdate(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, true);
+        
+        assertKnowledgeCP(POST_USER, knowledgeId, 0);
+        assertKnowledgeCP(USER1, knowledgeId, 0);
+        
+        assertCP(POST_USER, 0);
+        assertCP(USER1, 0);
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(USER1, 1);
+    }
+    
+    /**
+     * 記事を更新(公開→保護）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 500)
+    public void testAssertAfterUpdatePublicToProtect() throws Exception {
+        doUpdate(KnowledgeLogic.PUBLIC_FLAG_PROTECT, true);
+        
+        assertKnowledgeCP(POST_USER, knowledgeId, -20);
+        assertNotAccessAble(USER1, knowledgeId, HttpStatus.SC_404_NOT_FOUND);
+        
+        assertCP(POST_USER, -20);
+        assertCP(USER1, 0);
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(USER1, 0);
+    }
+    
+    /**
+     * 記事を更新(保護→非公開）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 600)
+    public void testAssertAfterUpdateProtectToPrivate() throws Exception {
+        doUpdate(KnowledgeLogic.PUBLIC_FLAG_PRIVATE, true);
+        
+        assertKnowledgeCP(POST_USER, knowledgeId, -30);
+        assertNotAccessAble(USER1, knowledgeId, HttpStatus.SC_404_NOT_FOUND);
+        
+        assertCP(POST_USER, -30);
+        assertCP(USER1, 0);
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 0);
+        assertNotificationCount(USER1, 0);
+    }
+
+    /**
+     * 記事を更新(非公開→公開）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 700)
+    public void testAssertAfterUpdatePrivateToPublic() throws Exception {
+        doUpdate(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, true);
+        
+        assertKnowledgeCP(POST_USER, knowledgeId, 50);
+        assertKnowledgeCP(USER1, knowledgeId, 0);
+        
+        assertCP(POST_USER, 50);
+        assertCP(USER1, 0);
+
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(USER1, 1);
+    }
+
+    /**
+     * 記事を更新(非公開→公開）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 800)
+    public void testAssertAfterUpdateNotNotify() throws Exception {
+        doUpdate(KnowledgeLogic.PUBLIC_FLAG_PUBLIC, false);
+        
+        assertKnowledgeCP(POST_USER, knowledgeId, 0);
+        assertKnowledgeCP(USER1, knowledgeId, 0);
+        
+        assertCP(POST_USER, 0);
+        assertCP(USER1, 0);
+
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        Assert.assertEquals(0, list.size());
+
+        assertNotificationCount(POST_USER, 0);
+        assertNotificationCount(USER1, 0);
+    }
+}

From 292b819c39543f29323922559f46f09ef6ab7e9c Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sat, 30 Sep 2017 15:16:24 +0900
Subject: [PATCH 090/138] Add integration test

---
 .../dao/PointKnowledgeHistoriesDao.java       |  4 +++-
 .../logic/activity/KnowledgesaveActivity.java |  4 +++-
 .../knowledge/dao/KnowledgesDaoTest.java      | 24 +++++++++----------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
index 8bdb5ac37..83cfd1d7c 100644
--- a/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
@@ -33,7 +33,9 @@ public int selectBeforePoint(Long knowledgeId, int... types) {
         StringBuilder sql = new StringBuilder();
         List<Object> params = new ArrayList<>();
         sql.append("SELECT SUM(POINT) FROM POINT_KNOWLEDGE_HISTORIES ");
-        sql.append("WHERE TYPE IN (");
+        sql.append("WHERE KNOWLEDGE_ID = ? ");
+        params.add(knowledgeId);
+        sql.append("AND TYPE IN (");
         boolean appended = false;
         for (int i : types) {
             if (appended) {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
index 46c82b968..7443c1f93 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
@@ -52,7 +52,9 @@ private int getPoint() {
                 getKnowledge().getKnowledgeId(), TYPE_KNOWLEDGE_POSTED_PUBLIC, TYPE_KNOWLEDGE_POSTED_PROTECT, TYPE_KNOWLEDGE_POSTED_PRIVATE);
         int nowPoint = getKindPoint(getActivity().getValue());
         point = nowPoint - beforePoint;
-        LOG.error("[POINT NOW]" + nowPoint + "  [POINT BEFORE]" + beforePoint + " [ADD RESULT]" + point);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("[ID]" + getKnowledge().getKnowledgeId() + "[POINT NOW]" + nowPoint + "  [POINT BEFORE]" + beforePoint + " [ADD RESULT]" + point);
+        }
         return point;
     }
     private int getTypeForExecuter() {
diff --git a/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java b/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java
index f17311f4a..82b77df1b 100644
--- a/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java
+++ b/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java
@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+import java.util.Locale;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -12,7 +13,6 @@
 import org.support.project.common.log.LogFactory;
 import org.support.project.knowledge.TestCommon;
 import org.support.project.knowledge.entity.KnowledgesEntity;
-import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.knowledge.vo.KnowledgeData;
 import org.support.project.ormapping.common.DBUserPool;
@@ -58,6 +58,7 @@ public void testSelectPopularity() throws Exception {
             KnowledgesEntity entity = new KnowledgesEntity();
             entity.setTitle("Test-" + i);
             entity.setContent("テスト");
+            entity.setPublicFlag(KnowledgeLogic.PUBLIC_FLAG_PUBLIC);
             KnowledgeLogic logic = KnowledgeLogic.get();
             
             KnowledgeData data = new KnowledgeData();
@@ -66,11 +67,11 @@ public void testSelectPopularity() throws Exception {
             entity = logic.insert(data, loginedUser);
             knowledge.add(entity);
 
-            for (int j = 0; j < i; j++) {
-                LikesEntity like = new LikesEntity();
-                like.setKnowledgeId(entity.getKnowledgeId());
-                LikesDao.get().save(like);
+            if (i == 29) {
+                KnowledgeLogic.get().addLike(entity.getKnowledgeId(), loginedUser2, Locale.JAPAN);
             }
+            entity = KnowledgesDao.get().selectOnKey(entity.getKnowledgeId());
+            LOG.info("[" + i + "]" + entity.getPoint());
         }
 
         Calendar c = Calendar.getInstance();
@@ -86,7 +87,7 @@ public void testSelectPopularity() throws Exception {
         List<KnowledgesEntity> list = KnowledgesDao.get().selectPopularity(start, end, 0, 20);
 
         for (KnowledgesEntity knowledgesEntity : list) {
-            LOG.info(knowledgesEntity.getTitle() + ":" + knowledgesEntity.getPointOnTerm());
+            LOG.info(knowledgesEntity.getTitle() + ":" + knowledgesEntity.getPointOnTerm() + " : " + knowledgesEntity.getPoint());
         }
         Assert.assertEquals("Test-29", list.get(0).getTitle());
     }
@@ -99,7 +100,7 @@ public void testSelectPopularityWithAccessControl() throws Exception {
             KnowledgesEntity entity = new KnowledgesEntity();
             entity.setTitle("Test-" + i);
             entity.setContent("テスト");
-            entity.setPublicFlag(0);
+            entity.setPublicFlag(KnowledgeLogic.PUBLIC_FLAG_PUBLIC);
             KnowledgeLogic logic = KnowledgeLogic.get();
             
             KnowledgeData data = new KnowledgeData();
@@ -107,11 +108,8 @@ public void testSelectPopularityWithAccessControl() throws Exception {
             
             entity = logic.insert(data, loginedUser);
             knowledge.add(entity);
-
-            for (int j = 0; j < i; j++) {
-                LikesEntity like = new LikesEntity();
-                like.setKnowledgeId(entity.getKnowledgeId());
-                LikesDao.get().save(like);
+            if (i == 29) {
+                KnowledgeLogic.get().addLike(entity.getKnowledgeId(), loginedUser2, Locale.JAPAN);
             }
         }
 
@@ -128,7 +126,7 @@ public void testSelectPopularityWithAccessControl() throws Exception {
         List<KnowledgesEntity> list = KnowledgesDao.get().selectPopularityWithAccessControl(loginedUser, start, end, 0, 20);
 
         for (KnowledgesEntity knowledgesEntity : list) {
-            LOG.info(knowledgesEntity.getTitle() + ":" + knowledgesEntity.getPointOnTerm());
+            LOG.info(knowledgesEntity.getTitle() + ":" + knowledgesEntity.getPointOnTerm() + " : " + knowledgesEntity.getPoint());
         }
         Assert.assertEquals("Test-29", list.get(0).getTitle());
     }

From cd853d8bd2f08101ffefc7eff673017a6ded9baf Mon Sep 17 00:00:00 2001
From: nyoron <nyoron.jp@live.jp>
Date: Mon, 2 Oct 2017 22:39:23 +0900
Subject: [PATCH 091/138] Improve appresource.properties

---
 src/main/resources/appresource.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 2c9ef0d6f..3d89ae6f4 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -315,7 +315,7 @@ knowledge.edit.set.image.path=ShowImage
 knowledge.edit.set.slide.path=SlideShow
 knowledge.edit.update.content=updated a content
 knowledge.edit.update.meta=Only meta information was updated (update notification is not sent)
-knowledge.edit.image.upload=Upload a image width preview
+knowledge.edit.image.upload=Upload an image with preview
 knowledge.edit.do.not.update.timeline=Don't update timeline
 knowledge.delete.none=Knowledge to be deleted is not specified
 
@@ -778,7 +778,7 @@ knowledge.admin.mailhook.condition.limit.post.0=None
 knowledge.admin.mailhook.condition.limit.post.1=Only registered users
 knowledge.admin.mailhook.condition.limit.post.2=Only email address of a specify domain
 knowledge.admin.mailhook.condition.limit.param=Domain (If domain limit selected)
-knowledge.admin.mailhook.info.1=Post from e-mail is a automation function for add knowledge. It is receive mail by regularly, and add knowledge if satisfy the conditions.
+knowledge.admin.mailhook.info.1=Post from e-mail is an automation function for add knowledge. It is receive mail by regularly, and add knowledge if satisfy the conditions.
 knowledge.admin.mailhook.info.2=After the reception, all mails will delete in this mailbox.
 knowledge.admin.mailhook.info.3=For this reason, please prepare the e-mail address of this function only.
 knowledge.admin.mailhook.title.properties=Properties of mail. (Advanced option)

From 9fec5d9922868324d47eb56dc056845fc39435b1 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 3 Oct 2017 23:44:28 +0900
Subject: [PATCH 092/138] Add integration test

---
 .../control/protect/ConnectControl.java       |   8 +-
 .../control/protect/SurveyControl.java        |  10 +-
 .../control/protect/TokenControl.java         |   6 +-
 .../activity/KnowledgeAnswerActivity.java     |   8 +-
 src/main/webapp/js/knowledge-view-survey.js   |  30 +--
 .../integration/IntegrationSurveyTest.java    | 210 ++++++++++++++++++
 6 files changed, 243 insertions(+), 29 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java

diff --git a/src/main/java/org/support/project/knowledge/control/protect/ConnectControl.java b/src/main/java/org/support/project/knowledge/control/protect/ConnectControl.java
index b5c189bef..b05664406 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/ConnectControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/ConnectControl.java
@@ -40,7 +40,7 @@ public Boundary index() {
      * 指定のユーザのLdap認証設定を設定する
      * @return
      */
-    @Get
+    @Get(publishToken="csrf")
     public Boundary config() {
         String key = getParam("key");
         if (StringUtils.isEmpty(key)) {
@@ -67,7 +67,7 @@ public Boundary config() {
         return forward("config.jsp");
     }
     
-    @Post
+    @Post(subscribeToken="csrf")
     public Boundary connect() {
         String key = getParam("key");
         if (StringUtils.isEmpty(key)) {
@@ -133,7 +133,7 @@ public Boundary connect() {
         }
     }
 
-    @Post
+    @Post(subscribeToken="csrf")
     public Boundary disconnect() {
         String key = getParam("key");
         if (StringUtils.isEmpty(key)) {
@@ -153,7 +153,7 @@ public Boundary disconnect() {
         return index();
     }
     
-    @Post
+    @Post(subscribeToken="csrf")
     public Boundary update() {
         String key = getParam("key");
         if (StringUtils.isEmpty(key)) {
diff --git a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
index 922ae794b..60eaec35d 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import org.support.project.common.bean.ValidateError;
@@ -29,6 +28,7 @@
 import org.support.project.knowledge.logic.activity.Activity;
 import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.knowledge.vo.SurveyReport;
+import org.support.project.web.bean.Msg;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.common.HttpStatus;
 import org.support.project.web.config.MessageStatus;
@@ -138,12 +138,12 @@ public Boundary list() throws InvalidParamException {
      * @return
      * @throws InvalidParamException
      */
-    @Get
+    @Get(publishToken = "survey")
     public Boundary load() throws InvalidParamException {
         Long id = super.getPathLong(new Long(-1));
         SurveysEntity entity = SurveyLogic.get().loadSurvey(id, getLoginUserId());
         if (entity == null) {
-            return sendError(404, null);
+            return send(new Msg("survey data is not exists."));
         }
         return send(entity);
     }
@@ -153,7 +153,7 @@ public Boundary load() throws InvalidParamException {
      * @return
      * @throws InvalidParamException
      */
-    @Delete
+    @Delete(subscribeToken = "survey")
     public Boundary delete() throws InvalidParamException {
         Long id = super.getPathLong(new Long(-1));
         SurveyLogic.get().deleteSurvey(id);
@@ -172,7 +172,7 @@ public Boundary delete() throws InvalidParamException {
      * @throws IllegalAccessException
      * @throws InstantiationException
      */
-    @Post(subscribeToken = "knowledge", checkReqToken = true)
+    @Post(subscribeToken = "survey", checkReqToken = true)
     public Boundary answer() throws InstantiationException, IllegalAccessException, JSONException, IOException, InvalidParamException {
         String id = getParam("knowledgeId");
         if (!StringUtils.isLong(id)) {
diff --git a/src/main/java/org/support/project/knowledge/control/protect/TokenControl.java b/src/main/java/org/support/project/knowledge/control/protect/TokenControl.java
index 5a8b48beb..83ae702e0 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/TokenControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/TokenControl.java
@@ -32,7 +32,7 @@ private DateFormat gateDayFormat() {
     /**
      * 現在のTokenの状態を見る
      */
-    @Get
+    @Get(publishToken = "csrf")
     public Boundary index() {
         LOG.trace("access to index");
         String expires = "";
@@ -52,7 +52,7 @@ public Boundary index() {
     /**
      * Tokenの発行／更新
      */
-    @Post
+    @Post(subscribeToken = "csrf")
     public Boundary save() {
         LOG.trace("access to save");
         String expires = getParam("expires");
@@ -81,7 +81,7 @@ public Boundary save() {
     /**
      * Tokenの削除
      */
-    @Post
+    @Post(subscribeToken = "csrf")
     public Boundary delete() {
         TokensEntity entity = TokensDao.get().selectOnUserId(getLoginUserId());
         if (entity != null) {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
index 6d5bc5514..ad01b0bf3 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
@@ -2,7 +2,6 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
-import org.support.project.common.util.RandomUtil;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -27,9 +26,10 @@ private int getPoint() {
         if (point != 0) {
             return point;
         }
-        int[] points = {1,1,2,2,2,2,3,3,3,4};
-        this.point = points[RandomUtil.randamNum(0, 10)]; // ランダムで値を増減してみた
-        return point;
+        //int[] points = {1,1,2,2,2,2,3,3,3,4};
+        //this.point = points[RandomUtil.randamNum(0, 10)]; // ランダムで値を増減してみた
+        //return point;
+        return 3;
     }
     
     @Override
diff --git a/src/main/webapp/js/knowledge-view-survey.js b/src/main/webapp/js/knowledge-view-survey.js
index 825b1542f..1e5748b33 100644
--- a/src/main/webapp/js/knowledge-view-survey.js
+++ b/src/main/webapp/js/knowledge-view-survey.js
@@ -1,22 +1,26 @@
 $(document).ready(function() {
     var knowledgeId = $('#knowledgeId').val();
-    $.ajax({
-        type : 'GET',
-        url : _CONTEXT + '/protect.survey/load/' + knowledgeId
-    }).done(function(data) {
-        console.log(data);
-        $('#btnAnswerSurvey').removeClass('hide');
-        $('#modalAnswerSurveyLabel').text(data.title);
-        $('#surveyDescription').text(data.description);
-        document.__add_Template_Edit_Item(data);
-    }).fail(function(err) {
-        console.log(err);
-    });
+    if (_LOGIN_USER_ID) {
+        $.ajax({
+            type : 'GET',
+            url : _CONTEXT + '/protect.survey/load/' + knowledgeId
+        }).done(function(data) {
+            console.log(data);
+            if (data.msg) {
+                return;
+            }
+            $('#btnAnswerSurvey').removeClass('hide');
+            $('#modalAnswerSurveyLabel').text(data.title);
+            $('#surveyDescription').text(data.description);
+            document.__add_Template_Edit_Item(data);
+        }).fail(function(err) {
+            console.log(err);
+        });
+    }
     
     $('#saveSurveyButton').click(function(){
         $('#answerForm').submit();
     });
-
     
     // フォームのサブミットは禁止
     $('#answerForm').submit(function(event) {
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
new file mode 100644
index 000000000..73235a362
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
@@ -0,0 +1,210 @@
+package org.support.project.knowledge.integration;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.TemplateLogic;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.bean.Msg;
+import org.support.project.web.boundary.ForwardBoundary;
+import org.support.project.web.boundary.JsonBoundary;
+import org.support.project.web.boundary.SendMessageBoundary;
+import org.support.project.web.common.HttpStatus;
+import org.support.project.web.logic.HttpRequestCheckLogic;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+import org.support.project.web.test.stub.StubHttpServletRequest;
+import org.support.project.web.test.stub.StubHttpServletResponse;
+
+/**
+ * 
+ * @author koda
+ */
+public class IntegrationSurveyTest extends IntegrationCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(IntegrationSurveyTest.class);
+    
+    private static final String POST_USER = "integration-test-user-01";
+    private static final String ANSWER_USER = "integration-test-user-02";
+    
+    private static long knowledgeId;
+    
+    /**
+     * ユーザを登録
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        addUser(POST_USER);
+        addUser(ANSWER_USER);
+    }
+    
+    /**
+     * 「公開」の記事登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 100)
+    public void testPostEventPublic() throws Exception {
+        // 登録画面へアクセスできること(パスのルーティングのみ確認）
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_add");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+
+        // 保存
+        request.setServletPath("protect.knowledge/save");
+        request.setMethod("post");
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        request.addParameter("title", "タイトル");
+        request.addParameter("content", "内容");
+        request.addParameter("publicFlag", String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PUBLIC));
+        request.addParameter("typeId", String.valueOf(TemplateLogic.TYPE_ID_KNOWLEDGE));
+        
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(200, sendObject.getCode().intValue());
+        
+        knowledgeId = new Long(sendObject.getResult());
+    }
+    
+    /**
+     * 投稿後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 101)
+    public void testAssertAfterPost() throws Exception {
+        assertKnowledgeCP(POST_USER, knowledgeId, 50);
+        assertCP(POST_USER, 50);
+        assertKnowledgeCP(ANSWER_USER, knowledgeId, 1);
+        assertCP(ANSWER_USER, 1);
+        assertCP(POST_USER, 1);
+        
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(ANSWER_USER, 1);
+    }
+    
+    @Test
+    @Order(order = 200)
+    public void testCreateSurvey() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        
+        request.setServletPath("protect.survey/load/" + knowledgeId);
+        request.setMethod("get");
+        JsonBoundary msg = invoke(request, response, JsonBoundary.class);
+        Msg result = (Msg) msg.getObj();
+        Assert.assertEquals("survey data is not exists.", result.getMsg());
+        
+        request.setServletPath("protect.survey/save");
+        request.setMethod("post");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
+        
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        
+        request.addParameter("knowledgeId", String.valueOf(knowledgeId));
+        request.addParameter("typeName", "アンケート");
+        request.addParameter("itemType", "text_item0");
+        request.addParameter("title_item0", "入力項目1");
+        
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        MessageResult messageResult = (MessageResult) boundary.getObj();
+        LOG.info(messageResult);
+        Assert.assertEquals(HttpStatus.SC_200_OK, messageResult.getCode().intValue());
+    }
+
+    
+    /**
+     * アンケート作成後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 201)
+    public void testAssertAfterCreateSurvey() throws Exception {
+        assertKnowledgeCP(POST_USER, knowledgeId, 0);
+        assertCP(POST_USER, 0);
+        assertKnowledgeCP(ANSWER_USER, knowledgeId, 0);
+        assertCP(ANSWER_USER, 0);
+        
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        Assert.assertEquals(0, list.size());
+        assertNotificationCount(POST_USER, 0);
+        assertNotificationCount(ANSWER_USER, 0);
+    }
+
+    /**
+     * アンケートに回答
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 300)
+    public void testAnswerSurvey() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        
+        request.setServletPath("protect.survey/load/" + knowledgeId);
+        request.setMethod("get");
+        JsonBoundary survey = invoke(request, response, JsonBoundary.class);
+        LOG.info(survey);
+        Assert.assertNotNull(survey);
+        
+        request.setServletPath("protect.survey/answer");
+        request.setMethod("post");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(ANSWER_USER, request, response);
+        
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        
+        request.addParameter("knowledgeId", String.valueOf(knowledgeId));
+        request.addParameter("item_0", "回答");
+        
+        JsonBoundary boundary = invoke(request, response, JsonBoundary.class);
+        MessageResult messageResult = (MessageResult) boundary.getObj();
+        LOG.info(messageResult);
+        Assert.assertEquals(HttpStatus.SC_200_OK, messageResult.getCode().intValue());
+    }
+
+    /**
+     * アンケート作成後の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 301)
+    public void testAssertAfterAnswer() throws Exception {
+        assertKnowledgeCP(POST_USER, knowledgeId, 3);
+        assertCP(POST_USER, 3);
+        assertCP(ANSWER_USER, 3);
+        
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        Assert.assertEquals(0, list.size());
+        assertNotificationCount(POST_USER, 0);
+        assertNotificationCount(ANSWER_USER, 0);
+    }
+
+    
+    
+}

From 48b59fb81a461a0091d7ac90a441e93bb7ecbc20 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 4 Oct 2017 18:51:44 +0900
Subject: [PATCH 093/138] Add integration test

---
 .../control/open/KnowledgeControl.java        |   4 +-
 .../control/protect/NotificationControl.java  |   7 +-
 .../integration/IntegrationCommon.java        |  65 +++-
 .../IntegrationNotificationTest.java          | 281 ++++++++++++++++++
 .../integration/IntegrationSurveyTest.java    |   3 +-
 5 files changed, 352 insertions(+), 8 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/integration/IntegrationNotificationTest.java

diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index f26c4a341..f05558c33 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -691,7 +691,7 @@ public Boundary likecomment() throws InvalidParamException {
      * @return
      * @throws ParseException
      */
-    @Post
+    @Post(subscribeToken = "")
     public Boundary escape(KnowledgesEntity entity) throws ParseException {
         super.setSendEscapeHtml(false);
         entity.setTitle(sanitize(entity.getTitle()));
@@ -706,7 +706,7 @@ public Boundary escape(KnowledgesEntity entity) throws ParseException {
      * @return
      * @throws ParseException
      */
-    @Post
+    @Post(subscribeToken = "")
     public Boundary marked(KnowledgesEntity entity) throws ParseException {
         super.setSendEscapeHtml(false);
         entity.setTitle(sanitize(entity.getTitle()));
diff --git a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
index 1714078ec..02d22b122 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/NotificationControl.java
@@ -13,7 +13,7 @@
 
 public class NotificationControl extends Control {
 
-    @Get
+    @Get(publishToken = "knowledge")
     public Boundary list() throws InvalidParamException {
         int offset = getPathInteger(0);
         boolean all = "true".equals(getAttribute("all", "false"));
@@ -39,6 +39,7 @@ public Boundary view() throws InvalidParamException {
             return sendError(HttpStatus.SC_403_FORBIDDEN, "FORBIDDEN");
         }
         NotificationLogic.get().setStatus(getLoginUserId(), no, NotificationLogic.STATUS_READED);
+        notification.setStatus(NotificationLogic.STATUS_READED);
         setAttributeOnProperty(notification);
         setAttribute("no", no);
         return forward("view.jsp");
@@ -56,6 +57,7 @@ public Boundary previous() throws InvalidParamException {
         }
         no = notification.getNo();
         NotificationLogic.get().setStatus(getLoginUserId(), no, NotificationLogic.STATUS_READED);
+        notification.setStatus(NotificationLogic.STATUS_READED);
         setAttributeOnProperty(notification);
         setAttribute("no", no);
         return forward("view.jsp");
@@ -72,12 +74,13 @@ public Boundary next() throws InvalidParamException {
         }
         no = notification.getNo();
         NotificationLogic.get().setStatus(getLoginUserId(), no, NotificationLogic.STATUS_READED);
+        notification.setStatus(NotificationLogic.STATUS_READED);
         setAttributeOnProperty(notification);
         setAttribute("no", no);
         return forward("view.jsp");
     }
 
-    @Post
+    @Post(subscribeToken = "knowledge")
     public Boundary markread() {
         String no = getAttribute("no", "");
         NotificationLogic.get().markAllAsRead(no, getLoginUserId());
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
index 2637ca3f2..a8ba89052 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
@@ -20,18 +20,23 @@
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.AuthType;
 import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.dao.TemplateItemsDao;
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.logic.EventsLogic;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.TargetLogic;
+import org.support.project.knowledge.logic.TemplateLogic;
 import org.support.project.knowledge.vo.LikeCount;
 import org.support.project.knowledge.vo.api.Knowledge;
 import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.MessageResult;
 import org.support.project.web.bean.Msg;
 import org.support.project.web.bean.NameId;
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.boundary.JsonBoundary;
 import org.support.project.web.boundary.RedirectBoundary;
 import org.support.project.web.boundary.SendMessageBoundary;
-import org.support.project.web.common.HttpStatus;
 import org.support.project.web.common.InvokeTarget;
 import org.support.project.web.dao.MailConfigsDao;
 import org.support.project.web.entity.MailConfigsEntity;
@@ -104,6 +109,62 @@ protected <T> T invoke(HttpServletRequest request, HttpServletResponse response,
         }
         return (T) result;
     }
+    
+    
+    /**
+     * 投稿
+     * @return
+     * @throws Exception
+     * @throws NoSuchFieldException
+     * @throws IllegalAccessException
+     */
+    protected MessageResult postKnowledge(String userKey, int publicFlag, int typeId, String viewers) throws Exception, NoSuchFieldException, IllegalAccessException {
+        // 登録画面へアクセスできること(パスのルーティングのみ確認）
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_add");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(userKey, request, response);
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+
+        // 保存
+        request.setServletPath("protect.knowledge/save");
+        request.setMethod("post");
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        request.addParameter("title", "タイトル");
+        request.addParameter("content", "内容");
+        request.addParameter("publicFlag", String.valueOf(publicFlag));
+        request.addParameter("typeId", String.valueOf(typeId));
+        
+        if (typeId == TemplateLogic.TYPE_ID_BOOKMARK) {
+            request.addParameter("item_" + TemplateItemsDao.ITEM_ID_BOOKMARK_URL, "https://information-supportproject.org/");
+        } else if (typeId == TemplateLogic.TYPE_ID_EVENT) {
+            request.addParameter("item_" + EventsLogic.ITEM_NO_DATE, "2017-10-01");
+            request.addParameter("item_" + EventsLogic.ITEM_NO_START, "10:00");
+            request.addParameter("item_" + EventsLogic.ITEM_NO_END, "12:00");
+            request.addParameter("item_" + EventsLogic.ITEM_NO_TIMEZONE, "Asia/Tokyo");
+            request.addParameter("item_" + EventsLogic.ITEM_NO_THE_NUMBER_TO_BE_ACCEPTED, "10");
+        }
+        
+        if (publicFlag == KnowledgeLogic.PUBLIC_FLAG_PROTECT) {
+            if (StringUtils.isNotEmpty(viewers)) {
+                request.addParameter("groups", viewers);
+            }
+        }
+        
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(200, sendObject.getCode().intValue());
+        return sendObject;
+    }        
+    
     /**
      * CP確認
      * @param userKey
@@ -386,7 +447,7 @@ protected CommentsEntity getLatestComment(String userKey, long knowledgeId) thro
      */
     protected void execNotificationQueue() throws Exception {
         List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
-        Assert.assertEquals(1, list.size());
+        Assert.assertTrue(0 < list.size());
         NotifyMailBat.main(null);
         list = NotifyQueuesDao.get().selectAll();
         Assert.assertEquals(0, list.size());
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationNotificationTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationNotificationTest.java
new file mode 100644
index 000000000..4b56d3955
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationNotificationTest.java
@@ -0,0 +1,281 @@
+package org.support.project.knowledge.integration;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.StringJoinBuilder;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.TemplateLogic;
+import org.support.project.web.boundary.ForwardBoundary;
+import org.support.project.web.boundary.JsonBoundary;
+import org.support.project.web.entity.NotificationsEntity;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+import org.support.project.web.test.stub.StubHttpServletRequest;
+import org.support.project.web.test.stub.StubHttpServletResponse;
+
+/**
+ * 
+ * @author koda
+ */
+public class IntegrationNotificationTest extends IntegrationCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(IntegrationNotificationTest.class);
+    
+    private static final String POST_USER = "integration-test-user-01";
+    private static final String READ_USER = "integration-test-user-02";
+    
+    private List<NotificationsEntity> getList(String userKey, StubHttpServletRequest request, StubHttpServletResponse response, boolean all) throws Exception {
+        request.setServletPath("protect.notification/list");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(userKey, request, response);
+        if (all) {
+            request.addParameter("all", "true");
+        }
+        
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
+        return notifications;
+    }
+    
+    /**
+     * ユーザを登録
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        addUser(POST_USER);
+        addUser(READ_USER);
+    }
+    
+    /**
+     * 「公開」の記事登録（通知の登録）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 100)
+    public void testNotification() throws Exception {
+        // 投稿
+        postKnowledge(
+                POST_USER,
+                KnowledgeLogic.PUBLIC_FLAG_PUBLIC,
+                TemplateLogic.TYPE_ID_KNOWLEDGE,
+                null);
+        // 通知
+        execNotificationQueue();
+        
+        // 通知にアクセス（List）
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        List<NotificationsEntity> notifications = getList(READ_USER, request, response, false);
+        Assert.assertEquals(1, notifications.size());
+        
+        NotificationsEntity notification = notifications.get(0);
+        Assert.assertEquals(0, notification.getStatus());
+        
+        // 通知を表示
+        request.setServletPath("protect.notification/view/" + notification.getNo());
+        ForwardBoundary boundary2 = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary2, "path"));
+        
+        Assert.assertEquals(1, request.getAttribute("status"));
+    }
+    
+
+    /**
+     * 「公開」の記事登録（通知の登録）
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 101)
+    public void testReadAll() throws Exception {
+        // 投稿
+        for (int i = 0; i < 10; i++) {
+            postKnowledge(
+                    POST_USER,
+                    KnowledgeLogic.PUBLIC_FLAG_PUBLIC,
+                    TemplateLogic.TYPE_ID_KNOWLEDGE,
+                    null);
+        }
+        // 通知
+        execNotificationQueue();
+        
+        // 通知にアクセス（List）
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        List<NotificationsEntity> notifications = getList(READ_USER, request, response, false);
+        Assert.assertEquals(10, notifications.size());
+        
+        // 全て既読へ
+        StringJoinBuilder<Long> builder = new StringJoinBuilder<>();
+        for (NotificationsEntity notificationsEntity : notifications) {
+            builder.append(notificationsEntity.getNo());
+        }
+        
+        request.setServletPath("protect.notification/markread");
+        request.setMethod("post");
+        request.addParameter("no", builder.join(","));
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        Assert.assertEquals("OK", jsonBoundary.getObj());
+        
+        // 通知にアクセス（List）
+        notifications = getList(READ_USER, request, response, false);
+        Assert.assertEquals(0, notifications.size());
+        
+        // 通知にアクセス（List）
+        notifications = getList(READ_USER, request, response, true);
+        Assert.assertEquals(11, notifications.size());
+    }
+
+    
+    /**
+     * 次へのボタンの操作
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 102)
+    public void testNext() throws Exception {
+        // 投稿
+        for (int i = 0; i < 3; i++) {
+            postKnowledge(
+                    POST_USER,
+                    KnowledgeLogic.PUBLIC_FLAG_PUBLIC,
+                    TemplateLogic.TYPE_ID_KNOWLEDGE,
+                    null);
+        }
+        // 通知
+        execNotificationQueue();
+        
+        // 通知にアクセス（List）
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        List<NotificationsEntity> notifications = getList(READ_USER, request, response, false);
+        Assert.assertEquals(3, notifications.size());
+        
+        // 通知を表示
+        NotificationsEntity notification = notifications.get(2);
+        request.setServletPath("protect.notification/view/" + notification.getNo());
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        Assert.assertEquals(1, request.getAttribute("status"));
+        Assert.assertEquals(notification.getNo(), request.getAttribute("no"));
+        
+        // Nextをクリック
+        request.setServletPath("protect.notification/next/" + notification.getNo());
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        Assert.assertEquals(1, request.getAttribute("status"));
+        notification = notifications.get(1);
+        Assert.assertEquals(notification.getNo(), request.getAttribute("no"));
+        
+        // Nextをクリック
+        request.setServletPath("protect.notification/next/" + notification.getNo());
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        Assert.assertEquals(1, request.getAttribute("status"));
+        notification = notifications.get(0);
+        Assert.assertEquals(notification.getNo(), request.getAttribute("no"));
+        
+        // Nextをクリック
+        request.setServletPath("protect.notification/next/" + notification.getNo());
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/not_found.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        // リストの先頭に戻ってNextをクリック
+        notification = notifications.get(2);
+        request.setServletPath("protect.notification/next/" + notification.getNo());
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/not_found.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        // 全てを表示のモードでNextをクリック
+        request.setServletPath("protect.notification/next/" + notification.getNo());
+        request.addParameter("all", "true");
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        Assert.assertEquals(1, request.getAttribute("status"));
+        notification = notifications.get(1);
+        Assert.assertEquals(notification.getNo(), request.getAttribute("no"));
+    }
+    
+
+    /**
+     * 前へのボタンの操作
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 103)
+    public void testPrevious() throws Exception {
+        // 投稿
+        for (int i = 0; i < 3; i++) {
+            postKnowledge(
+                    POST_USER,
+                    KnowledgeLogic.PUBLIC_FLAG_PUBLIC,
+                    TemplateLogic.TYPE_ID_KNOWLEDGE,
+                    null);
+        }
+        // 通知
+        execNotificationQueue();
+        
+        // 通知にアクセス（List）
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        List<NotificationsEntity> notifications = getList(READ_USER, request, response, false);
+        Assert.assertEquals(3, notifications.size());
+        
+        // 通知を表示
+        NotificationsEntity notification = notifications.get(0);
+        request.setServletPath("protect.notification/view/" + notification.getNo());
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        Assert.assertEquals(1, request.getAttribute("status"));
+        Assert.assertEquals(notification.getNo(), request.getAttribute("no"));
+        
+        // previousをクリック
+        request.setServletPath("protect.notification/previous/" + notification.getNo());
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        Assert.assertEquals(1, request.getAttribute("status"));
+        notification = notifications.get(1);
+        Assert.assertEquals(notification.getNo(), request.getAttribute("no"));
+        
+        // previousをクリック
+        request.setServletPath("protect.notification/previous/" + notification.getNo());
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        Assert.assertEquals(1, request.getAttribute("status"));
+        notification = notifications.get(2);
+        Assert.assertEquals(notification.getNo(), request.getAttribute("no"));
+        
+        // previousをクリック
+        request.setServletPath("protect.notification/previous/" + notification.getNo());
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/not_found.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        // リストの先頭に戻ってpreviousをクリック
+        notification = notifications.get(0);
+        request.setServletPath("protect.notification/previous/" + notification.getNo());
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/not_found.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        
+        // 全てを表示のモードでpreviousをクリック
+        request.setServletPath("protect.notification/previous/" + notification.getNo());
+        request.addParameter("all", "true");
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/notification/view.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        Assert.assertEquals(1, request.getAttribute("status"));
+        notification = notifications.get(1);
+        Assert.assertEquals(notification.getNo(), request.getAttribute("no"));
+    }
+
+
+}
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
index 73235a362..0df049c6a 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
@@ -16,7 +16,6 @@
 import org.support.project.web.bean.Msg;
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.boundary.JsonBoundary;
-import org.support.project.web.boundary.SendMessageBoundary;
 import org.support.project.web.common.HttpStatus;
 import org.support.project.web.logic.HttpRequestCheckLogic;
 import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
@@ -55,7 +54,7 @@ public void testUserInsert() throws Exception {
      */
     @Test
     @Order(order = 100)
-    public void testPostEventPublic() throws Exception {
+    public void testPostPublic() throws Exception {
         // 登録画面へアクセスできること(パスのルーティングのみ確認）
         StubHttpServletRequest request = new StubHttpServletRequest();
         StubHttpServletResponse response = new StubHttpServletResponse(request);

From 3b5e10ce650a651ee8888f90152fa768a59eae4b Mon Sep 17 00:00:00 2001
From: nyoron <nyoron.jp@live.jp>
Date: Wed, 4 Oct 2017 19:12:40 +0900
Subject: [PATCH 094/138] Fix mojibake

---
 src/main/resources/appresource.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 3d89ae6f4..64c533d5f 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -495,7 +495,7 @@ knowledge.data.label.restore.msg.danger=When you run the restore will overwrite
 knowledge.data.label.restore.msg.info=A data base of default is made the target for the data which is being managed by this page. When changing the stock destination of data by connection previous change in the data base, it isn't made the target. Please manage a backup according to the use environment by yourself in that case.
 knowledge.data.label.active=database server status
 knowledge.data.label.active.msg=You can change the operating status of the database server. And when you want to back up and restore, please stop the database before shutting down the service.
-knowledge.data.label.active.msg2=※Please refer to the stop when you shut down in the case of use in Docker.
+knowledge.data.label.active.msg2=*Please refer to the stop when you shut down in the case of use in Docker.
 knowledge.data.label.active.msg3=And I have stopped DB when Tomcat stops, but will be Docker is stopped before DB stop, it will become a state that DB could not be closed properly.
 knowledge.data.label.active.msg4=Then you may such as the value of automatic numbering of the automatic next is funny.
 knowledge.data.label.active.status=Current state

From 17bdbe7512f32fede860e3ea5b3dbdc0538d82d5 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 5 Oct 2017 06:08:51 +0900
Subject: [PATCH 095/138] Add integration test

---
 .../control/protect/GroupControl.java         |   1 -
 .../control/protect/KnowledgeControl.java     |   5 +-
 .../activity/KnowledgeAnswerActivity.java     |   4 +-
 .../activity/KnowledgeStockActivity.java      |   6 +-
 .../integration/IntegrationCommon.java        |  27 +-
 .../integration/IntegrationEventTest.java     |  18 +-
 .../IntegrationNotificationTest.java          |   1 +
 .../integration/IntegrationPostTest.java      |  17 +
 .../integration/IntegrationStockTest.java     | 398 ++++++++++++++++++
 .../integration/IntegrationSurveyTest.java    |  11 +-
 .../integration/IntegrationUpdateTest.java    |  53 ++-
 11 files changed, 526 insertions(+), 15 deletions(-)
 create mode 100644 src/test/java/org/support/project/knowledge/integration/IntegrationStockTest.java

diff --git a/src/main/java/org/support/project/knowledge/control/protect/GroupControl.java b/src/main/java/org/support/project/knowledge/control/protect/GroupControl.java
index 1708e5625..2b372511a 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/GroupControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/GroupControl.java
@@ -16,7 +16,6 @@
 import org.support.project.knowledge.logic.GroupLogic;
 import org.support.project.knowledge.vo.GroupUser;
 import org.support.project.knowledge.vo.StringList;
-import org.support.project.web.annotation.Auth;
 import org.support.project.web.bean.LabelValue;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.bean.MessageResult;
diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
index 31686311c..ca718c00c 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -487,12 +487,9 @@ public Boundary comment() throws Exception {
                 }
             }
             setAttribute("comment_files", files);
-
             return super.devolution(HttpMethod.get, "open.Knowledge/view", String.valueOf(knowledgeId));
         }
-
-        CommentsEntity commentsEntity = KnowledgeLogic.get().saveComment(knowledgeId, comment, fileNos, getLoginedUser());
-
+        KnowledgeLogic.get().saveComment(knowledgeId, comment, fileNos, getLoginedUser());
         return super.redirect(getRequest().getContextPath() + "/open.knowledge/view/" + knowledgeId + params);
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
index ad01b0bf3..773c3240c 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeAnswerActivity.java
@@ -28,8 +28,8 @@ private int getPoint() {
         }
         //int[] points = {1,1,2,2,2,2,3,3,3,4};
         //this.point = points[RandomUtil.randamNum(0, 10)]; // ランダムで値を増減してみた
-        //return point;
-        return 3;
+        this.point = 3;
+        return point;
     }
     
     @Override
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
index 7e54fe9c3..200078cb6 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeStockActivity.java
@@ -2,7 +2,6 @@
 
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
-import org.support.project.common.util.RandomUtil;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -28,8 +27,9 @@ private int getPoint() {
         if (point != 0) {
             return point;
         }
-        int[] points = {1,1,1,1,1,2,2,2,2,3};
-        this.point = points[RandomUtil.randamNum(0, 10)]; // ランダムで値を増減してみた
+//        int[] points = {1,1,1,1,1,2,2,2,2,3};
+//        this.point = points[RandomUtil.randamNum(0, 10)]; // ランダムで値を増減してみた
+        this.point = 2;
         return point;
     }
     
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
index a8ba89052..2374a1337 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
@@ -25,8 +25,8 @@
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.logic.EventsLogic;
 import org.support.project.knowledge.logic.KnowledgeLogic;
-import org.support.project.knowledge.logic.TargetLogic;
 import org.support.project.knowledge.logic.TemplateLogic;
+import org.support.project.knowledge.vo.ActivityHistory;
 import org.support.project.knowledge.vo.LikeCount;
 import org.support.project.knowledge.vo.api.Knowledge;
 import org.support.project.web.bean.LoginedUser;
@@ -95,6 +95,7 @@ public static void setUpBeforeClass() throws Exception {
      * @return
      * @throws Exception
      */
+    @SuppressWarnings("unchecked")
     protected <T> T invoke(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) throws Exception {
         InvokeTarget invoke = CallControlLogic.get().searchInvokeTarget(request, response);
         if (invoke == null) {
@@ -232,6 +233,7 @@ protected void assertNotificationCount(String userKey, int add) throws Exception
      * @return
      * @throws Exception
      */
+    @SuppressWarnings("unchecked")
     protected List<NotificationsEntity> getNotification(String userKey) throws Exception {
         StubHttpServletRequest request = new StubHttpServletRequest();
         StubHttpServletResponse response = new StubHttpServletResponse(request);
@@ -400,6 +402,7 @@ protected void addLatestLikeComment(String userKey, long knowledgeId) throws Exc
      * @param comment
      * @throws Exception
      */
+    @SuppressWarnings("unchecked")
     protected void comment(String userKey, long knowledgeId, String comment) throws Exception {
         if (userKey == null) {
             Assert.fail("post comment must be logined");
@@ -433,6 +436,7 @@ protected void comment(String userKey, long knowledgeId, String comment) throws
      * @return
      * @throws Exception
      */
+    @SuppressWarnings("unchecked")
     protected CommentsEntity getLatestComment(String userKey, long knowledgeId) throws Exception {
         StubHttpServletRequest request = openKnowledge(userKey, knowledgeId);
         List<CommentsEntity> comments = (List<CommentsEntity>) request.getAttribute("comments");
@@ -541,6 +545,7 @@ protected void knowledgeDeleteOnAPI(String userKey, long knowledgeId) throws Exc
      * @return
      * @throws Exception
      */
+    @SuppressWarnings("unchecked")
     protected Knowledge knowledgeGetOnAPI(String userKey, int count) throws Exception {
         StubHttpServletRequest request = new StubHttpServletRequest();
         StubHttpServletResponse response = new StubHttpServletResponse(request);
@@ -576,6 +581,24 @@ protected Knowledge knowledgeGetOnAPI(String userKey, int count) throws Exceptio
         return null;
     }
     
-    
+    /**
+     * CPの獲得履歴の件数確認
+     * @param userKey
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    protected void assertPointHistoryCount(String userKey, int count) throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(userKey, request, response);
+        
+        LoginedUser user = getLoginUser(userKey);
+        request.setServletPath("open.account/activity/" + user.getUserId());
+        request.setMethod("get");
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        List<ActivityHistory> list = (List<ActivityHistory>) jsonBoundary.getObj();
+        Assert.assertEquals(count, list.size());
+    }
 
 }
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationEventTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationEventTest.java
index 14a7184cb..6bad318ab 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationEventTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationEventTest.java
@@ -117,6 +117,7 @@ public void testAssertAfterPost() throws Exception {
     public void testJoinByJoinUser() throws Exception {
         StubHttpServletRequest request = openKnowledges(JOIN_USER);
         StubHttpServletResponse response = new StubHttpServletResponse(request);
+        @SuppressWarnings("unchecked")
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         long knowledgeId = knowledges.get(0).getKnowledgeId();
         request = openKnowledge(JOIN_USER, knowledgeId);
@@ -153,6 +154,7 @@ public void testAssertAfterJoinbyJoinUser() throws Exception {
     public void testReaveByJoinUser() throws Exception {
         StubHttpServletRequest request = openKnowledges(JOIN_USER);
         StubHttpServletResponse response = new StubHttpServletResponse(request);
+        @SuppressWarnings("unchecked")
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         long knowledgeId = knowledges.get(0).getKnowledgeId();
         request = openKnowledge(JOIN_USER, knowledgeId);
@@ -190,6 +192,7 @@ public void testAssertAfterReavebyJoinUser() throws Exception {
     public void testReJoinByJoinUser() throws Exception {
         StubHttpServletRequest request = openKnowledges(JOIN_USER);
         StubHttpServletResponse response = new StubHttpServletResponse(request);
+        @SuppressWarnings("unchecked")
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         long knowledgeId = knowledges.get(0).getKnowledgeId();
         request = openKnowledge(JOIN_USER, knowledgeId);
@@ -226,6 +229,7 @@ public void testAssertAfterReJoinbyJoinUser() throws Exception {
     public void testJoinByPostUser() throws Exception {
         StubHttpServletRequest request = openKnowledges(POST_USER);
         StubHttpServletResponse response = new StubHttpServletResponse(request);
+        @SuppressWarnings("unchecked")
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         long knowledgeId = knowledges.get(0).getKnowledgeId();
         request = openKnowledge(POST_USER, knowledgeId);
@@ -252,5 +256,17 @@ public void testAssertAfterJoinbyPostUser() throws Exception {
         assertNotificationCount(POST_USER, 2);
         assertNotificationCount(JOIN_USER, 0);
     }
-
+    
+    
+    
+    /**
+     * CP獲得履歴
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 600)
+    public void testActivityHistory() throws Exception {
+        assertPointHistoryCount(POST_USER, 4);
+        assertPointHistoryCount(JOIN_USER, 2);
+    }
 }
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationNotificationTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationNotificationTest.java
index 4b56d3955..3fd9297ff 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationNotificationTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationNotificationTest.java
@@ -41,6 +41,7 @@ private List<NotificationsEntity> getList(String userKey, StubHttpServletRequest
         ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
         Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
         
+        @SuppressWarnings("unchecked")
         List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
         return notifications;
     }
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
index e93f68c88..c39e628c3 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
@@ -57,6 +57,7 @@ public void testUserInsert() throws Exception {
     @Order(order = 2)
     public void testAccessListByNoLoginUser() throws Exception {
         StubHttpServletRequest request = openKnowledges(null);
+        @SuppressWarnings("unchecked")
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(0, knowledges.size());
@@ -71,6 +72,7 @@ public void testAccessListByNoLoginUser() throws Exception {
     @Order(order = 3)
     public void testAccessListByLoginedUser() throws Exception {
         StubHttpServletRequest request = openKnowledges(COMMENT_POST_USER);
+        @SuppressWarnings("unchecked")
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(0, knowledges.size());
@@ -93,6 +95,7 @@ public void testInitNotificationByLoginedUser() throws Exception {
         ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
         Assert.assertEquals("/WEB-INF/views/protect/notification/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
         
+        @SuppressWarnings("unchecked")
         List<NotificationsEntity> notifications = (List<NotificationsEntity>) request.getAttribute("notifications");
         Assert.assertNotNull(notifications);
         Assert.assertEquals(0, notifications.size());
@@ -177,6 +180,7 @@ public void testCPAfterPost() throws Exception {
     public void testAccessListByNoLoginUser2() throws Exception {
         // 一覧表示画面を開き、
         StubHttpServletRequest request = openKnowledges(null);
+        @SuppressWarnings("unchecked")
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(1, knowledges.size());
@@ -201,6 +205,7 @@ public void testAccessListByNoLoginUser2() throws Exception {
     public void testAccessListByLoginedUser2() throws Exception {
         // 一覧表示画面を開き、
         StubHttpServletRequest request = openKnowledges(COMMENT_POST_USER);
+        @SuppressWarnings("unchecked")
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(1, knowledges.size());
@@ -237,6 +242,7 @@ public void testCPAfterRead() throws Exception {
     public void testReAccessListByLoginedUser2() throws Exception {
         // 一覧表示画面を開き、
         StubHttpServletRequest request = openKnowledges(COMMENT_POST_USER);
+        @SuppressWarnings("unchecked")
         List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
         Assert.assertNotNull(knowledges);
         Assert.assertEquals(1, knowledges.size());
@@ -447,6 +453,7 @@ public void testReLikeByLoginUser1() throws Exception {
      * コメント登録者でコメント登録
      * @throws Exception
      */
+    @SuppressWarnings("unchecked")
     @Test
     @Order(order = 400)
     public void testPostCommentByLoginUser1() throws Exception {
@@ -648,5 +655,15 @@ public void testLikeCommentByNotLoginToKnowledgeUser() throws Exception {
         assertNotificationCount(KNOWLEDGE_POST_USER, 1);
     }
     
+    /**
+     * CP獲得履歴
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 600)
+    public void testActivityHistory() throws Exception {
+        assertPointHistoryCount(KNOWLEDGE_POST_USER, 9);
+        assertPointHistoryCount(COMMENT_POST_USER, 6);
+    }
 
 }
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationStockTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationStockTest.java
new file mode 100644
index 000000000..2d88bfce5
--- /dev/null
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationStockTest.java
@@ -0,0 +1,398 @@
+package org.support.project.knowledge.integration;
+
+import java.io.ByteArrayInputStream;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.test.Order;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.entity.StockKnowledgesEntity;
+import org.support.project.knowledge.entity.StocksEntity;
+import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.TemplateLogic;
+import org.support.project.knowledge.vo.Stock;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.boundary.ForwardBoundary;
+import org.support.project.web.boundary.JsonBoundary;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+import org.support.project.web.test.stub.StubHttpServletRequest;
+import org.support.project.web.test.stub.StubHttpServletResponse;
+
+
+/**
+ * 
+ * @author koda
+ */
+public class IntegrationStockTest extends IntegrationCommon {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(IntegrationStockTest.class);
+    
+    private static final String POST_USER = "integration-test-user-01";
+    private static final String STOCK_USER = "integration-test-user-02";
+    
+    private static long knowledgeId;
+    private static long stockId;
+    
+    /**
+     * ユーザを登録
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1)
+    public void testUserInsert() throws Exception {
+        LOG.info("ユーザ登録");
+        addUser(POST_USER);
+        addUser(STOCK_USER);
+    }
+    
+    /**
+     * 記事登録
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 100)
+    public void testPost() throws Exception {
+        MessageResult msg = postKnowledge(
+                POST_USER,
+                KnowledgeLogic.PUBLIC_FLAG_PUBLIC,
+                TemplateLogic.TYPE_ID_KNOWLEDGE,
+                null);
+
+        knowledgeId = new Long(msg.getResult());
+        
+        assertKnowledgeCP(POST_USER, knowledgeId, 50);
+        assertKnowledgeCP(STOCK_USER, knowledgeId, 1);
+        assertCP(POST_USER, 51);
+        assertCP(STOCK_USER, 1);
+        execNotificationQueue();
+        assertNotificationCount(POST_USER, 1);
+        assertNotificationCount(STOCK_USER, 1);
+    }
+    
+    /**
+     * ストックが無いことを確認
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    @Order(order = 101)
+    public void testCheckListEmpty() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(STOCK_USER, request, response);
+        
+        // ストック一覧は無い
+        request.setServletPath("protect.stock/mylist");
+        request.setMethod("get");
+        ForwardBoundary forwardBoundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/stock/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, forwardBoundary, "path"));
+        List<StocksEntity> stocks = (List<StocksEntity>) request.getAttribute("stocks");
+        Assert.assertEquals(0, stocks.size());
+    }
+    
+    
+    /**
+     * ストックを作成
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    @Order(order = 200)
+    public void testCreateStock() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(STOCK_USER, request, response);
+        
+        // Stock一覧を取得
+        request.setServletPath("protect.stock/chooselist");
+        request.setMethod("get");
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        List<Stock> stocks = (List<Stock>) jsonBoundary.getObj();
+        Assert.assertEquals(0, stocks.size());
+        
+        // Stock登録画面を表示
+        request.setServletPath("protect.stock/add");
+        request.setMethod("get");
+        ForwardBoundary forwardBoundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/stock/add.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, forwardBoundary, "path"));
+        
+        // Stock登録
+        request = new StubHttpServletRequest(request);
+        response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.stock/insert");
+        request.setMethod("post");
+        request.addParameter("stockName", "Stock");
+        forwardBoundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/stock/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, forwardBoundary, "path"));
+        
+        // 一覧再取得
+        request.setServletPath("protect.stock/chooselist");
+        request.setMethod("get");
+        jsonBoundary = invoke(request, response, JsonBoundary.class);
+        stocks = (List<Stock>) jsonBoundary.getObj();
+        Assert.assertEquals(1, stocks.size());
+        stockId = stocks.get(0).getStockId();
+    }
+    
+    /**
+     * ストックに何も登録していないことを確認
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    @Order(order = 201)
+    public void testCheckStockEmpty() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(STOCK_USER, request, response);
+        
+        // ストック一覧は無い
+        request.setServletPath("protect.stock/knowledge");
+        request.setMethod("get");
+        request.setAttribute("stockId", String.valueOf(stockId));
+        request.setAttribute("offset", "0");
+        ForwardBoundary forwardBoundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/stock/knowledge.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, forwardBoundary, "path"));
+        List<StockKnowledgesEntity> knowledges = (List<StockKnowledgesEntity>) request.getAttribute("knowledges");
+        Assert.assertEquals(0, knowledges.size());
+    }
+    
+    
+    /**
+     * ストックに入れる
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    @Order(order = 300)
+    public void testStock() throws Exception {
+        // 記事を開く
+        StubHttpServletRequest request = openKnowledge(STOCK_USER, knowledgeId);
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        
+        // Stockの一覧を取得
+        request = new StubHttpServletRequest(request);
+        response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.stock/chooselist");
+        request.setMethod("get");
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        List<Stock> stocks = (List<Stock>) jsonBoundary.getObj();
+        Assert.assertEquals(1, stocks.size());
+        
+        // 記事をStock
+        request.setServletPath("protect.knowledge/stock/" + knowledgeId);
+        request.setMethod("Post");
+        String json = "[{\"description\":\"\",\"stockId\":"
+                + stocks.get(0).getStockId()
+                + ",\"stockName\":\"Stock\",\"stockType\":0,\"stocked\":true}]";
+        request.setInputstream(new ByteArrayInputStream(json.getBytes()));
+        jsonBoundary = invoke(request, response, JsonBoundary.class);
+        LOG.info(jsonBoundary.getObj());
+    }
+    
+    /**
+     * ストックに入ったことを確認
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    @Order(order = 301)
+    public void testCheckStockStored() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(STOCK_USER, request, response);
+        
+        // ストック一覧は無い
+        request.setServletPath("protect.stock/knowledge");
+        request.setMethod("get");
+        request.setAttribute("stockId", String.valueOf(stockId));
+        request.setAttribute("offset", "0");
+        ForwardBoundary forwardBoundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/stock/knowledge.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, forwardBoundary, "path"));
+        List<StockKnowledgesEntity> knowledges = (List<StockKnowledgesEntity>) request.getAttribute("knowledges");
+        Assert.assertEquals(1, knowledges.size());
+    }
+    
+    
+    /**
+     * ストック後の状態確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 302)
+    public void testAssertAfterStock() throws Exception {
+        assertKnowledgeCP(POST_USER, knowledgeId, 2);
+        assertCP(POST_USER, 2);
+        assertCP(STOCK_USER, 0);
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        Assert.assertEquals(0, list.size());
+        assertNotificationCount(POST_USER, 0);
+        assertNotificationCount(STOCK_USER, 0);
+    }
+    
+
+    
+    /**
+     * ストックから外す
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    @Order(order = 400)
+    public void testRemoveStock() throws Exception {
+        // 記事を開く
+        StubHttpServletRequest request = openKnowledge(STOCK_USER, knowledgeId);
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        
+        // Stockの一覧を取得
+        request = new StubHttpServletRequest(request);
+        response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.stock/chooselist");
+        request.setMethod("get");
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        List<Stock> stocks = (List<Stock>) jsonBoundary.getObj();
+        Assert.assertEquals(1, stocks.size());
+        
+        // 記事をStock
+        request.setServletPath("protect.knowledge/stock/" + knowledgeId);
+        request.setMethod("Post");
+        String json = "[{\"description\":\"\",\"stockId\":"
+                + stocks.get(0).getStockId()
+                + ",\"stockName\":\"Stock\",\"stockType\":0,\"stocked\":false}]";
+        request.setInputstream(new ByteArrayInputStream(json.getBytes()));
+        jsonBoundary = invoke(request, response, JsonBoundary.class);
+        LOG.info(jsonBoundary.getObj());
+    }   
+    
+    /**
+     * ストックに入ったことを確認
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    @Order(order = 401)
+    public void testCheckStockRemoved() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(STOCK_USER, request, response);
+        
+        // ストック一覧は無い
+        request.setServletPath("protect.stock/knowledge");
+        request.setMethod("get");
+        request.setAttribute("stockId", String.valueOf(stockId));
+        request.setAttribute("offset", "0");
+        ForwardBoundary forwardBoundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/stock/knowledge.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, forwardBoundary, "path"));
+        List<StockKnowledgesEntity> knowledges = (List<StockKnowledgesEntity>) request.getAttribute("knowledges");
+        Assert.assertEquals(0, knowledges.size());
+    }
+    
+    /**
+     * ストックから削除後の状態確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 402)
+    public void testAssertAfterRemove() throws Exception {
+        assertKnowledgeCP(POST_USER, knowledgeId, 0);
+        assertCP(POST_USER, 0);
+        assertCP(STOCK_USER, 0);
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        Assert.assertEquals(0, list.size());
+        assertNotificationCount(POST_USER, 0);
+        assertNotificationCount(STOCK_USER, 0);
+    }
+    
+    /**
+     * ストックを更新
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    @Order(order = 500)
+    public void testUpdateStock() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(STOCK_USER, request, response);
+        
+        // Stock登録画面を表示
+        request.setServletPath("protect.stock/edit/" + stockId);
+        request.setMethod("get");
+        ForwardBoundary forwardBoundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/stock/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, forwardBoundary, "path"));
+        
+        // Stock更新
+        request = new StubHttpServletRequest(request);
+        response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.stock/update");
+        request.setMethod("post");
+        request.addParameter("stockId", String.valueOf(stockId));
+        request.addParameter("stockName", "StockUpdate");
+        forwardBoundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/stock/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, forwardBoundary, "path"));
+        
+        // 一覧再取得
+        request.setServletPath("protect.stock/chooselist");
+        request.setMethod("get");
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        List<Stock> stocks = (List<Stock>) jsonBoundary.getObj();
+        Assert.assertEquals(1, stocks.size());
+    }
+    
+    /**
+     * ストックを更新
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    @Order(order = 600)
+    public void testDeleteStock() throws Exception {
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(STOCK_USER, request, response);
+        
+        // Stock登録画面を表示
+        request.setServletPath("protect.stock/edit/" + stockId);
+        request.setMethod("get");
+        ForwardBoundary forwardBoundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/stock/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, forwardBoundary, "path"));
+        
+        // Stock更新
+        request = new StubHttpServletRequest(request);
+        response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.stock/delete");
+        request.setMethod("post");
+        request.addParameter("stockId", String.valueOf(stockId));
+        request.addParameter("stockName", "StockUpdate");
+        forwardBoundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/stock/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, forwardBoundary, "path"));
+        List<StocksEntity> stocks = (List<StocksEntity>) request.getAttribute("stocks");
+        Assert.assertEquals(0, stocks.size());
+    }
+
+    
+    /**
+     * CP獲得履歴
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 700)
+    public void testActivityHistory() throws Exception {
+        assertPointHistoryCount(POST_USER, 3);
+        assertPointHistoryCount(STOCK_USER, 1);
+    }
+    
+}
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
index 0df049c6a..da132f391 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
@@ -204,6 +204,15 @@ public void testAssertAfterAnswer() throws Exception {
         assertNotificationCount(ANSWER_USER, 0);
     }
 
-    
+    /**
+     * CP獲得履歴
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 600)
+    public void testActivityHistory() throws Exception {
+        assertPointHistoryCount(POST_USER, 3);
+        assertPointHistoryCount(ANSWER_USER, 2);
+    }
     
 }
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationUpdateTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationUpdateTest.java
index 53972a8f9..ebe2656e5 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationUpdateTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationUpdateTest.java
@@ -9,6 +9,7 @@
 import org.support.project.common.test.Order;
 import org.support.project.common.util.PropertyUtil;
 import org.support.project.knowledge.dao.NotifyQueuesDao;
+import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.knowledge.logic.TemplateLogic;
@@ -41,7 +42,7 @@ private void doUpdate(int publicflag, boolean updateContent) throws Exception {
         // 編集画面を開く
         StubHttpServletRequest request = new StubHttpServletRequest();
         StubHttpServletResponse response = new StubHttpServletResponse(request);
-        request.setServletPath("protect.knowledge/view_add");
+        request.setServletPath("protect.knowledge/view_edit/" + knowledgeId);
         request.setMethod("get");
         DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
         auth.setSession(POST_USER, request, response);
@@ -51,6 +52,8 @@ private void doUpdate(int publicflag, boolean updateContent) throws Exception {
         Assert.assertNotNull(csrfToken);
 
         // 保存
+        request = new StubHttpServletRequest(request);
+        response = new StubHttpServletResponse(request);
         request.setServletPath("protect.knowledge/save");
         request.setMethod("post");
         request.addParameter("knowledgeId", String.valueOf(1));
@@ -273,4 +276,52 @@ public void testAssertAfterUpdateNotNotify() throws Exception {
         assertNotificationCount(POST_USER, 0);
         assertNotificationCount(USER1, 0);
     }
+    
+    
+    /**
+     * 記事を削除
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 900)
+    public void testDelete() throws Exception {
+        // 編集画面を開く
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_edit/" + knowledgeId);
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+
+        // 削除
+        request = new StubHttpServletRequest(request);
+        response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/delete");
+        request.setMethod("post");
+        request.addParameter("knowledgeId", String.valueOf(1));
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/open/knowledge/list.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        @SuppressWarnings("unchecked")
+        List<KnowledgesEntity> knowledges = (List<KnowledgesEntity>) request.getAttribute("knowledges");
+        Assert.assertNotNull(knowledges);
+        Assert.assertEquals(0, knowledges.size());
+    }
+    
+    
+    /**
+     * CP獲得履歴
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 1000)
+    public void testActivityHistory() throws Exception {
+        assertPointHistoryCount(POST_USER, 6);
+        assertPointHistoryCount(USER1, 1);
+    }
+    
 }

From ad0cc00ff135d2c63867c269a13b1f82873f5f48 Mon Sep 17 00:00:00 2001
From: nyoronjp <nyoron.web.service+github@outlook.com>
Date: Thu, 5 Oct 2017 13:22:21 +0900
Subject: [PATCH 096/138] Fix mojibake

---
 src/main/resources/appresource.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 64c533d5f..d12f13d76 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -377,7 +377,7 @@ knowledge.withdrawal.label.name=Removed User
 knowledge.registration.result.title=Registration Result
 knowledge.registration.msg.wait=I accept the registration. <br/> use the start of the service, has become necessary to confirm the administrator. Please wait until the confirmation of <br/> administrator.
 knowledge.registration.msg.mail=The invitation to the service I was sent. from the <br/> received mail, you will be able to log in and complete the user registration. <br/>
-knowledge.registration.msg.mail.info=※ Note: Depending on the mailer, you may e-mail invitation will enter the junk e-mail. Please make sure that you are not reaching as junk e-mail.
+knowledge.registration.msg.mail.info=*Note: Depending on the mailer, you may e-mail invitation will enter the junk e-mail. Please make sure that you are not reaching as junk e-mail.
 
 knowledge.config.title=User registration method specified
 knowledge.config.label.registration.method=The choice of procedure of user registration

From 58a8cd8e903466474fb2201810d04b21c079c260 Mon Sep 17 00:00:00 2001
From: nyoronjp <nyoron.web.service+github@outlook.com>
Date: Thu, 5 Oct 2017 13:25:43 +0900
Subject: [PATCH 097/138] Improve message

---
 src/main/resources/appresource.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index d12f13d76..c26405df5 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -346,7 +346,7 @@ knowledge.account.title=My Account
 knowledge.account.label.icon.drop=
 knowledge.account.label.icon.select=Select icon
 knowledge.account.label.password.msg=(input to change password)
-knowledge.account.delete=Thank you for your use
+knowledge.account.delete=Thank you for using
 knowledge.account.change.email=Change E-mail
 knowledge.account.changekey.title=Change E-mail
 knowledge.account.label.email=Mail address after change (A mail for change confirmation is sent to the address of the designation.)

From ce273aca98bd57f6de628ac531a2344217b115eb Mon Sep 17 00:00:00 2001
From: nyoronjp <nyoron.web.service+github@outlook.com>
Date: Thu, 5 Oct 2017 16:17:37 +0900
Subject: [PATCH 098/138] Fix typo

---
 src/main/resources/appresource.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index c26405df5..0ff78a07e 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -788,7 +788,7 @@ knowledge.draft.list.empty=Empty List
 knowledge.draft.list.empty.title=Empty Title
 knowledge.draft.view.msg.not.editor=You are not editor this knowledge. because other knowledge editor clear your role on editors.
 
-knowledge.custom.service.title=Service custmize
+knowledge.custom.service.title=Service customize
 knowledge.custom.service.label.title=Label of service
 knowledge.custom.service.label.icon=Icon
 knowledge.custom.service.label.custom.html=Change a html of top page.  (advanced options)

From 65158bc7dad115b005dea027d64e5fa134fe2b26 Mon Sep 17 00:00:00 2001
From: nyoronjp <nyoron.web.service+github@outlook.com>
Date: Thu, 5 Oct 2017 17:33:37 +0900
Subject: [PATCH 099/138] Fix typo at label name

---
 src/main/resources/appresource.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 0ff78a07e..808ea9c6c 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -645,8 +645,8 @@ knowledge.ldap.msg.connect.success2=connect success.
 knowledge.ldap.msg.save.error=Can not be saved because the connection can not be confirmed. LDAP configuration, or connection confirmation ID / password is incorrect.
 knowledge.ldap.msg.save.success=Saved.
 knowledge.ldap.confirm.delete=Delete. is it OK?
-knowledge.ldao.msg.config1=This config is deplicated.<br/>Please use the Ldap Config2.
-knowledge.ldao.msg.config2=The Ldap is the setting that you can log in with a user in the subtree.<br/>Ldap Config1 can not log in the subtree of the user.
+knowledge.ldap.msg.config1=This config is deplicated.<br/>Please use the Ldap Config2.
+knowledge.ldap.msg.config2=The Ldap is the setting that you can log in with a user in the subtree.<br/>Ldap Config1 can not log in the subtree of the user.
 knowledge.ldap.label.config2.binddn=Bind DN
 knowledge.ldap.label.config2.password=Password
 knowledge.ldap.label.config2.basedn=BaseDN

From ea81d51636e43d329c0568b74450890e9f02191f Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 5 Oct 2017 22:47:36 +0900
Subject: [PATCH 100/138] #882 Remove unescape html process

---
 src/main/webapp/js/common.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/js/common.js b/src/main/webapp/js/common.js
index 925488e43..d7a757868 100644
--- a/src/main/webapp/js/common.js
+++ b/src/main/webapp/js/common.js
@@ -104,13 +104,8 @@ function isString(obj) {
 };
 
 function unescapeHTML(str) {
-    var div = document.createElement("div");
-    div.innerHTML = str.replace(/</g,"&lt;")
-                       .replace(/>/g,"&gt;")
-                       .replace(/ /g, "&nbsp;")
-                       .replace(/\r/g, "&#13;")
-                       .replace(/\n/g, "&#10;");
-    return div.textContent || div.innerText;
+    // エスケープしない
+    return str;
 };
 
 function escapeLink(url) {

From 535224d376c3ef6f4cfd134dd75853dc186aa801 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sat, 7 Oct 2017 19:56:17 +0900
Subject: [PATCH 101/138] Add feature to debug for mail send

---
 .dockerignore                                 |   9 ++
 .gitignore                                    |   1 +
 Dockerfile                                    |  71 ++++++++++
 README.md                                     |   3 +
 docker-compose.yml                            |  25 ++++
 mvn-entrypoint.sh                             |  39 +++++
 package.json                                  |  17 ++-
 pom.xml                                       | 133 ++++++++++--------
 settings-docker.xml                           |   6 +
 .../project/knowledge/bat/MailSendBat.java    |   2 +
 .../project/knowledge/logic/MailLogic.java    |  59 ++++----
 .../knowledge/dao/AccountImagesDaoTest.java   |  19 +--
 .../integration/IntegrationCommon.java        |  22 ++-
 13 files changed, 294 insertions(+), 112 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml
 create mode 100755 mvn-entrypoint.sh
 create mode 100755 settings-docker.xml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..3ae32116b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+.dockerignore
+Dockerfile
+docker-compose.yml
+
+.git/
+.gitignore/
+
+target/
+
diff --git a/.gitignore b/.gitignore
index c965ba72d..10c382125 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ target
 .checkstyle
 node
 .idea
+.m2
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..5f9bf8ba9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,71 @@
+FROM node:8.6-alpine
+
+# Default to UTF-8 file.encoding
+ENV LANG C.UTF-8
+
+# install git
+RUN apk update && apk upgrade && \
+    apk add --no-cache bash git openssh
+
+# install jdk
+RUN { \
+        echo '#!/bin/sh'; \
+        echo 'set -e'; \
+        echo; \
+        echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
+    } > /usr/local/bin/docker-java-home \
+    && chmod +x /usr/local/bin/docker-java-home
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
+
+ENV JAVA_VERSION 8u131
+ENV JAVA_ALPINE_VERSION 8.131.11-r2
+
+RUN set -x \
+    && apk add --no-cache \
+        openjdk8="$JAVA_ALPINE_VERSION" \
+    && [ "$JAVA_HOME" = "$(docker-java-home)" ]
+
+# install maven
+RUN apk add --no-cache curl tar bash
+
+ARG MAVEN_VERSION=3.5.0
+ARG USER_HOME_DIR="/root"
+ARG SHA=beb91419245395bd69a4a6edad5ca3ec1a8b64e41457672dc687c173a495f034
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
+  && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+  && echo "${SHA}  /tmp/apache-maven.tar.gz" | sha256sum -c - \
+  && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \
+  && rm -f /tmp/apache-maven.tar.gz \
+  && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY settings-docker.xml /usr/share/maven/ref/
+
+VOLUME "$USER_HOME_DIR/.m2"
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
+
+# RUN knowledge tool install
+RUN npm install -g bower
+RUN npm install -g gulp
+
+COPY package.json /usr/src/mymaven/
+COPY bower.json /usr/src/mymaven/
+COPY .bowerrc /usr/src/mymaven/
+
+WORKDIR /usr/src/mymaven
+
+RUN npm install
+RUN bower install --allow-root
+
+
+#### RUN on docker-compose 
+# docker-compose build dev
+# docker-compose run --rm dev mvn clean test
diff --git a/README.md b/README.md
index 19ea962db..8ff2be162 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,9 @@
 ## About
 - Free Knowledge Management System
 
+**日本語での質問は、以下のサイトに登録してください(海外からのアクセスが多くなったため)**
+**For questions in Japanese, please register below**
+- https://service-knowledge.support-project.org/
 
 ## Live Demo
 - [https://test-knowledge.support-project.org](https://test-knowledge.support-project.org)
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..23286514e
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,25 @@
+version: '2.1'
+
+services:
+  dev:
+    image: knowledge-maven
+    build:
+      context: .
+      args:
+        - https_proxy
+        - http_proxy
+    links:
+        - mailcatcher
+    environment:
+      KNOWLEDGE_TEST_MAIL: 'false'
+    volumes:
+      - $PWD:/usr/src/mymaven
+      - $PWD/.m2:/root/.m2
+      
+  mailcatcher:
+    image: "zolweb/docker-mailcatcher"
+    ports:
+      - "1025:1025"
+      - "1080:1080"
+    expose:
+      - "1080"
diff --git a/mvn-entrypoint.sh b/mvn-entrypoint.sh
new file mode 100755
index 000000000..b80c27886
--- /dev/null
+++ b/mvn-entrypoint.sh
@@ -0,0 +1,39 @@
+#! /bin/bash -eu
+
+set -o pipefail
+
+# Copy files from /usr/share/maven/ref into ${MAVEN_CONFIG}
+# So the initial ~/.m2 is set with expected content.
+# Don't override, as this is just a reference setup
+copy_reference_file() {
+  local root="${1}"
+  local f="${2%/}"
+  local logfile="${3}"
+  local rel="${f/${root}/}" # path relative to /usr/share/maven/ref/
+  echo "$f" >> "$logfile"
+  echo " $f -> $rel" >> "$logfile"
+  if [[ ! -e ${MAVEN_CONFIG}/${rel} || $f = *.override ]]
+  then
+    echo "copy $rel to ${MAVEN_CONFIG}" >> "$logfile"
+    mkdir -p "${MAVEN_CONFIG}/$(dirname "${rel}")"
+    cp -r "${f}" "${MAVEN_CONFIG}/${rel}";
+  fi;
+}
+
+copy_reference_files() {
+  local log="$MAVEN_CONFIG/copy_reference_file.log"
+
+  if (touch "${log}" > /dev/null 2>&1)
+  then
+      echo "--- Copying files at $(date)" >> "$log"
+      find /usr/share/maven/ref/ -type f -exec bash -eu -c 'copy_reference_file /usr/share/maven/ref/ "$1" "$2"' _ {} "$log" \;
+  else
+    echo "Can not write to ${log}. Wrong volume permissions? Carrying on ..."
+  fi
+}
+
+export -f copy_reference_file
+copy_reference_files
+unset MAVEN_CONFIG
+
+exec "$@"
diff --git a/package.json b/package.json
index 582d9e6cb..b62efa4e9 100644
--- a/package.json
+++ b/package.json
@@ -7,15 +7,14 @@
     "url": "https://github.com/support-project/knowledge"
   },
   "dependencies": {
-    "bower": "^1.8.0",
-    "gulp": "^3.9.1",
-    "gulp-usemin": "^0.3.26",
-    "gulp-uglify": "^0.3.1",
-    "gulp-minify-html": "^0.1.4",
-    "gulp-minify-css": "^0.3.7",
-    "gulp-rev": "^7.1.2",
-    "gulp-replace": "^0.5.4",
-    "npm": "^3.10.9"
+    "bower": "1.8.2",
+    "gulp": "3.9.1",
+    "gulp-usemin": "0.3.28",
+    "gulp-uglify": "0.3.2",
+    "gulp-minify-html": "0.1.8",
+    "gulp-minify-css": "0.3.13",
+    "gulp-rev": "7.1.2",
+    "gulp-replace": "0.5.4"
   },
   "devDependencies": {},
   "scripts": {
diff --git a/pom.xml b/pom.xml
index 6fb35819b..9bab93063 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,38 +194,47 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <!-- jspはminify後のものを使うので除外 -->
-                    <warSourceExcludes>
-                        WEB-INF/views/**/*.jsp,bower/**/*
-                    </warSourceExcludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.3</version>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.9</version>
                 <executions>
                     <execution>
-                        <phase>package</phase>
-                        <goals><goal>copy</goal></goals>
+                        <id>default-prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-report</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-check</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.github.jsimone</groupId>
-                                    <artifactId>webapp-runner</artifactId>
-                                    <version>8.0.33.4</version>
-                                    <destFileName>webapp-runner.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
+                            <rules>
+                                <rule implementation="org.jacoco.maven.RuleConfiguration">
+                                    <element>BUNDLE</element>
+                                    <limits>
+                                        <limit implementation="org.jacoco.report.check.Limit">
+                                            <counter>COMPLEXITY</counter>
+                                            <value>COVEREDRATIO</value>
+                                            <minimum>0.01</minimum>
+                                        </limit>
+                                    </limits>
+                                </rule>
+                            </rules>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            
+            <!-- Comment out because this is not work in docker. Please install node.js and bower, gulp separately. 
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
@@ -246,6 +255,7 @@
                         <goals>
                             <goal>npm</goal>
                         </goals>
+                        <phase>generate-sources</phase>
                         <configuration>
                             <arguments>install</arguments>
                         </configuration>
@@ -255,13 +265,14 @@
                         <goals>
                             <goal>bower</goal>
                         </goals>
+                        <phase>generate-sources</phase>
                         <configuration>
                             <arguments>install</arguments>
                         </configuration>
                     </execution>
                     <execution>
                         <id>gulp</id>
-                        <phase>prepare-package</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>gulp</goal>
                         </goals>
@@ -271,48 +282,60 @@
                     </execution>
                 </executions>
             </plugin>
-            
+            -->
             <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.9</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>default-prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-report</id>
+                        <id>gulp</id>
                         <phase>prepare-package</phase>
+                        <configuration>
+                            <executable>gulp</executable>
+                            <arguments>
+                                <argument>default</argument>
+                            </arguments>
+                        </configuration>
                         <goals>
-                            <goal>report</goal>
+                            <goal>exec</goal>
                         </goals>
                     </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <!-- jspはminify後のものを使うので除外 -->
+                    <warSourceExcludes>
+                        WEB-INF/views/**/*.jsp,bower/**/*
+                    </warSourceExcludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.3</version>
+                <executions>
                     <execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
+                        <phase>package</phase>
+                        <goals><goal>copy</goal></goals>
                         <configuration>
-                            <rules>
-                                <rule implementation="org.jacoco.maven.RuleConfiguration">
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit implementation="org.jacoco.report.check.Limit">
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.01</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.github.jsimone</groupId>
+                                    <artifactId>webapp-runner</artifactId>
+                                    <version>8.0.33.4</version>
+                                    <destFileName>webapp-runner.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            
+
         </plugins>
     </build>
 
diff --git a/settings-docker.xml b/settings-docker.xml
new file mode 100755
index 000000000..586c587c1
--- /dev/null
+++ b/settings-docker.xml
@@ -0,0 +1,6 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <localRepository>/usr/share/maven/ref/repository</localRepository>
+</settings>
diff --git a/src/main/java/org/support/project/knowledge/bat/MailSendBat.java b/src/main/java/org/support/project/knowledge/bat/MailSendBat.java
index 3aa05dedb..1ee75575a 100644
--- a/src/main/java/org/support/project/knowledge/bat/MailSendBat.java
+++ b/src/main/java/org/support/project/knowledge/bat/MailSendBat.java
@@ -13,6 +13,7 @@
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.knowledge.logic.MailLogic;
+import org.support.project.web.dao.MailsDao;
 
 /**
  * メールの送信処理は、時間がかかるため、バッチ処理の中で処理する
@@ -54,6 +55,7 @@ public static void main(String[] args) throws Exception {
     public void start() throws UnsupportedEncodingException, MessagingException, InvalidKeyException, NoSuchAlgorithmException,
             NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException {
         MailLogic.get().startSendMails();
+        MailsDao.get().physicalDeleteOnOldData();
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/MailLogic.java b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
index 52b1d0bcf..d4c04488b 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
@@ -5,7 +5,6 @@
 import java.io.UnsupportedEncodingException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
@@ -169,31 +168,8 @@ public void startSendMails() throws InvalidKeyException, NoSuchAlgorithmExceptio
         Session session = getSession(mailConfigsEntity);
         int count = 0;
         for (MailsEntity mailsEntity : entities) {
-            if (mailsEntity.getToAddress().matches(MAIL_FORMAT)) {
-                try {
-                    MailLogic.get().mailSend(session, mailConfigsEntity, mailsEntity);
-                    // ステータス更新
-                    // mailsEntity.setStatus(MAIL_STATUS_SENDED);
-                    // MailsDao.get().save(mailsEntity);
-                    // 送信処理が終われば、物理削除
-                    dao.physicalDelete(mailsEntity);
-                } catch (Exception e) {
-                    LOG.error("mail send error", e);
-                    //メール送信失敗（3回リトライする）
-                    int status = MAIL_STATUS_UNSENT;
-                    if (mailsEntity.getStatus() != null) {
-                        status = mailsEntity.getStatus();
-                    }
-                    status++;
-                    mailsEntity.setStatus(status);
-                    MailsDao.get().save(mailsEntity);
-                }
-            } else {
-                mailsEntity.setStatus(MAIL_STATUS_FORMAT_ERROR);
-                dao.save(mailsEntity);
-            }
+            startSendMail(session, mailConfigsEntity, mailsEntity);
             count++;
-            
             // 一気に大量に送信しようとするとエラーになることがあるため、少し待機
             synchronized (this) {
                 try {
@@ -205,6 +181,39 @@ public void startSendMails() throws InvalidKeyException, NoSuchAlgorithmExceptio
         }
         LOG.info("MAIL sended. count: " + count);
     }
+    /**
+     * 1件のメールを送信
+     * @param mailConfigsEntity
+     * @param dao
+     * @param session
+     * @param mailsEntity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void startSendMail(Session session, MailConfigsEntity mailConfigsEntity, MailsEntity mailsEntity) {
+        if (mailsEntity.getToAddress().matches(MAIL_FORMAT)) {
+            try {
+                MailLogic.get().mailSend(session, mailConfigsEntity, mailsEntity);
+                // ステータス更新
+                mailsEntity.setStatus(MAIL_STATUS_SENDED);
+                MailsDao.get().save(mailsEntity);
+                // 送信処理が終われば削除
+                MailsDao.get().delete(mailsEntity);
+            } catch (Exception e) {
+                LOG.error("mail send error", e);
+                //メール送信失敗（3回リトライする）
+                int status = MAIL_STATUS_UNSENT;
+                if (mailsEntity.getStatus() != null) {
+                    status = mailsEntity.getStatus();
+                }
+                status++;
+                mailsEntity.setStatus(status);
+                MailsDao.get().save(mailsEntity);
+            }
+        } else {
+            mailsEntity.setStatus(MAIL_STATUS_FORMAT_ERROR);
+            MailsDao.get().save(mailsEntity);
+        }
+    }
     
     /**
      * メール送信のセッションを取得
diff --git a/src/test/java/org/support/project/knowledge/dao/AccountImagesDaoTest.java b/src/test/java/org/support/project/knowledge/dao/AccountImagesDaoTest.java
index c85091b56..208c5be12 100644
--- a/src/test/java/org/support/project/knowledge/dao/AccountImagesDaoTest.java
+++ b/src/test/java/org/support/project/knowledge/dao/AccountImagesDaoTest.java
@@ -6,30 +6,13 @@
 import java.io.IOException;
 
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
-import org.support.project.common.logic.H2DBServerLogic;
 import org.support.project.common.util.RandomUtil;
 import org.support.project.knowledge.TestCommon;
-import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.entity.AccountImagesEntity;
 
-public class AccountImagesDaoTest {
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        AppConfig.initEnvKey(TestCommon.KNOWLEDGE_TEST_HOME);
-        if (!H2DBServerLogic.get().isActive()) {
-            H2DBServerLogic.get().start();
-        }
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-//        H2DBServerLogic.get().stop();
-    }
+public class AccountImagesDaoTest extends TestCommon {
 
     @Before
     public void setUp() throws Exception {
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
index 2374a1337..a36570a9b 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationCommon.java
@@ -15,7 +15,9 @@
 import org.support.project.common.util.FileUtil;
 import org.support.project.common.util.PropertyUtil;
 import org.support.project.common.util.StringUtils;
+import org.support.project.common.util.SystemUtils;
 import org.support.project.knowledge.TestCommon;
+import org.support.project.knowledge.bat.MailSendBat;
 import org.support.project.knowledge.bat.NotifyMailBat;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.AuthType;
@@ -52,6 +54,7 @@ public abstract class IntegrationCommon extends TestCommon {
     private static final Log LOG = LogFactory.getLog(IntegrationCommon.class);
     
     private static boolean isInitCallControlLogic = false;
+    private static boolean isMailSend = false;
     
     private static Map<String, Long> userPointMap = new HashMap<>();
     private static Map<Long, Long> knowledgePointMap = new HashMap<>();
@@ -73,11 +76,6 @@ public static void setUpBeforeClass() throws Exception {
         knowledgeLikeMap = new HashMap<>();
         commentLikeMap = new HashMap<>();
         
-        MailConfigsEntity mailConfig = new MailConfigsEntity(AppConfig.get().getSystemName());
-        mailConfig.setHost("example.com");
-        mailConfig.setPort(25);
-        mailConfig.setAuthType(AuthType.None.getValue());
-        MailConfigsDao.get().insert(mailConfig); // メール送信設定
 
         if (!isInitCallControlLogic) {
             String controlPackage = "org.support.project.knowledge.control,org.support.project.web.control";
@@ -86,6 +84,17 @@ public static void setUpBeforeClass() throws Exception {
             CallControlLogic.get().init(controlPackage, classSuffix, true, ignoreRegularExpression);
             isInitCallControlLogic = true;
         }
+        
+        MailConfigsEntity mailConfig = new MailConfigsEntity(AppConfig.get().getSystemName());
+        mailConfig.setHost("localhost");
+        mailConfig.setPort(1025);
+        mailConfig.setAuthType(AuthType.None.getValue());
+        MailConfigsDao.get().insert(mailConfig); // メール送信設定
+        String testMailSend = SystemUtils.getenv("KNOWLEDGE_TEST_MAIL");
+        if (StringUtils.isNotEmpty(testMailSend) && testMailSend.toLowerCase().equals("true")) {
+            // テスト用のメールサーバーが存在するので送信まで実施する
+            isMailSend = true;
+        }
     }
     /**
      * コントローラーを呼び出し
@@ -455,6 +464,9 @@ protected void execNotificationQueue() throws Exception {
         NotifyMailBat.main(null);
         list = NotifyQueuesDao.get().selectAll();
         Assert.assertEquals(0, list.size());
+        if (isMailSend) {
+            MailSendBat.main(null);
+        }
     }
     
     /**

From 4ebdcc41eddc11ac2415e52e422f043971e8db5c Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sat, 7 Oct 2017 20:07:56 +0900
Subject: [PATCH 102/138] Chage ci setting

---
 .travis.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d03d18c3c..508f05045 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,18 @@
+sudo: required
+
 language: java
-jdk: oraclejdk8
-  
-install: mvn install -DskipTests=true
-script: mvn test site
+
+services:
+  - docker
+
+env:
+  - DOCKER_COMPOSE_VERSION=1.4.2
+
+before_install:
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
+
+script: docker-compose run --rm dev mvn clean
 

From d0c98674697a8be10ccd44bb2e44e1d4ff38bb79 Mon Sep 17 00:00:00 2001
From: nyoron <nyoron.jp@live.jp>
Date: Sat, 7 Oct 2017 22:27:44 +0900
Subject: [PATCH 103/138] Add  'for' attribute to label tag

---
 src/main/webapp/WEB-INF/views/admin/webhook/config.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/admin/webhook/config.jsp b/src/main/webapp/WEB-INF/views/admin/webhook/config.jsp
index 336378d81..8d7fb913a 100644
--- a/src/main/webapp/WEB-INF/views/admin/webhook/config.jsp
+++ b/src/main/webapp/WEB-INF/views/admin/webhook/config.jsp
@@ -60,14 +60,14 @@ function testConfig(hookId) {
 			<div>
 				<input type="checkbox" class="pull-left" name="hooks[]" id="knowledges" value="knowledges" checked/>
 				<div class="prepend-left-20">
-					<label class="list-label"><strong><%= jspUtil.label("knowledge.webhook.event.knowledge.title") %></strong></label>
+					<label for="knowledges" class="list-label"><strong><%= jspUtil.label("knowledge.webhook.event.knowledge.title") %></strong></label>
 					<p class="light"><%= jspUtil.label("knowledge.webhook.event.knowledge.description") %></p>
 				</div>
 			</div>
 			<div>
 				<input type="checkbox" class="pull-left" name="hooks[]" id="comments" value="comments" />
 				<div class="prepend-left-20">
-					<label class="list-label"><strong><%= jspUtil.label("knowledge.webhook.event.comment.title") %></strong></label>
+					<label for="comments" class="list-label"><strong><%= jspUtil.label("knowledge.webhook.event.comment.title") %></strong></label>
 					<p class="light"><%= jspUtil.label("knowledge.webhook.event.comment.description") %></p>
 				</div>
 			</div>

From c5e94d213765258007acc2c3b93e3542a0119320 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 8 Oct 2017 03:41:38 +0900
Subject: [PATCH 104/138] Chage ci setting

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 508f05045..30d078001 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 sudo: required
 
-language: java
-
 services:
   - docker
 

From 6ad0627d794b7accb88ac39a6186331c29198bbb Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 8 Oct 2017 03:48:54 +0900
Subject: [PATCH 105/138] Chage ci setting

---
 .travis.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 30d078001..8bcd91ab2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,15 @@ services:
   - docker
 
 env:
-  - DOCKER_COMPOSE_VERSION=1.4.2
+  DOCKER_COMPOSE_VERSION: 1.8.0
 
 before_install:
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
+    - sudo apt-get update
+    - sudo apt-get -y -q -o Dpkg::Options::="--force-confnew" install docker-engine
+    - sudo rm /usr/local/bin/docker-compose
+    - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+    - chmod +x docker-compose
+    - sudo mv docker-compose /usr/local/bin
 
 script: docker-compose run --rm dev mvn clean
 

From f52c7f60882cded8d9022ab00b8f431d48ba3e3a Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 8 Oct 2017 03:55:18 +0900
Subject: [PATCH 106/138] Chage ci setting

---
 .travis.yml | 23 +++++------------------
 pom.xml     |  6 +++---
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8bcd91ab2..13d1988ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,5 @@
-sudo: required
-
-services:
-  - docker
-
-env:
-  DOCKER_COMPOSE_VERSION: 1.8.0
-
-before_install:
-    - sudo apt-get update
-    - sudo apt-get -y -q -o Dpkg::Options::="--force-confnew" install docker-engine
-    - sudo rm /usr/local/bin/docker-compose
-    - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-    - chmod +x docker-compose
-    - sudo mv docker-compose /usr/local/bin
-
-script: docker-compose run --rm dev mvn clean
-
+language: java
+jdk: oraclejdk8
+  
+install: mvn install -DskipTests=true
+script: mvn test site
diff --git a/pom.xml b/pom.xml
index 9bab93063..c095850ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,7 +234,6 @@
                 </executions>
             </plugin>
             
-            <!-- Comment out because this is not work in docker. Please install node.js and bower, gulp separately. 
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
@@ -267,7 +266,7 @@
                         </goals>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <arguments>install</arguments>
+                            <arguments>install --allow-root</arguments>
                         </configuration>
                     </execution>
                     <execution>
@@ -282,7 +281,7 @@
                     </execution>
                 </executions>
             </plugin>
-            -->
+            <!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -302,6 +301,7 @@
                     </execution>
                 </executions>
             </plugin>
+            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>

From 04e08dab03434bed4f570c8e2ddcf072901ad84a Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 8 Oct 2017 04:01:54 +0900
Subject: [PATCH 107/138] Revert "Chage ci setting"

This reverts commit f52c7f60882cded8d9022ab00b8f431d48ba3e3a.
---
 .travis.yml | 23 ++++++++++++++++++-----
 pom.xml     |  6 +++---
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 13d1988ae..8bcd91ab2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,18 @@
-language: java
-jdk: oraclejdk8
-  
-install: mvn install -DskipTests=true
-script: mvn test site
+sudo: required
+
+services:
+  - docker
+
+env:
+  DOCKER_COMPOSE_VERSION: 1.8.0
+
+before_install:
+    - sudo apt-get update
+    - sudo apt-get -y -q -o Dpkg::Options::="--force-confnew" install docker-engine
+    - sudo rm /usr/local/bin/docker-compose
+    - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+    - chmod +x docker-compose
+    - sudo mv docker-compose /usr/local/bin
+
+script: docker-compose run --rm dev mvn clean
+
diff --git a/pom.xml b/pom.xml
index c095850ef..9bab93063 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,6 +234,7 @@
                 </executions>
             </plugin>
             
+            <!-- Comment out because this is not work in docker. Please install node.js and bower, gulp separately. 
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
@@ -266,7 +267,7 @@
                         </goals>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <arguments>install --allow-root</arguments>
+                            <arguments>install</arguments>
                         </configuration>
                     </execution>
                     <execution>
@@ -281,7 +282,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--
+            -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -301,7 +302,6 @@
                     </execution>
                 </executions>
             </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>

From 13b4bf2004e50ca364f9cf6dc00f3a252b418c74 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 8 Oct 2017 04:04:10 +0900
Subject: [PATCH 108/138] Chage ci setting

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8bcd91ab2..b0a348c48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ services:
   - docker
 
 env:
-  DOCKER_COMPOSE_VERSION: 1.8.0
+  DOCKER_COMPOSE_VERSION: 1.14.0
 
 before_install:
     - sudo apt-get update
@@ -13,6 +13,8 @@ before_install:
     - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
     - chmod +x docker-compose
     - sudo mv docker-compose /usr/local/bin
+    - docker -v
+    - docker-compose -v
 
 script: docker-compose run --rm dev mvn clean
 

From 1c195b65c2b070785bafdb983a5ae302e4bb151d Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 8 Oct 2017 04:08:08 +0900
Subject: [PATCH 109/138] Chage ci setting

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b0a348c48..d4c0ad6c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,6 @@ env:
   DOCKER_COMPOSE_VERSION: 1.14.0
 
 before_install:
-    - sudo apt-get update
-    - sudo apt-get -y -q -o Dpkg::Options::="--force-confnew" install docker-engine
-    - sudo rm /usr/local/bin/docker-compose
-    - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-    - chmod +x docker-compose
-    - sudo mv docker-compose /usr/local/bin
     - docker -v
     - docker-compose -v
 

From 9ab0070925c84a1b1abcfc685d8f6588e080cd7d Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 8 Oct 2017 04:13:18 +0900
Subject: [PATCH 110/138] Chage ci setting

---
 .travis.yml | 5 +----
 pom.xml     | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d4c0ad6c7..20ae945b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,9 @@ sudo: required
 services:
   - docker
 
-env:
-  DOCKER_COMPOSE_VERSION: 1.14.0
-
 before_install:
     - docker -v
     - docker-compose -v
 
-script: docker-compose run --rm dev mvn clean
+script: docker-compose run --rm dev mvn clean test
 
diff --git a/pom.xml b/pom.xml
index 9bab93063..9f5e4b928 100644
--- a/pom.xml
+++ b/pom.xml
@@ -308,7 +308,6 @@
                 <version>2.6</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <!-- jspはminify後のものを使うので除外 -->
                     <warSourceExcludes>
                         WEB-INF/views/**/*.jsp,bower/**/*
                     </warSourceExcludes>

From 7d06903b65a42d70ed0c2153e1dc02fbe54e6270 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 8 Oct 2017 04:26:12 +0900
Subject: [PATCH 111/138] Fix test

---
 .../project/knowledge/searcher/SearchTest.java       |  1 -
 .../test/control/open/KnowledgeControlTest.java      | 12 +-----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/test/java/org/support/project/knowledge/searcher/SearchTest.java b/src/test/java/org/support/project/knowledge/searcher/SearchTest.java
index c892e2d0c..888de717f 100644
--- a/src/test/java/org/support/project/knowledge/searcher/SearchTest.java
+++ b/src/test/java/org/support/project/knowledge/searcher/SearchTest.java
@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
-import java.util.Date;
 import java.util.List;
 
 import org.junit.After;
diff --git a/src/test/java/org/support/project/knowledge/test/control/open/KnowledgeControlTest.java b/src/test/java/org/support/project/knowledge/test/control/open/KnowledgeControlTest.java
index 76181d818..b394e1210 100644
--- a/src/test/java/org/support/project/knowledge/test/control/open/KnowledgeControlTest.java
+++ b/src/test/java/org/support/project/knowledge/test/control/open/KnowledgeControlTest.java
@@ -7,27 +7,17 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.support.project.common.exception.ParseException;
 import org.support.project.common.test.Order;
-import org.support.project.common.test.TestCase;
 import org.support.project.knowledge.TestCommon;
-import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.control.open.KnowledgeControl;
 import org.support.project.web.exception.InvalidParamException;
 import org.support.project.web.test.stub.ControlContainer;
 import org.support.project.web.test.stub.StubCookie;
 
-public class KnowledgeControlTest extends TestCase {
+public class KnowledgeControlTest extends TestCommon {
     private ControlContainer container;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        AppConfig.initEnvKey(TestCommon.KNOWLEDGE_TEST_HOME);
-        TestCase.setUpBeforeClass();
-    }
-    
     
     
     @Before

From 8bcb03601f84dc14d131a49d81396c2a1e622b11 Mon Sep 17 00:00:00 2001
From: nyoron <nyoron.jp@live.jp>
Date: Sun, 8 Oct 2017 20:07:26 +0900
Subject: [PATCH 112/138] Fix the problem where don't work JavaScript when
 delete a user on Englich mode

---
 src/main/resources/appresource.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 808ea9c6c..8a38cf21f 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -362,7 +362,7 @@ knowledge.account.info.ldap=This user is Ldap user. so you can update role only.
 knowledge.account.info.ldap2=You are Ldap user. so you can update role only.
 knowledge.account.targets=Default Targets
 knowledge.account.targets.select=Choose your default viewer target.
-knowledge.account.delete.confirm=Are you sure you want to delete?<br/>And this account's knowldge will delete?
+knowledge.account.delete.confirm=Are you sure you want to delete?<br/>And this account&apos;s knowldge will delete?<br/>
 knowledge.account.delete.knowledge.keep=Keep
 knowledge.account.delete.knowledge.remove=Remove All
 

From 65d6eaaf6a3be0b9811d41c33b9a7024de1a58d8 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 9 Oct 2017 07:46:45 +0900
Subject: [PATCH 113/138] Change project config

---
 README.md                                     | 16 ++++-----------
 pom.xml                                       | 20 +++++++++++++++++++
 .../knowledge/logic/MailEventLogicTest.java   |  2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 8ff2be162..3dfb099e3 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,11 @@
 
 ## About
 - Free Knowledge Management System
+- [landing page and Online manual](https://information-knowledge.support-project.org/)
 
-**日本語での質問は、以下のサイトに登録してください(海外からのアクセスが多くなったため)**
-**For questions in Japanese, please register below**
+## Support
+- **日本語での質問は、以下のサイトに登録してください(海外からのアクセスが多くなったため)**
+- **For questions in Japanese, please register below**
 - https://service-knowledge.support-project.org/
 
 ## Live Demo
@@ -26,13 +28,3 @@
 ## How to initial set up
 - Please show the [wiki page](https://github.com/support-project/knowledge/wiki)
 
-
-## Project website (more info)
-- [landing page and Online manual](https://information-knowledge.support-project.org/)
-
-
-
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 9f5e4b928..102761664 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,6 +287,26 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
                 <executions>
+                    <execution>
+                        <id>npm</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bower</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <executable>bower</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>gulp</id>
                         <phase>prepare-package</phase>
diff --git a/src/test/java/org/support/project/knowledge/logic/MailEventLogicTest.java b/src/test/java/org/support/project/knowledge/logic/MailEventLogicTest.java
index a976e1028..9479e9c5a 100644
--- a/src/test/java/org/support/project/knowledge/logic/MailEventLogicTest.java
+++ b/src/test/java/org/support/project/knowledge/logic/MailEventLogicTest.java
@@ -179,7 +179,7 @@ public void testNotifyEvents2() throws Exception {
         
         TimeZone timezone = TimeZone.getTimeZone("GMT");
         Calendar now = Calendar.getInstance(timezone);
-        now.add(Calendar.MINUTE, 180);
+        now.add(Calendar.DATE, 20);
         
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         DateFormat timeFormat = new SimpleDateFormat("HH:mm");

From 91a88eecd3461b8868cd4322fef9db42894aafde Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 2 Oct 2017 20:57:34 +0900
Subject: [PATCH 114/138] #877 Add table  what store notification status to
 database

---
 document/database/A5M2_knowledge.pdf          | Bin 76362 -> 78994 bytes
 document/database/knowledge.a5er              | 413 ++++++++------
 .../dao/MailHookIgnoreConditionsDao.java      |  27 +
 .../knowledge/dao/NotificationStatusDao.java  |  27 +
 .../knowledge/dao/gen/DatabaseControlDao.java | 140 ++---
 .../gen/GenMailHookIgnoreConditionsDao.java   | 510 ++++++++++++++++++
 .../dao/gen/GenNotificationStatusDao.java     | 507 +++++++++++++++++
 .../MailHookIgnoreConditionsEntity.java       |  51 ++
 .../entity/NotificationStatusEntity.java      |  51 ++
 .../GenMailHookIgnoreConditionsEntity.java    | 453 ++++++++++++++++
 .../gen/GenNotificationStatusEntity.java      | 404 ++++++++++++++
 .../notification/LikeInsertNotification.java  |   5 +
 .../MailHookIgnoreConditionsDao_delete.sql    |   6 +
 .../MailHookIgnoreConditionsDao_insert.sql    |  24 +
 ...gnoreConditionsDao_physical_select_all.sql |   2 +
 ...ionsDao_physical_select_all_with_pager.sql |   3 +
 ...onsDao_physical_select_on_condition_no.sql |   4 +
 ...nditionsDao_physical_select_on_hook_id.sql |   4 +
 ...physical_select_on_ignore_condition_no.sql |   4 +
 ...reConditionsDao_physical_select_on_key.sql |   6 +
 ...MailHookIgnoreConditionsDao_raw_insert.sql |  24 +
 ...MailHookIgnoreConditionsDao_select_all.sql |   3 +
 ...oreConditionsDao_select_all_with_pager.sql |   4 +
 ...okIgnoreConditionsDao_select_count_all.sql |   2 +
 ...reConditionsDao_select_on_condition_no.sql |   4 +
 ...kIgnoreConditionsDao_select_on_hook_id.sql |   4 +
 ...tionsDao_select_on_ignore_condition_no.sql |   4 +
 ...lHookIgnoreConditionsDao_select_on_key.sql |   6 +
 .../MailHookIgnoreConditionsDao_update.sql    |  14 +
 .../NotificationStatusDao_delete.sql          |   6 +
 .../NotificationStatusDao_insert.sql          |  22 +
 ...ificationStatusDao_physical_select_all.sql |   2 +
 ...atusDao_physical_select_all_with_pager.sql |   3 +
 ...icationStatusDao_physical_select_on_id.sql |   4 +
 ...cationStatusDao_physical_select_on_key.sql |   6 +
 ...StatusDao_physical_select_on_target_id.sql |   4 +
 ...ationStatusDao_physical_select_on_type.sql |   4 +
 ...ationStatusDao_physical_select_on_user.sql |   4 +
 ...onStatusDao_physical_select_on_user_id.sql |   4 +
 .../NotificationStatusDao_raw_insert.sql      |  22 +
 .../NotificationStatusDao_select_all.sql      |   3 +
 ...icationStatusDao_select_all_with_pager.sql |   4 +
 ...NotificationStatusDao_select_count_all.sql |   2 +
 .../NotificationStatusDao_select_on_id.sql    |   4 +
 .../NotificationStatusDao_select_on_key.sql   |   6 +
 ...ificationStatusDao_select_on_target_id.sql |   4 +
 .../NotificationStatusDao_select_on_type.sql  |   4 +
 .../NotificationStatusDao_select_on_user.sql  |   4 +
 ...otificationStatusDao_select_on_user_id.sql |   4 +
 .../NotificationStatusDao_update.sql          |  13 +
 .../project/knowledge/database/ddl.sql        |  56 ++
 .../integration/IntegrationPostTest.java      |   2 +-
 52 files changed, 2654 insertions(+), 239 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/dao/MailHookIgnoreConditionsDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/NotificationStatusDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/gen/GenMailHookIgnoreConditionsDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/dao/gen/GenNotificationStatusDao.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/MailHookIgnoreConditionsEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/NotificationStatusEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/gen/GenMailHookIgnoreConditionsEntity.java
 create mode 100644 src/main/java/org/support/project/knowledge/entity/gen/GenNotificationStatusEntity.java
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_delete.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_condition_no.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_hook_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_ignore_condition_no.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_raw_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_count_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_condition_no.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_hook_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_ignore_condition_no.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_update.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_delete.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_target_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_type.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_user.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_user_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_raw_insert.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_all_with_pager.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_count_all.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_key.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_target_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_type.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_user.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_user_id.sql
 create mode 100644 src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_update.sql

diff --git a/document/database/A5M2_knowledge.pdf b/document/database/A5M2_knowledge.pdf
index ac92566ced4c9390d7f6670b37b835e6357b89fc..70de5485b75b6b40182b8d12589e2327d692d776 100755
GIT binary patch
delta 59871
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

delta 57204
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
C9;zh(

diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
index 0f9b3befd..603346399 100755
--- a/document/database/knowledge.a5er
+++ b/document/database/knowledge.a5er
@@ -46,6 +46,79 @@ SqlSeparator=0
 ShowTag=1
 ShowCommonAttributes=0
 
+[Entity]
+PName=NOTIFICATION_STATUS
+LName=いいねの通知状態
+Comment=
+TableOption=
+Page=MAIN
+Left=2000
+Top=1450
+Field="種類","TYPE","@INT","NOT NULL",0,"","",$FFFFFFFF,""
+Field="ターゲットのID","TARGET_ID","bigint","NOT NULL",1,"","",$FFFFFFFF,""
+Field="登録者","USER_ID","@INT","NOT NULL",2,"","",$FFFFFFFF,""
+Field="通知の状態","STATUS","@INT",,,"","",$FFFFFFFF,""
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20171002133707
+Position="MAIN",2000,1450
+
+[Relation]
+Entity1=MAIL_HOOK_CONDITIONS
+Entity2=MAIL_HOOK_IGNORE_CONDITIONS
+RelationType1=2
+RelationType2=3
+Fields1=HOOK_ID,CONDITION_NO
+Fields2=HOOK_ID,CONDITION_NO
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,4923,4436,4098,R,R
+Dependence=1
+Caption=
+PName=
+LineMode=0
+Bar1=492
+Bar2=444
+Bar3=410
+TermPos1=R
+TermPos2=R
+
+[Entity]
+PName=MAIL_HOOK_IGNORE_CONDITIONS
+LName=メールから投稿の際の除外条件
+Comment=
+TableOption=
+Page=MAIN
+Left=3400
+Top=2500
+Field="HOOK_ID","HOOK_ID","INTEGER","NOT NULL",0,"","",$FFFFFFFF,""
+Field="CONDITION_NO","CONDITION_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
+Field="IGNORE_CONDITION_NO","IGNORE_CONDITION_NO","@INT","NOT NULL",2,"","",$FFFFFFFF,""
+Field="条件の種類","CONDITION_KIND","@INT","NOT NULL",,"","1:宛先が「条件文字」であった場合",$FFFFFFFF,""
+Field="条件の文字","CONDITION","@VARCHAR(256)",,,"","",$FFFFFFFF,""
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20170929133334
+Position="MAIN",3400,2500
+
+[Comment]
+Comment=TODO 初期値追加
+FontName=Tahoma
+FontBold=0
+FontItalic=0
+FontUnderline=0
+FontSize=5
+FontColor=$000000
+LineColor=$000000
+BkColor=$FFFFFF
+Page=Main
+Left=1900
+Top=850
+Width=209
+Height=50
+
 [Relation]
 Entity1=ACTIVITIES
 Entity2=POINT_USER_HISTORIES
@@ -139,7 +212,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,2911,5347,6275,R,R
+Position="MAIN",0,2911,5347,7802,R,R
 Dependence=0
 Caption=
 PName=
@@ -147,7 +220,7 @@ ModifiedDateTime=20170831112209
 LineMode=0
 Bar1=291
 Bar2=535
-Bar3=628
+Bar3=780
 TermPos1=R
 TermPos2=R
 
@@ -182,7 +255,7 @@ Fields1=NO
 Fields2=NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4598,5968,5747,R,R
+Position="MAIN",0,4598,5968,5732,R,R
 Dependence=1
 Caption=
 PName=
@@ -190,7 +263,7 @@ ModifiedDateTime=20170829163644
 LineMode=0
 Bar1=460
 Bar2=597
-Bar3=575
+Bar3=573
 TermPos1=R
 TermPos2=R
 
@@ -303,7 +376,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=2900
-Top=550
+Top=450
 Field="番号","NO","SERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="名称","NAME","@VARCHAR(128)","NOT NULL",,"","",$FFFFFFFF,""
 Field="表示名","DISPLAY_TEXT","@VARCHAR(32)","NOT NULL",,"","",$FFFFFFFF,""
@@ -314,7 +387,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170831113107
-Position="MAIN",2900,550
+Position="MAIN",2900,450
 
 [Relation]
 Entity1=COMMENTS
@@ -342,7 +415,7 @@ LName=コメントのイイネ
 Comment=
 TableOption=
 Page=MAIN
-Left=1600
+Left=1500
 Top=1450
 Field="NO","NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="コメント番号","COMMENT_NO","bigint","NOT NULL",,"","",$FFFFFFFF,""
@@ -352,7 +425,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170809123907
-Position="MAIN",1600,1450
+Position="MAIN",1500,1450
 
 [Entity]
 PName=TOKENS
@@ -360,8 +433,8 @@ LName=認証トークン
 Comment=
 TableOption=
 Page=MAIN
-Left=3050
-Top=900
+Left=3600
+Top=300
 Field="TOKEN","TOKEN","@VARCHAR(128)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ユーザID","USER_ID","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="有効期限","EXPIRES","@DATETIME","NOT NULL",,"","",$FFFFFFFF,""
@@ -370,7 +443,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170620125822
-Position="MAIN",3050,900
+Position="MAIN",3600,300
 
 [Relation]
 Entity1=MAIL_HOOKS
@@ -381,14 +454,14 @@ Fields1=HOOK_ID
 Fields2=HOOK_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,1836,5081,4896,R,R
+Position="MAIN",0,4930,5081,4887,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
-Bar1=184
+Bar1=493
 Bar2=508
-Bar3=490
+Bar3=489
 TermPos1=R
 TermPos2=R
 
@@ -398,8 +471,8 @@ LName=メール受信設定
 Comment=
 TableOption=
 Page=MAIN
-Left=2950
-Top=50
+Left=3400
+Top=1600
 Field="HOOK_ID","HOOK_ID","INTEGER","NOT NULL",0,"","",$FFFFFFFF,""
 Field="PROPERTY_KEY","PROPERTY_KEY","@VARCHAR(128)","NOT NULL",1,"","",$FFFFFFFF,""
 Field="PROPERTY_VALUE","PROPERTY_VALUE","@VARCHAR(256)",,,"","",$FFFFFFFF,""
@@ -407,7 +480,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170616214751
-Position="MAIN",2950,50
+Position="MAIN",3400,1600
 
 [Relation]
 Entity1=LOCALES
@@ -418,14 +491,14 @@ Fields1=KEY
 Fields2=KEY
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,5226,5024,4720,R,R
+Position="MAIN",0,6268,5024,4481,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
-Bar1=523
+Bar1=627
 Bar2=502
-Bar3=472
+Bar3=448
 TermPos1=R
 TermPos2=R
 
@@ -438,14 +511,14 @@ Fields1=TEMPLATE_ID
 Fields2=TEMPLATE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4464,5489,4842,R,R
+Position="MAIN",0,4464,5489,3348,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
 Bar1=446
 Bar2=549
-Bar3=484
+Bar3=335
 TermPos1=R
 TermPos2=R
 
@@ -455,8 +528,8 @@ LName=ロケール毎のメールテンプレート
 Comment=
 TableOption=
 Page=MAIN
-Left=3600
-Top=300
+Left=2950
+Top=100
 Field="テンプレートID","TEMPLATE_ID","@VARCHAR(32)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="キー","KEY","@VARCHAR(12)","NOT NULL",1,"","",$FFFFFFFF,""
 Field=" タイトル","TITLE","text","NOT NULL",,"","",$FFFFFFFF,""
@@ -465,7 +538,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170228163618
-Position="MAIN",3600,300
+Position="MAIN",2950,100
 
 [Entity]
 PName=LOCALES
@@ -495,8 +568,8 @@ LName=メールテンプレート
 Comment=
 TableOption=
 Page=MAIN
-Left=2950
-Top=200
+Left=2250
+Top=100
 Field="テンプレートID","TEMPLATE_ID","@VARCHAR(32)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="テンプレートタイトル","TEMPLATE_TITLE","@VARCHAR(128)","NOT NULL",,"","",$FFFFFFFF,""
 Field="説明文","DESCRIPTION","text",,,"","",$FFFFFFFF,""
@@ -504,7 +577,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170301131519
-Position="MAIN",2950,200
+Position="MAIN",2250,100
 
 [Relation]
 Entity1=SURVEY_ANSWERS
@@ -515,15 +588,15 @@ Fields1=KNOWLEDGE_ID,ANSWER_ID
 Fields2=KNOWLEDGE_ID,ANSWER_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,5908,4092,2954,R,R
+Position="MAIN",0,7787,4092,1607,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20170220204743
 LineMode=0
-Bar1=591
+Bar1=779
 Bar2=409
-Bar3=295
+Bar3=161
 TermPos1=R
 TermPos2=R
 
@@ -536,15 +609,15 @@ Fields1=KNOWLEDGE_ID
 Fields2=ITEM_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4194,5115,6199,R,R
+Position="MAIN",0,4774,5115,5968,R,R
 Dependence=0
 Caption=
 PName=
 ModifiedDateTime=20170220204434
 LineMode=0
-Bar1=419
+Bar1=477
 Bar2=512
-Bar3=620
+Bar3=597
 TermPos1=R
 TermPos2=R
 
@@ -554,8 +627,8 @@ LName=アンケートの回答の値
 Comment=
 TableOption=
 Page=MAIN
-Left=2450
-Top=1800
+Left=1800
+Top=2400
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="回答ID","ANSWER_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",2,"","",$FFFFFFFF,""
@@ -564,7 +637,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170222220138
-Position="MAIN",2450,1800
+Position="MAIN",1800,2400
 
 [Relation]
 Entity1=SURVEYS
@@ -575,14 +648,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4662,4335,5353,R,R
+Position="MAIN",0,4662,4335,6993,R,R
 Dependence=0
 Caption=
 PName=
 LineMode=0
 Bar1=466
 Bar2=434
-Bar3=535
+Bar3=699
 TermPos1=R
 TermPos2=R
 
@@ -592,15 +665,15 @@ LName=アンケートの回答
 Comment=
 TableOption=
 Page=MAIN
-Left=1950
-Top=1800
+Left=1550
+Top=2100
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="回答ID","ANSWER_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170222215330
-Position="MAIN",1950,1800
+Position="MAIN",1550,2100
 
 [Relation]
 Entity1=SURVEY_ITEMS
@@ -611,7 +684,7 @@ Fields1=KNOWLEDGE_ID,ITEM_NO
 Fields2=KNOWLEDGE_ID,ITEM_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4139,4896,5178,R,R
+Position="MAIN",0,4139,4896,3096,R,R
 Dependence=1
 Caption=
 PName=
@@ -619,7 +692,7 @@ ModifiedDateTime=20170220203851
 LineMode=0
 Bar1=414
 Bar2=490
-Bar3=518
+Bar3=310
 TermPos1=R
 TermPos2=R
 
@@ -629,8 +702,8 @@ LName=アンケートの選択肢の値
 Comment=
 TableOption=
 Page=MAIN
-Left=2450
-Top=1300
+Left=1250
+Top=2650
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="選択肢番号","CHOICE_NO","@INT","NOT NULL",2,"","",$FFFFFFFF,""
@@ -640,7 +713,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170220203842
-Position="MAIN",2450,1300
+Position="MAIN",1250,2650
 
 [Relation]
 Entity1=SURVEYS
@@ -651,15 +724,15 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4567,5433,6677,R,R
+Position="MAIN",0,6505,5433,1090,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20170220203540
 LineMode=0
-Bar1=457
+Bar1=650
 Bar2=543
-Bar3=668
+Bar3=109
 TermPos1=R
 TermPos2=R
 
@@ -669,8 +742,8 @@ LName=アンケート項目
 Comment=
 TableOption=
 Page=MAIN
-Left=2500
-Top=1550
+Left=1200
+Top=2400
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="項目名","ITEM_NAME","@VARCHAR(32)","NOT NULL",,"","",$FFFFFFFF,""
@@ -680,7 +753,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170220203458
-Position="MAIN",2500,1550
+Position="MAIN",1200,2400
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -691,14 +764,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,6731,2055,3130,R,R
+Position="MAIN",0,6893,2055,3184,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
-Bar1=673
+Bar1=689
 Bar2=206
-Bar3=313
+Bar3=318
 TermPos1=R
 TermPos2=R
 
@@ -708,8 +781,8 @@ LName=アンケート
 Comment=
 TableOption=
 Page=MAIN
-Left=1950
-Top=1600
+Left=950
+Top=2100
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="タイトル","TITLE","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,""
 Field="説明","DESCRIPTION","text",,,"","",$FFFFFFFF,""
@@ -717,7 +790,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170220203309
-Position="MAIN",1950,1600
+Position="MAIN",950,2100
 
 [Relation]
 Entity1=EVENTS
@@ -728,7 +801,7 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4320,4611,5418,R,R
+Position="MAIN",0,4320,4611,5405,R,R
 Dependence=1
 Caption=
 PName=
@@ -736,7 +809,7 @@ ModifiedDateTime=20170222215225
 LineMode=0
 Bar1=432
 Bar2=461
-Bar3=542
+Bar3=540
 TermPos1=R
 TermPos2=R
 
@@ -749,13 +822,13 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,8507,5008,6901,R,R
+Position="MAIN",0,2626,3251,6901,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
-Bar1=851
-Bar2=501
+Bar1=263
+Bar2=325
 Bar3=690
 TermPos1=R
 TermPos2=R
@@ -766,8 +839,8 @@ LName=イベント
 Comment=
 TableOption=
 Page=MAIN
-Left=1350
-Top=1700
+Left=50
+Top=900
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="開催日","START_DATE_TIME","@DATETIME","NOT NULL",,"","UTC",$FFFFFFFF,""
 Field="タイムゾーン","TIME_ZONE","@VARCHAR(64)",,,"","",$FFFFFFFF,""
@@ -776,7 +849,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170307155432
-Position="MAIN",1350,1700
+Position="MAIN",50,900
 
 [Entity]
 PName=PARTICIPANTS
@@ -784,8 +857,8 @@ LName=参加者
 Comment=
 TableOption=
 Page=MAIN
-Left=1350
-Top=1900
+Left=50
+Top=750
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ユーザID","USER_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="ステータス","STATUS","@INT","NOT NULL",,"","",$FFFFFFFF,""
@@ -793,7 +866,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170222215215
-Position="MAIN",1350,1900
+Position="MAIN",50,750
 
 [Relation]
 Entity1=SERVICE_CONFIGS
@@ -823,7 +896,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=1600
-Top=350
+Top=300
 Field="サービス名","SERVICE_NAME","@VARCHAR(64)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ロケールキー","LOCALE_KEY","@VARCHAR(12)","NOT NULL",1,"","",$FFFFFFFF,""
 Field="トップページのHTML","PAGE_HTML","text",,,"","",$FFFFFFFF,""
@@ -831,7 +904,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170130131057
-Position="MAIN",1600,350
+Position="MAIN",1600,300
 
 [Entity]
 PName=SERVICE_CONFIGS
@@ -857,8 +930,8 @@ LName=ピン
 Comment=
 TableOption=
 Page=MAIN
-Left=50
-Top=1900
+Left=700
+Top=2700
 Field="NO","NO","serial","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
 Field="行ID","ROW_ID","@VARCHAR(64)",,,"","",$FFFFFFFF,""
@@ -867,7 +940,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20161206105257
-Position="MAIN",50,1900
+Position="MAIN",700,2700
 
 [Relation]
 Entity1=WEBHOOK_CONFIGS
@@ -878,7 +951,7 @@ Fields1=HOOK_ID
 Fields2=HOOK
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4124,4194,3043,R,R
+Position="MAIN",0,4124,4194,3971,R,R
 Dependence=0
 Caption=
 PName=
@@ -886,7 +959,7 @@ ModifiedDateTime=20161206104307
 LineMode=0
 Bar1=412
 Bar2=419
-Bar3=304
+Bar3=397
 TermPos1=R
 TermPos2=R
 
@@ -897,7 +970,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=50
-Top=2250
+Top=2700
 Field="WEBHOOK ID","WEBHOOK_ID","@VARCHAR(64)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ステータス","STATUS","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="HOOK","HOOK","@VARCHAR(20)",,,"","",$FFFFFFFF,""
@@ -907,7 +980,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20161206105158
-Position="MAIN",50,2250
+Position="MAIN",50,2700
 
 [Entity]
 PName=WEBHOOK_CONFIGS
@@ -915,8 +988,8 @@ LName=Webhook 設定
 Comment=
 TableOption=
 Page=MAIN
-Left=50
-Top=2050
+Left=100
+Top=2500
 Field="HOOK ID","HOOK_ID","serial","NOT NULL",0,"","",$FFFFFFFF,""
 Field="HOOK","HOOK","@VARCHAR(20)","NOT NULL",,"","",$FFFFFFFF,""
 Field="URL","URL","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,""
@@ -924,7 +997,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20161206103902
-Position="MAIN",50,2050
+Position="MAIN",100,2500
 
 [Relation]
 Entity1=DRAFT_KNOWLEDGES
@@ -994,7 +1067,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=1600
-Top=750
+Top=700
 Field="下書きID","DRAFT_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="テンプレートの種類ID","TYPE_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",2,"","",$FFFFFFFF,""
@@ -1004,7 +1077,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20161118154223
-Position="MAIN",1600,750
+Position="MAIN",1600,700
 
 [Entity]
 PName=DRAFT_KNOWLEDGES
@@ -1035,8 +1108,8 @@ LName=メールから投稿
 Comment=
 TableOption=
 Page=MAIN
-Left=2950
-Top=350
+Left=2250
+Top=300
 Field="Message-ID","MESSAGE_ID","@VARCHAR(128)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="投稿区分","POST_KIND","@INT","NOT NULL",,"","1: Knowledge 2:Comment",$FFFFFFFF,""
 Field="ID","ID","BIGINT","NOT NULL",,"","",$FFFFFFFF,""
@@ -1045,7 +1118,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20160611082117
-Position="MAIN",2950,350
+Position="MAIN",2250,300
 
 [Relation]
 Entity1=MAIL_HOOKS
@@ -1056,7 +1129,7 @@ Fields1=HOOK_ID
 Fields2=HOOK_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4081,5073,4018,R,R
+Position="MAIN",0,4081,5073,3934,R,R
 Dependence=1
 Caption=
 PName=
@@ -1064,7 +1137,7 @@ ModifiedDateTime=20160603134957
 LineMode=0
 Bar1=408
 Bar2=507
-Bar3=402
+Bar3=393
 TermPos1=R
 TermPos2=R
 
@@ -1074,8 +1147,8 @@ LName=メールから投稿する条件
 Comment=
 TableOption=
 Page=MAIN
-Left=2300
-Top=350
+Left=3400
+Top=2050
 Field="HOOK_ID","HOOK_ID","INTEGER","NOT NULL",0,"","",$FFFFFFFF,""
 Field="CONDITION_NO","CONDITION_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="条件の種類","CONDITION_KIND","@INT","NOT NULL",,"","1:宛先が「条件文字」であった場合",$FFFFFFFF,""
@@ -1092,7 +1165,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20160720194529
-Position="MAIN",2300,350
+Position="MAIN",3400,2050
 
 [Entity]
 PName=MAIL_HOOKS
@@ -1100,8 +1173,8 @@ LName=受信したメールからの処理
 Comment=
 TableOption=
 Page=MAIN
-Left=2300
-Top=50
+Left=3400
+Top=1750
 Field="HOOK_ID","HOOK_ID","SERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="MAIL_PROTOCOL","MAIL_PROTOCOL","@VARCHAR(10)","NOT NULL",,"","",$FFFFFFFF,""
 Field="MAIL_HOST","MAIL_HOST","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,""
@@ -1114,7 +1187,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20160603171116
-Position="MAIN",2300,50
+Position="MAIN",3400,1750
 
 [Relation]
 Entity1=STOCKS
@@ -1125,7 +1198,7 @@ Fields1=STOCK_ID
 Fields2=STOCK_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4450,5090,4490,R,R
+Position="MAIN",0,4450,5090,5933,R,R
 Dependence=1
 Caption=
 PName=
@@ -1133,7 +1206,7 @@ ModifiedDateTime=20150910042933
 LineMode=0
 Bar1=445
 Bar2=509
-Bar3=449
+Bar3=593
 TermPos1=R
 TermPos2=R
 
@@ -1143,8 +1216,8 @@ LName=ストック
 Comment=
 TableOption=
 Page=MAIN
-Left=50
-Top=1550
+Left=100
+Top=2250
 Field="STOCK ID","STOCK_ID","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="STOCK 名","STOCK_NAME","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,""
 Field="区分","STOCK_TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
@@ -1153,7 +1226,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150910042830
-Position="MAIN",50,1550
+Position="MAIN",100,2250
 
 [Relation]
 Entity1=TEMPLATE_ITEMS
@@ -1243,7 +1316,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=950
-Top=200
+Top=100
 Field="テンプレートの種類ID","TYPE_ID","@INT","NOT NULL",0,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="選択肢番号","CHOICE_NO","@INT","NOT NULL",2,"","",$FFFFFFFF,""
@@ -1253,7 +1326,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150910041119
-Position="MAIN",950,200,542,135
+Position="MAIN",950,100,542,135
 
 [Relation]
 Entity1=TEMPLATE_MASTERS
@@ -1322,7 +1395,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=1350
-Top=500
+Top=450
 Field="テンプレートの種類ID","TYPE_ID","@INT","NOT NULL",0,"","",$FFFFFFFF,""
 Field="項目NO","ITEM_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="項目名","ITEM_NAME","@VARCHAR(32)","NOT NULL",,"","",$FFFFFFFF,""
@@ -1333,7 +1406,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170915171315
-Position="MAIN",1350,500
+Position="MAIN",1350,450
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1344,13 +1417,13 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",3,8366,5077,5634,R,R
+Position="MAIN",3,1165,5077,5634,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20161206103019
 LineMode=3
-Bar1=837
+Bar1=116
 Bar2=508
 Bar3=563
 TermPos1=R
@@ -1362,15 +1435,15 @@ LName=編集可能なグループ
 Comment=
 TableOption=
 Page=MAIN
-Left=650
-Top=1900
+Left=150
+Top=1800
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="GROUP_ID","GROUP_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150517064451
-Position="MAIN",650,1900
+Position="MAIN",150,1800
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1381,13 +1454,13 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",3,7515,3356,9481,R,R
+Position="MAIN",3,500,3356,9481,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20170307155611
 LineMode=3
-Bar1=752
+Bar1=50
 Bar2=336
 Bar3=948
 TermPos1=R
@@ -1399,15 +1472,15 @@ LName=編集可能なユーザ
 Comment=
 TableOption=
 Page=MAIN
-Left=650
-Top=1800
+Left=150
+Top=1700
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="USER_ID","USER_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150517063424
-Position="MAIN",650,1800
+Position="MAIN",150,1700
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1437,7 +1510,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=50
-Top=1100
+Top=1400
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="履歴番号","HISTORY_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 Field="タイトル","TITLE","@VARCHAR(1024)","NOT NULL",,"","",$FFFFFFFF,""
@@ -1451,7 +1524,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150507141708
-Position="MAIN",50,1100
+Position="MAIN",50,1400
 
 [Entity]
 PName=NOTIFY_QUEUES
@@ -1504,14 +1577,14 @@ Fields1=COMMENT_NO
 Fields2=COMMENT_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,5486,4072,4707,R,R
+Position="MAIN",0,5554,4072,2816,R,R
 Dependence=0
 Caption=
 PName=
 LineMode=0
-Bar1=549
+Bar1=555
 Bar2=407
-Bar3=471
+Bar3=282
 TermPos1=R
 TermPos2=R
 
@@ -1521,8 +1594,8 @@ LName=アカウントの画像
 Comment=
 TableOption=
 Page=MAIN
-Left=3550
-Top=1250
+Left=3500
+Top=1300
 Field="IMAGE_ID","IMAGE_ID","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ユーザID","USER_ID","@INT",,,"","",$FFFFFFFF,""
 Field="ファイル名","FILE_NAME","@VARCHAR(256)",,,"","",$FFFFFFFF,""
@@ -1535,7 +1608,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150416234339
-Position="MAIN",3550,1250
+Position="MAIN",3500,1300
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1546,14 +1619,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,1535,6913,5217,R,R
+Position="MAIN",0,6168,6867,1373,R,R
 Dependence=0
 Caption=
 PName=
 LineMode=0
-Bar1=154
-Bar2=691
-Bar3=522
+Bar1=617
+Bar2=687
+Bar3=137
 TermPos1=R
 TermPos2=R
 
@@ -1563,8 +1636,8 @@ LName=いいね
 Comment=
 TableOption=
 Page=MAIN
-Left=50
-Top=600
+Left=1500
+Top=1600
 Field="NO","NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
 Field="種類","LIKE_CLASS","@INT",,,"1","",$FFFFFFFF,""
@@ -1573,7 +1646,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170809123852
-Position="MAIN",50,600
+Position="MAIN",1500,1600
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1602,7 +1675,7 @@ LName=コメント
 Comment=
 TableOption=
 Page=MAIN
-Left=1600
+Left=1500
 Top=1250
 Field="コメント番号","COMMENT_NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
@@ -1613,7 +1686,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150910035117
-Position="MAIN",1600,1250
+Position="MAIN",1500,1250
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1624,14 +1697,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",3,6828,5116,5997,R,R
+Position="MAIN",2,500,6854,5997,R,R
 Dependence=0
 Caption=
 PName=
-ModifiedDateTime=20161118152345
-LineMode=3
-Bar1=683
-Bar2=512
+ModifiedDateTime=20171002125604
+LineMode=2
+Bar1=50
+Bar2=685
 Bar3=600
 TermPos1=R
 TermPos2=R
@@ -1643,7 +1716,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=50
-Top=1700
+Top=600
 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,""
@@ -1652,7 +1725,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150416233659
-Position="MAIN",50,1700,435,89
+Position="MAIN",50,600,435,89
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1663,14 +1736,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,7005,6407,5990,R,R
+Position="MAIN",3,2678,6446,5990,R,R
 Dependence=1
 Caption=
 PName=
-ModifiedDateTime=20141204130740
-LineMode=0
-Bar1=700
-Bar2=641
+ModifiedDateTime=20171002130417
+LineMode=3
+Bar1=268
+Bar2=645
 Bar3=599
 TermPos1=R
 TermPos2=R
@@ -1681,8 +1754,8 @@ LName=ナレッジの参照履歴
 Comment=
 TableOption=
 Page=MAIN
-Left=50
-Top=1400
+Left=100
+Top=2100
 Field="HISTORY_NO","HISTORY_NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
 Field="日時","VIEW_DATE_TIME","@DATETIME","NOT NULL",,"","",$FFFFFFFF,""
@@ -1693,7 +1766,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170705135644
-Position="MAIN",50,1400
+Position="MAIN",100,2100
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1704,15 +1777,15 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,2082,5725,4638,R,R
+Position="MAIN",0,3762,5725,4566,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20150910042925
 LineMode=0
-Bar1=208
+Bar1=376
 Bar2=572
-Bar3=464
+Bar3=457
 TermPos1=R
 TermPos2=R
 
@@ -1722,8 +1795,8 @@ LName=ストックしたナレッジ
 Comment=
 TableOption=
 Page=MAIN
-Left=600
-Top=1550
+Left=700
+Top=2250
 Field="STOCK ID","STOCK_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",1,"","",$FFFFFFFF,""
 Field="コメント","COMMENT","@VARCHAR(1024)",,,"","",$FFFFFFFF,""
@@ -1731,7 +1804,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150910042912
-Position="MAIN",600,1550
+Position="MAIN",700,2250
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1742,13 +1815,13 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",3,9499,4332,5676,R,R
+Position="MAIN",3,2265,4332,5676,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20161206103135
 LineMode=3
-Bar1=950
+Bar1=226
 Bar2=433
 Bar3=568
 TermPos1=R
@@ -1760,15 +1833,15 @@ LName=アクセス可能なグループ
 Comment=
 TableOption=
 Page=MAIN
-Left=650
-Top=2100
+Left=150
+Top=2000
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="GROUP_ID","GROUP_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20141222154841
-Position="MAIN",650,2100
+Position="MAIN",150,2000
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -1779,13 +1852,13 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",3,8922,5233,1847,R,R
+Position="MAIN",3,1715,5233,1847,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20170307155631
 LineMode=3
-Bar1=892
+Bar1=172
 Bar2=523
 Bar3=185
 TermPos1=R
@@ -1797,15 +1870,15 @@ LName=アクセス可能なユーザ
 Comment=
 TableOption=
 Page=MAIN
-Left=650
-Top=2000
+Left=150
+Top=1900
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="USER_ID","USER_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150517063359
-Position="MAIN",650,2000
+Position="MAIN",150,1900
 
 [Relation]
 Entity1=TAGS
@@ -1816,14 +1889,14 @@ Fields1=TAG_ID
 Fields2=TAG_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4552,5672,4574,R,R
+Position="MAIN",0,4552,5672,4653,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
 Bar1=455
 Bar2=567
-Bar3=457
+Bar3=465
 TermPos1=R
 TermPos2=R
 
@@ -1836,12 +1909,12 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,2923,5592,6381,R,R
+Position="MAIN",0,4015,5592,6381,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
-Bar1=292
+Bar1=402
 Bar2=559
 Bar3=638
 TermPos1=R
@@ -1854,14 +1927,14 @@ Comment=
 TableOption=
 Page=MAIN
 Left=50
-Top=950
+Top=1250
 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",50,950
+Position="MAIN",50,1250,407,50
 
 [Entity]
 PName=TAGS
@@ -1870,14 +1943,14 @@ Comment=
 TableOption=
 Page=MAIN
 Left=50
-Top=750
+Top=1100
 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",50,750
+Position="MAIN",50,1100
 
 [Relation]
 Entity1=KNOWLEDGES
diff --git a/src/main/java/org/support/project/knowledge/dao/MailHookIgnoreConditionsDao.java b/src/main/java/org/support/project/knowledge/dao/MailHookIgnoreConditionsDao.java
new file mode 100644
index 000000000..19462ea80
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/MailHookIgnoreConditionsDao.java
@@ -0,0 +1,27 @@
+package org.support.project.knowledge.dao;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import org.support.project.knowledge.dao.gen.GenMailHookIgnoreConditionsDao;
+
+/**
+ * メールから投稿の際の除外条件
+ */
+@DI(instance = Instance.Singleton)
+public class MailHookIgnoreConditionsDao extends GenMailHookIgnoreConditionsDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static MailHookIgnoreConditionsDao get() {
+        return Container.getComp(MailHookIgnoreConditionsDao.class);
+    }
+
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/NotificationStatusDao.java b/src/main/java/org/support/project/knowledge/dao/NotificationStatusDao.java
new file mode 100644
index 000000000..7614694b8
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/NotificationStatusDao.java
@@ -0,0 +1,27 @@
+package org.support.project.knowledge.dao;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import org.support.project.knowledge.dao.gen.GenNotificationStatusDao;
+
+/**
+ * いいねの通知状態
+ */
+@DI(instance = Instance.Singleton)
+public class NotificationStatusDao extends GenNotificationStatusDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static NotificationStatusDao get() {
+        return Container.getComp(NotificationStatusDao.class);
+    }
+
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java b/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
index a7f891d2c..11e643a56 100644
--- a/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/gen/DatabaseControlDao.java
@@ -20,7 +20,7 @@ public class DatabaseControlDao extends AbstractDao {
 
     /** Drop all tables */
     public void dropAllTable() {
-        String[] sqls = new String[49];
+        String[] sqls = new String[51];
         sqls[0] = "DROP TABLE IF EXISTS KNOWLEDGES CASCADE;";
         sqls[1] = "DROP TABLE IF EXISTS EVENTS CASCADE;";
         sqls[2] = "DROP TABLE IF EXISTS MAIL_POSTS CASCADE;";
@@ -37,39 +37,41 @@ public void dropAllTable() {
         sqls[13] = "DROP TABLE IF EXISTS ITEM_CHOICES CASCADE;";
         sqls[14] = "DROP TABLE IF EXISTS KNOWLEDGE_ITEM_VALUES CASCADE;";
         sqls[15] = "DROP TABLE IF EXISTS KNOWLEDGE_TAGS CASCADE;";
-        sqls[16] = "DROP TABLE IF EXISTS USER_BADGES CASCADE;";
-        sqls[17] = "DROP TABLE IF EXISTS NOTIFY_CONFIGS CASCADE;";
-        sqls[18] = "DROP TABLE IF EXISTS MAIL_HOOKS CASCADE;";
-        sqls[19] = "DROP TABLE IF EXISTS DRAFT_KNOWLEDGES CASCADE;";
-        sqls[20] = "DROP TABLE IF EXISTS STOCK_KNOWLEDGES CASCADE;";
-        sqls[21] = "DROP TABLE IF EXISTS KNOWLEDGE_USERS CASCADE;";
-        sqls[22] = "DROP TABLE IF EXISTS PARTICIPANTS CASCADE;";
-        sqls[23] = "DROP TABLE IF EXISTS TAGS CASCADE;";
-        sqls[24] = "DROP TABLE IF EXISTS SERVICE_LOCALE_CONFIGS CASCADE;";
-        sqls[25] = "DROP TABLE IF EXISTS ACCOUNT_IMAGES CASCADE;";
-        sqls[26] = "DROP TABLE IF EXISTS MAIL_PROPERTIES CASCADE;";
-        sqls[27] = "DROP TABLE IF EXISTS POINT_KNOWLEDGE_HISTORIES CASCADE;";
-        sqls[28] = "DROP TABLE IF EXISTS MAIL_LOCALE_TEMPLATES CASCADE;";
-        sqls[29] = "DROP TABLE IF EXISTS VOTES CASCADE;";
-        sqls[30] = "DROP TABLE IF EXISTS COMMENTS CASCADE;";
-        sqls[31] = "DROP TABLE IF EXISTS TOKENS CASCADE;";
-        sqls[32] = "DROP TABLE IF EXISTS MAIL_HOOK_CONDITIONS CASCADE;";
-        sqls[33] = "DROP TABLE IF EXISTS LIKES CASCADE;";
-        sqls[34] = "DROP TABLE IF EXISTS VIEW_HISTORIES CASCADE;";
-        sqls[35] = "DROP TABLE IF EXISTS SERVICE_CONFIGS CASCADE;";
-        sqls[36] = "DROP TABLE IF EXISTS KNOWLEDGE_EDIT_USERS CASCADE;";
-        sqls[37] = "DROP TABLE IF EXISTS PINS CASCADE;";
-        sqls[38] = "DROP TABLE IF EXISTS KNOWLEDGE_HISTORIES CASCADE;";
-        sqls[39] = "DROP TABLE IF EXISTS LIKE_COMMENTS CASCADE;";
-        sqls[40] = "DROP TABLE IF EXISTS BADGES CASCADE;";
-        sqls[41] = "DROP TABLE IF EXISTS SURVEY_ANSWERS CASCADE;";
-        sqls[42] = "DROP TABLE IF EXISTS SURVEYS CASCADE;";
-        sqls[43] = "DROP TABLE IF EXISTS ACTIVITIES CASCADE;";
-        sqls[44] = "DROP TABLE IF EXISTS MAIL_TEMPLATES CASCADE;";
-        sqls[45] = "DROP TABLE IF EXISTS POINT_USER_HISTORIES CASCADE;";
-        sqls[46] = "DROP TABLE IF EXISTS SURVEY_ITEMS CASCADE;";
-        sqls[47] = "DROP TABLE IF EXISTS STOCKS CASCADE;";
-        sqls[48] = "DROP TABLE IF EXISTS TEMPLATE_ITEMS CASCADE;";
+        sqls[16] = "DROP TABLE IF EXISTS NOTIFICATION_STATUS CASCADE;";
+        sqls[17] = "DROP TABLE IF EXISTS USER_BADGES CASCADE;";
+        sqls[18] = "DROP TABLE IF EXISTS NOTIFY_CONFIGS CASCADE;";
+        sqls[19] = "DROP TABLE IF EXISTS MAIL_HOOKS CASCADE;";
+        sqls[20] = "DROP TABLE IF EXISTS DRAFT_KNOWLEDGES CASCADE;";
+        sqls[21] = "DROP TABLE IF EXISTS STOCK_KNOWLEDGES CASCADE;";
+        sqls[22] = "DROP TABLE IF EXISTS KNOWLEDGE_USERS CASCADE;";
+        sqls[23] = "DROP TABLE IF EXISTS PARTICIPANTS CASCADE;";
+        sqls[24] = "DROP TABLE IF EXISTS TAGS CASCADE;";
+        sqls[25] = "DROP TABLE IF EXISTS SERVICE_LOCALE_CONFIGS CASCADE;";
+        sqls[26] = "DROP TABLE IF EXISTS ACCOUNT_IMAGES CASCADE;";
+        sqls[27] = "DROP TABLE IF EXISTS MAIL_PROPERTIES CASCADE;";
+        sqls[28] = "DROP TABLE IF EXISTS POINT_KNOWLEDGE_HISTORIES CASCADE;";
+        sqls[29] = "DROP TABLE IF EXISTS MAIL_LOCALE_TEMPLATES CASCADE;";
+        sqls[30] = "DROP TABLE IF EXISTS VOTES CASCADE;";
+        sqls[31] = "DROP TABLE IF EXISTS COMMENTS CASCADE;";
+        sqls[32] = "DROP TABLE IF EXISTS TOKENS CASCADE;";
+        sqls[33] = "DROP TABLE IF EXISTS MAIL_HOOK_CONDITIONS CASCADE;";
+        sqls[34] = "DROP TABLE IF EXISTS LIKES CASCADE;";
+        sqls[35] = "DROP TABLE IF EXISTS VIEW_HISTORIES CASCADE;";
+        sqls[36] = "DROP TABLE IF EXISTS SERVICE_CONFIGS CASCADE;";
+        sqls[37] = "DROP TABLE IF EXISTS KNOWLEDGE_EDIT_USERS CASCADE;";
+        sqls[38] = "DROP TABLE IF EXISTS PINS CASCADE;";
+        sqls[39] = "DROP TABLE IF EXISTS KNOWLEDGE_HISTORIES CASCADE;";
+        sqls[40] = "DROP TABLE IF EXISTS LIKE_COMMENTS CASCADE;";
+        sqls[41] = "DROP TABLE IF EXISTS BADGES CASCADE;";
+        sqls[42] = "DROP TABLE IF EXISTS SURVEY_ANSWERS CASCADE;";
+        sqls[43] = "DROP TABLE IF EXISTS SURVEYS CASCADE;";
+        sqls[44] = "DROP TABLE IF EXISTS ACTIVITIES CASCADE;";
+        sqls[45] = "DROP TABLE IF EXISTS MAIL_HOOK_IGNORE_CONDITIONS CASCADE;";
+        sqls[46] = "DROP TABLE IF EXISTS MAIL_TEMPLATES CASCADE;";
+        sqls[47] = "DROP TABLE IF EXISTS POINT_USER_HISTORIES CASCADE;";
+        sqls[48] = "DROP TABLE IF EXISTS SURVEY_ITEMS CASCADE;";
+        sqls[49] = "DROP TABLE IF EXISTS STOCKS CASCADE;";
+        sqls[50] = "DROP TABLE IF EXISTS TEMPLATE_ITEMS CASCADE;";
         for (String sql : sqls) {
             LOG.debug(sql);
             executeUpdate(sql);
@@ -77,7 +79,7 @@ public void dropAllTable() {
     }
     /** Delete all table data */
     public void dropAllData() {
-        String[] sqls = new String[49];
+        String[] sqls = new String[51];
         sqls[0] = "TRUNCATE TABLE KNOWLEDGES;";
         sqls[1] = "TRUNCATE TABLE EVENTS;";
         sqls[2] = "TRUNCATE TABLE MAIL_POSTS;";
@@ -94,39 +96,41 @@ public void dropAllData() {
         sqls[13] = "TRUNCATE TABLE ITEM_CHOICES;";
         sqls[14] = "TRUNCATE TABLE KNOWLEDGE_ITEM_VALUES;";
         sqls[15] = "TRUNCATE TABLE KNOWLEDGE_TAGS;";
-        sqls[16] = "TRUNCATE TABLE USER_BADGES;";
-        sqls[17] = "TRUNCATE TABLE NOTIFY_CONFIGS;";
-        sqls[18] = "TRUNCATE TABLE MAIL_HOOKS;";
-        sqls[19] = "TRUNCATE TABLE DRAFT_KNOWLEDGES;";
-        sqls[20] = "TRUNCATE TABLE STOCK_KNOWLEDGES;";
-        sqls[21] = "TRUNCATE TABLE KNOWLEDGE_USERS;";
-        sqls[22] = "TRUNCATE TABLE PARTICIPANTS;";
-        sqls[23] = "TRUNCATE TABLE TAGS;";
-        sqls[24] = "TRUNCATE TABLE SERVICE_LOCALE_CONFIGS;";
-        sqls[25] = "TRUNCATE TABLE ACCOUNT_IMAGES;";
-        sqls[26] = "TRUNCATE TABLE MAIL_PROPERTIES;";
-        sqls[27] = "TRUNCATE TABLE POINT_KNOWLEDGE_HISTORIES;";
-        sqls[28] = "TRUNCATE TABLE MAIL_LOCALE_TEMPLATES;";
-        sqls[29] = "TRUNCATE TABLE VOTES;";
-        sqls[30] = "TRUNCATE TABLE COMMENTS;";
-        sqls[31] = "TRUNCATE TABLE TOKENS;";
-        sqls[32] = "TRUNCATE TABLE MAIL_HOOK_CONDITIONS;";
-        sqls[33] = "TRUNCATE TABLE LIKES;";
-        sqls[34] = "TRUNCATE TABLE VIEW_HISTORIES;";
-        sqls[35] = "TRUNCATE TABLE SERVICE_CONFIGS;";
-        sqls[36] = "TRUNCATE TABLE KNOWLEDGE_EDIT_USERS;";
-        sqls[37] = "TRUNCATE TABLE PINS;";
-        sqls[38] = "TRUNCATE TABLE KNOWLEDGE_HISTORIES;";
-        sqls[39] = "TRUNCATE TABLE LIKE_COMMENTS;";
-        sqls[40] = "TRUNCATE TABLE BADGES;";
-        sqls[41] = "TRUNCATE TABLE SURVEY_ANSWERS;";
-        sqls[42] = "TRUNCATE TABLE SURVEYS;";
-        sqls[43] = "TRUNCATE TABLE ACTIVITIES;";
-        sqls[44] = "TRUNCATE TABLE MAIL_TEMPLATES;";
-        sqls[45] = "TRUNCATE TABLE POINT_USER_HISTORIES;";
-        sqls[46] = "TRUNCATE TABLE SURVEY_ITEMS;";
-        sqls[47] = "TRUNCATE TABLE STOCKS;";
-        sqls[48] = "TRUNCATE TABLE TEMPLATE_ITEMS;";
+        sqls[16] = "TRUNCATE TABLE NOTIFICATION_STATUS;";
+        sqls[17] = "TRUNCATE TABLE USER_BADGES;";
+        sqls[18] = "TRUNCATE TABLE NOTIFY_CONFIGS;";
+        sqls[19] = "TRUNCATE TABLE MAIL_HOOKS;";
+        sqls[20] = "TRUNCATE TABLE DRAFT_KNOWLEDGES;";
+        sqls[21] = "TRUNCATE TABLE STOCK_KNOWLEDGES;";
+        sqls[22] = "TRUNCATE TABLE KNOWLEDGE_USERS;";
+        sqls[23] = "TRUNCATE TABLE PARTICIPANTS;";
+        sqls[24] = "TRUNCATE TABLE TAGS;";
+        sqls[25] = "TRUNCATE TABLE SERVICE_LOCALE_CONFIGS;";
+        sqls[26] = "TRUNCATE TABLE ACCOUNT_IMAGES;";
+        sqls[27] = "TRUNCATE TABLE MAIL_PROPERTIES;";
+        sqls[28] = "TRUNCATE TABLE POINT_KNOWLEDGE_HISTORIES;";
+        sqls[29] = "TRUNCATE TABLE MAIL_LOCALE_TEMPLATES;";
+        sqls[30] = "TRUNCATE TABLE VOTES;";
+        sqls[31] = "TRUNCATE TABLE COMMENTS;";
+        sqls[32] = "TRUNCATE TABLE TOKENS;";
+        sqls[33] = "TRUNCATE TABLE MAIL_HOOK_CONDITIONS;";
+        sqls[34] = "TRUNCATE TABLE LIKES;";
+        sqls[35] = "TRUNCATE TABLE VIEW_HISTORIES;";
+        sqls[36] = "TRUNCATE TABLE SERVICE_CONFIGS;";
+        sqls[37] = "TRUNCATE TABLE KNOWLEDGE_EDIT_USERS;";
+        sqls[38] = "TRUNCATE TABLE PINS;";
+        sqls[39] = "TRUNCATE TABLE KNOWLEDGE_HISTORIES;";
+        sqls[40] = "TRUNCATE TABLE LIKE_COMMENTS;";
+        sqls[41] = "TRUNCATE TABLE BADGES;";
+        sqls[42] = "TRUNCATE TABLE SURVEY_ANSWERS;";
+        sqls[43] = "TRUNCATE TABLE SURVEYS;";
+        sqls[44] = "TRUNCATE TABLE ACTIVITIES;";
+        sqls[45] = "TRUNCATE TABLE MAIL_HOOK_IGNORE_CONDITIONS;";
+        sqls[46] = "TRUNCATE TABLE MAIL_TEMPLATES;";
+        sqls[47] = "TRUNCATE TABLE POINT_USER_HISTORIES;";
+        sqls[48] = "TRUNCATE TABLE SURVEY_ITEMS;";
+        sqls[49] = "TRUNCATE TABLE STOCKS;";
+        sqls[50] = "TRUNCATE TABLE TEMPLATE_ITEMS;";
         for (String sql : sqls) {
             LOG.debug(sql);
             executeUpdate(sql);
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookIgnoreConditionsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookIgnoreConditionsDao.java
new file mode 100644
index 000000000..e6dfc0d44
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHookIgnoreConditionsDao.java
@@ -0,0 +1,510 @@
+package org.support.project.knowledge.dao.gen;
+
+import java.util.List;
+
+import java.sql.Timestamp;
+
+
+import org.support.project.knowledge.entity.MailHookIgnoreConditionsEntity;
+import org.support.project.ormapping.dao.AbstractDao;
+import org.support.project.ormapping.exception.ORMappingException;
+import org.support.project.ormapping.common.SQLManager;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.ormapping.common.IDGen;
+import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
+import org.support.project.ormapping.connection.ConnectionManager;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.aop.Aspect;
+
+/**
+ * メールから投稿の際の除外条件
+ * this class is auto generate and not edit.
+ * if modify dao method, you can edit MailHookIgnoreConditionsDao.
+ */
+@DI(instance = Instance.Singleton)
+public class GenMailHookIgnoreConditionsDao extends AbstractDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenMailHookIgnoreConditionsDao get() {
+        return Container.getComp(GenMailHookIgnoreConditionsDao.class);
+    }
+
+    /**
+     * Select all data.
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> physicalSelectAll(Order order) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
+        return executeQueryList(sql, MailHookIgnoreConditionsEntity.class);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
+        return executeQueryList(sql, MailHookIgnoreConditionsEntity.class, limit, offset);
+    }
+    /**
+     * Select data on key.
+     * @param  conditionNo conditionNo
+     * @param  hookId hookId
+     * @param  ignoreConditionNo ignoreConditionNo
+     * @return data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity physicalSelectOnKey(Integer conditionNo, Integer hookId, Integer ignoreConditionNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_key.sql");
+        return executeQuerySingle(sql, MailHookIgnoreConditionsEntity.class, conditionNo, hookId, ignoreConditionNo);
+    }
+    /**
+     * Select all data that not deleted.
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> selectAll(Order order) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_all.sql");
+        sql = String.format(sql, order.toString());
+        return executeQueryList(sql, MailHookIgnoreConditionsEntity.class);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> selectAllWidthPager(int limit, int offset, Order order) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
+        return executeQueryList(sql, MailHookIgnoreConditionsEntity.class, limit, offset);
+    }
+    /**
+     * Select count that not deleted.
+     * @return count
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public Integer selectCountAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_count_all.sql");
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Select data that not deleted on key.
+     * @param  conditionNo conditionNo
+     * @param  hookId hookId
+     * @param  ignoreConditionNo ignoreConditionNo
+     * @return data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity selectOnKey(Integer conditionNo, Integer hookId, Integer ignoreConditionNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_key.sql");
+        return executeQuerySingle(sql, MailHookIgnoreConditionsEntity.class, conditionNo, hookId, ignoreConditionNo);
+    }
+    /**
+     * Select data that not deleted on CONDITION_NO column.
+     * @param conditionNo conditionNo
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> selectOnConditionNo(Integer conditionNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_condition_no.sql");
+        return executeQueryList(sql, MailHookIgnoreConditionsEntity.class, conditionNo);
+    }
+    /**
+     * Select data that not deleted on HOOK_ID column.
+     * @param hookId hookId
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> selectOnHookId(Integer hookId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_hook_id.sql");
+        return executeQueryList(sql, MailHookIgnoreConditionsEntity.class, hookId);
+    }
+    /**
+     * Select data that not deleted on IGNORE_CONDITION_NO column.
+     * @param ignoreConditionNo ignoreConditionNo
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> selectOnIgnoreConditionNo(Integer ignoreConditionNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_ignore_condition_no.sql");
+        return executeQueryList(sql, MailHookIgnoreConditionsEntity.class, ignoreConditionNo);
+    }
+    /**
+     * Select data on CONDITION_NO column.
+     * @param conditionNo conditionNo
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> physicalSelectOnConditionNo(Integer conditionNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_condition_no.sql");
+        return executeQueryList(sql, MailHookIgnoreConditionsEntity.class, conditionNo);
+    }
+    /**
+     * Select data on HOOK_ID column.
+     * @param hookId hookId
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> physicalSelectOnHookId(Integer hookId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_hook_id.sql");
+        return executeQueryList(sql, MailHookIgnoreConditionsEntity.class, hookId);
+    }
+    /**
+     * Select data on IGNORE_CONDITION_NO column.
+     * @param ignoreConditionNo ignoreConditionNo
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<MailHookIgnoreConditionsEntity> physicalSelectOnIgnoreConditionNo(Integer ignoreConditionNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_ignore_condition_no.sql");
+        return executeQueryList(sql, MailHookIgnoreConditionsEntity.class, ignoreConditionNo);
+    }
+    /**
+     * Count all data
+     * @return count
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public int physicalCountAll() {
+        String sql = "SELECT COUNT(*) FROM MAIL_HOOK_IGNORE_CONDITIONS";
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Physical Insert.
+     * it is not create key on database sequence.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity rawPhysicalInsert(MailHookIgnoreConditionsEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_raw_insert.sql");
+        executeUpdate(sql, 
+            entity.getConditionNo(), 
+            entity.getHookId(), 
+            entity.getIgnoreConditionNo(), 
+            entity.getConditionKind(), 
+            entity.getCondition(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        return entity;
+    }
+    /**
+     * Physical Insert.
+     * if key column have sequence, key value create by database.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity physicalInsert(MailHookIgnoreConditionsEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_insert.sql");
+        executeUpdate(sql, 
+            entity.getConditionNo(), 
+            entity.getHookId(), 
+            entity.getIgnoreConditionNo(), 
+            entity.getConditionKind(), 
+            entity.getCondition(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        return entity;
+    }
+    /**
+     * Insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity insert(Integer user, MailHookIgnoreConditionsEntity entity) {
+        entity.setInsertUser(user);
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
+        entity.setDeleteFlag(0);
+        return physicalInsert(entity);
+    }
+    /**
+     * Insert.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity insert(MailHookIgnoreConditionsEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return insert(userId, entity);
+    }
+    /**
+     * Physical Update.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity physicalUpdate(MailHookIgnoreConditionsEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_update.sql");
+        executeUpdate(sql, 
+            entity.getConditionKind(), 
+            entity.getCondition(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag(), 
+            entity.getConditionNo(), 
+            entity.getHookId(), 
+            entity.getIgnoreConditionNo());
+        return entity;
+    }
+    /**
+     * Update.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity update(Integer user, MailHookIgnoreConditionsEntity entity) {
+        MailHookIgnoreConditionsEntity db = selectOnKey(entity.getConditionNo(), entity.getHookId(), entity.getIgnoreConditionNo());
+        entity.setInsertUser(db.getInsertUser());
+        entity.setInsertDatetime(db.getInsertDatetime());
+        entity.setDeleteFlag(db.getDeleteFlag());
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
+        return physicalUpdate(entity);
+    }
+    /**
+     * Update.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity update(MailHookIgnoreConditionsEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return update(userId, entity);
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity save(Integer user, MailHookIgnoreConditionsEntity entity) {
+        MailHookIgnoreConditionsEntity db = selectOnKey(entity.getConditionNo(), entity.getHookId(), entity.getIgnoreConditionNo());
+        if (db == null) {
+            return insert(user, entity);
+        } else {
+            return update(user, entity);
+        }
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public MailHookIgnoreConditionsEntity save(MailHookIgnoreConditionsEntity entity) {
+        MailHookIgnoreConditionsEntity db = selectOnKey(entity.getConditionNo(), entity.getHookId(), entity.getIgnoreConditionNo());
+        if (db == null) {
+            return insert(entity);
+        } else {
+            return update(entity);
+        }
+    }
+    /**
+     * Physical Delete.
+     * @param  conditionNo conditionNo
+     * @param  hookId hookId
+     * @param  ignoreConditionNo ignoreConditionNo
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(Integer conditionNo, Integer hookId, Integer ignoreConditionNo) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_delete.sql");
+        executeUpdate(sql, conditionNo, hookId, ignoreConditionNo);
+    }
+    /**
+     * Physical Delete.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(MailHookIgnoreConditionsEntity entity) {
+        physicalDelete(entity.getConditionNo(), entity.getHookId(), entity.getIgnoreConditionNo());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param  conditionNo conditionNo
+     * @param  hookId hookId
+     * @param  ignoreConditionNo ignoreConditionNo
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, Integer conditionNo, Integer hookId, Integer ignoreConditionNo) {
+        MailHookIgnoreConditionsEntity db = selectOnKey(conditionNo, hookId, ignoreConditionNo);
+        db.setDeleteFlag(1);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * @param  conditionNo conditionNo
+     * @param  hookId hookId
+     * @param  ignoreConditionNo ignoreConditionNo
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer conditionNo, Integer hookId, Integer ignoreConditionNo) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        delete(user, conditionNo, hookId, ignoreConditionNo);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, MailHookIgnoreConditionsEntity entity) {
+        delete(user, entity.getConditionNo(), entity.getHookId(), entity.getIgnoreConditionNo());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(MailHookIgnoreConditionsEntity entity) {
+        delete(entity.getConditionNo(), entity.getHookId(), entity.getIgnoreConditionNo());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param  conditionNo conditionNo
+     * @param  hookId hookId
+     * @param  ignoreConditionNo ignoreConditionNo
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, Integer conditionNo, Integer hookId, Integer ignoreConditionNo) {
+        MailHookIgnoreConditionsEntity db = physicalSelectOnKey(conditionNo, hookId, ignoreConditionNo);
+        db.setDeleteFlag(0);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param  conditionNo conditionNo
+     * @param  hookId hookId
+     * @param  ignoreConditionNo ignoreConditionNo
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer conditionNo, Integer hookId, Integer ignoreConditionNo) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        activation(user, conditionNo, hookId, ignoreConditionNo);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, MailHookIgnoreConditionsEntity entity) {
+        activation(user, entity.getConditionNo(), entity.getHookId(), entity.getIgnoreConditionNo());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(MailHookIgnoreConditionsEntity entity) {
+        activation(entity.getConditionNo(), entity.getHookId(), entity.getIgnoreConditionNo());
+
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenNotificationStatusDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenNotificationStatusDao.java
new file mode 100644
index 000000000..05a1f7b05
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/dao/gen/GenNotificationStatusDao.java
@@ -0,0 +1,507 @@
+package org.support.project.knowledge.dao.gen;
+
+import java.util.List;
+
+import java.sql.Timestamp;
+
+
+import org.support.project.knowledge.entity.NotificationStatusEntity;
+import org.support.project.ormapping.dao.AbstractDao;
+import org.support.project.ormapping.exception.ORMappingException;
+import org.support.project.ormapping.common.SQLManager;
+import org.support.project.ormapping.common.DBUserPool;
+import org.support.project.ormapping.common.IDGen;
+import org.support.project.ormapping.config.ORMappingParameter;
+import org.support.project.ormapping.config.Order;
+import org.support.project.ormapping.connection.ConnectionManager;
+import org.support.project.common.util.PropertyUtil;
+import org.support.project.common.util.DateUtils;
+
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.aop.Aspect;
+
+/**
+ * いいねの通知状態
+ * this class is auto generate and not edit.
+ * if modify dao method, you can edit NotificationStatusDao.
+ */
+@DI(instance = Instance.Singleton)
+public class GenNotificationStatusDao extends AbstractDao {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenNotificationStatusDao get() {
+        return Container.getComp(GenNotificationStatusDao.class);
+    }
+
+    /**
+     * Select all data.
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> physicalSelectAll() { 
+        return physicalSelectAll(Order.DESC);
+    }
+    /**
+     * Select all data.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> physicalSelectAll(Order order) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_all.sql");
+        sql = String.format(sql, order.toString());
+        return executeQueryList(sql, NotificationStatusEntity.class);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> physicalSelectAllWithPager(int limit, int offset) { 
+        return physicalSelectAllWithPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data on limit and offset
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> physicalSelectAllWithPager(int limit, int offset, Order order) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
+        return executeQueryList(sql, NotificationStatusEntity.class, limit, offset);
+    }
+    /**
+     * Select data on key.
+     * @param  targetId targetId
+     * @param  type type
+     * @param  userId userId
+     * @return data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity physicalSelectOnKey(Long targetId, Integer type, Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_key.sql");
+        return executeQuerySingle(sql, NotificationStatusEntity.class, targetId, type, userId);
+    }
+    /**
+     * Select all data that not deleted.
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> selectAll() { 
+        return selectAll(Order.DESC);
+    }
+    /**
+     * Select all data that not deleted.
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> selectAll(Order order) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_all.sql");
+        sql = String.format(sql, order.toString());
+        return executeQueryList(sql, NotificationStatusEntity.class);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> selectAllWidthPager(int limit, int offset) { 
+        return selectAllWidthPager(limit, offset, Order.DESC);
+    }
+    /**
+     * Select all data that not deleted with pager.
+     * @param limit limit
+     * @param offset offset
+     * @param order order
+     * @return all data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> selectAllWidthPager(int limit, int offset, Order order) { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_all_with_pager.sql");
+        sql = String.format(sql, order.toString());
+        return executeQueryList(sql, NotificationStatusEntity.class, limit, offset);
+    }
+    /**
+     * Select count that not deleted.
+     * @return count
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public Integer selectCountAll() { 
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_count_all.sql");
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Select data that not deleted on key.
+     * @param  targetId targetId
+     * @param  type type
+     * @param  userId userId
+     * @return data
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity selectOnKey(Long targetId, Integer type, Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_key.sql");
+        return executeQuerySingle(sql, NotificationStatusEntity.class, targetId, type, userId);
+    }
+    /**
+     * Select data that not deleted on TARGET_ID column.
+     * @param targetId targetId
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> selectOnTargetId(Long targetId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_target_id.sql");
+        return executeQueryList(sql, NotificationStatusEntity.class, targetId);
+    }
+    /**
+     * Select data that not deleted on TYPE column.
+     * @param type type
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> selectOnType(Integer type) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_type.sql");
+        return executeQueryList(sql, NotificationStatusEntity.class, type);
+    }
+    /**
+     * Select data that not deleted on USER_ID column.
+     * @param userId userId
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> selectOnUserId(Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_user_id.sql");
+        return executeQueryList(sql, NotificationStatusEntity.class, userId);
+    }
+    /**
+     * Select data on TARGET_ID column.
+     * @param targetId targetId
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> physicalSelectOnTargetId(Long targetId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_target_id.sql");
+        return executeQueryList(sql, NotificationStatusEntity.class, targetId);
+    }
+    /**
+     * Select data on TYPE column.
+     * @param type type
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> physicalSelectOnType(Integer type) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_type.sql");
+        return executeQueryList(sql, NotificationStatusEntity.class, type);
+    }
+    /**
+     * Select data on USER_ID column.
+     * @param userId userId
+     * @return list
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<NotificationStatusEntity> physicalSelectOnUserId(Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_user_id.sql");
+        return executeQueryList(sql, NotificationStatusEntity.class, userId);
+    }
+    /**
+     * Count all data
+     * @return count
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public int physicalCountAll() {
+        String sql = "SELECT COUNT(*) FROM NOTIFICATION_STATUS";
+        return executeQuerySingle(sql, Integer.class);
+    }
+    /**
+     * Physical Insert.
+     * it is not create key on database sequence.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity rawPhysicalInsert(NotificationStatusEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_raw_insert.sql");
+        executeUpdate(sql, 
+            entity.getTargetId(), 
+            entity.getType(), 
+            entity.getUserId(), 
+            entity.getStatus(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        return entity;
+    }
+    /**
+     * Physical Insert.
+     * if key column have sequence, key value create by database.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity physicalInsert(NotificationStatusEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_insert.sql");
+        executeUpdate(sql, 
+            entity.getTargetId(), 
+            entity.getType(), 
+            entity.getUserId(), 
+            entity.getStatus(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag());
+        return entity;
+    }
+    /**
+     * Insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity insert(Integer user, NotificationStatusEntity entity) {
+        entity.setInsertUser(user);
+        entity.setInsertDatetime(new Timestamp(DateUtils.now().getTime()));
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
+        entity.setDeleteFlag(0);
+        return physicalInsert(entity);
+    }
+    /**
+     * Insert.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity insert(NotificationStatusEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return insert(userId, entity);
+    }
+    /**
+     * Physical Update.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity physicalUpdate(NotificationStatusEntity entity) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_update.sql");
+        executeUpdate(sql, 
+            entity.getStatus(), 
+            entity.getInsertUser(), 
+            entity.getInsertDatetime(), 
+            entity.getUpdateUser(), 
+            entity.getUpdateDatetime(), 
+            entity.getDeleteFlag(), 
+            entity.getTargetId(), 
+            entity.getType(), 
+            entity.getUserId());
+        return entity;
+    }
+    /**
+     * Update.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity update(Integer user, NotificationStatusEntity entity) {
+        NotificationStatusEntity db = selectOnKey(entity.getTargetId(), entity.getType(), entity.getUserId());
+        entity.setInsertUser(db.getInsertUser());
+        entity.setInsertDatetime(db.getInsertDatetime());
+        entity.setDeleteFlag(db.getDeleteFlag());
+        entity.setUpdateUser(user);
+        entity.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
+        return physicalUpdate(entity);
+    }
+    /**
+     * Update.
+     * saved user id is auto set.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity update(NotificationStatusEntity entity) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer userId = (Integer) pool.getUser();
+        return update(userId, entity);
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity save(Integer user, NotificationStatusEntity entity) {
+        NotificationStatusEntity db = selectOnKey(entity.getTargetId(), entity.getType(), entity.getUserId());
+        if (db == null) {
+            return insert(user, entity);
+        } else {
+            return update(user, entity);
+        }
+    }
+    /**
+     * Save. 
+     * if same key data is exists, the data is update. otherwise the data is insert.
+     * @param entity entity
+     * @return saved entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public NotificationStatusEntity save(NotificationStatusEntity entity) {
+        NotificationStatusEntity db = selectOnKey(entity.getTargetId(), entity.getType(), entity.getUserId());
+        if (db == null) {
+            return insert(entity);
+        } else {
+            return update(entity);
+        }
+    }
+    /**
+     * Physical Delete.
+     * @param  targetId targetId
+     * @param  type type
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(Long targetId, Integer type, Integer userId) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_delete.sql");
+        executeUpdate(sql, targetId, type, userId);
+    }
+    /**
+     * Physical Delete.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void physicalDelete(NotificationStatusEntity entity) {
+        physicalDelete(entity.getTargetId(), entity.getType(), entity.getUserId());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param  targetId targetId
+     * @param  type type
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, Long targetId, Integer type, Integer userId) {
+        NotificationStatusEntity db = selectOnKey(targetId, type, userId);
+        db.setDeleteFlag(1);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * @param  targetId targetId
+     * @param  type type
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Long targetId, Integer type, Integer userId) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        delete(user, targetId, type, userId);
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(Integer user, NotificationStatusEntity entity) {
+        delete(user, entity.getTargetId(), entity.getType(), entity.getUserId());
+
+    }
+    /**
+     * Delete.
+     * if delete flag is exists, the data is logical delete.
+     * set saved user id.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void delete(NotificationStatusEntity entity) {
+        delete(entity.getTargetId(), entity.getType(), entity.getUserId());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param  targetId targetId
+     * @param  type type
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, Long targetId, Integer type, Integer userId) {
+        NotificationStatusEntity db = physicalSelectOnKey(targetId, type, userId);
+        db.setDeleteFlag(0);
+        db.setUpdateUser(user);
+        db.setUpdateDatetime(new Timestamp(DateUtils.now().getTime()));
+        physicalUpdate(db);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param  targetId targetId
+     * @param  type type
+     * @param  userId userId
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Long targetId, Integer type, Integer userId) {
+        DBUserPool pool = Container.getComp(DBUserPool.class);
+        Integer user = (Integer) pool.getUser();
+        activation(user, targetId, type, userId);
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * set saved user id.
+     * @param user saved userid
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(Integer user, NotificationStatusEntity entity) {
+        activation(user, entity.getTargetId(), entity.getType(), entity.getUserId());
+
+    }
+    /**
+     * Ativation.
+     * if delete flag is exists and delete flag is true, delete flug is false to activate.
+     * @param entity entity
+     */
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void activation(NotificationStatusEntity entity) {
+        activation(entity.getTargetId(), entity.getType(), entity.getUserId());
+
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/MailHookIgnoreConditionsEntity.java b/src/main/java/org/support/project/knowledge/entity/MailHookIgnoreConditionsEntity.java
new file mode 100644
index 000000000..c07a0277a
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/MailHookIgnoreConditionsEntity.java
@@ -0,0 +1,51 @@
+package org.support.project.knowledge.entity;
+
+import org.support.project.knowledge.entity.gen.GenMailHookIgnoreConditionsEntity;
+
+import java.util.List;
+import java.util.Map;
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import java.sql.Timestamp;
+
+
+/**
+ * メールから投稿の際の除外条件
+ */
+@DI(instance = Instance.Prototype)
+public class MailHookIgnoreConditionsEntity extends GenMailHookIgnoreConditionsEntity {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static MailHookIgnoreConditionsEntity get() {
+        return Container.getComp(MailHookIgnoreConditionsEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public MailHookIgnoreConditionsEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param conditionNo CONDITION_NO
+     * @param hookId HOOK_ID
+     * @param ignoreConditionNo IGNORE_CONDITION_NO
+     */
+
+    public MailHookIgnoreConditionsEntity(Integer conditionNo, Integer hookId, Integer ignoreConditionNo) {
+        super( conditionNo,  hookId,  ignoreConditionNo);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/NotificationStatusEntity.java b/src/main/java/org/support/project/knowledge/entity/NotificationStatusEntity.java
new file mode 100644
index 000000000..2c0040f01
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/NotificationStatusEntity.java
@@ -0,0 +1,51 @@
+package org.support.project.knowledge.entity;
+
+import org.support.project.knowledge.entity.gen.GenNotificationStatusEntity;
+
+import java.util.List;
+import java.util.Map;
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+import java.sql.Timestamp;
+
+
+/**
+ * いいねの通知状態
+ */
+@DI(instance = Instance.Prototype)
+public class NotificationStatusEntity extends GenNotificationStatusEntity {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static NotificationStatusEntity get() {
+        return Container.getComp(NotificationStatusEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public NotificationStatusEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param id ターゲットのID
+     * @param type 種類
+     * @param user 登録者
+     */
+
+    public NotificationStatusEntity(Long id, Integer type, Integer user) {
+        super( id,  type,  user);
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenMailHookIgnoreConditionsEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenMailHookIgnoreConditionsEntity.java
new file mode 100644
index 000000000..5b1ef716e
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenMailHookIgnoreConditionsEntity.java
@@ -0,0 +1,453 @@
+package org.support.project.knowledge.entity.gen;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+import java.sql.Timestamp;
+
+
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.common.validate.Validator;
+import org.support.project.common.validate.ValidatorFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+/**
+ * メールから投稿の際の除外条件
+ */
+@DI(instance = Instance.Prototype)
+public class GenMailHookIgnoreConditionsEntity implements Serializable {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenMailHookIgnoreConditionsEntity get() {
+        return Container.getComp(GenMailHookIgnoreConditionsEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public GenMailHookIgnoreConditionsEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param conditionNo CONDITION_NO
+     * @param hookId HOOK_ID
+     * @param ignoreConditionNo IGNORE_CONDITION_NO
+     */
+
+    public GenMailHookIgnoreConditionsEntity(Integer conditionNo, Integer hookId, Integer ignoreConditionNo) {
+        super();
+        this.conditionNo = conditionNo;
+        this.hookId = hookId;
+        this.ignoreConditionNo = ignoreConditionNo;
+    }
+    /** HOOK_ID */
+    private Integer hookId;
+    /** CONDITION_NO */
+    private Integer conditionNo;
+    /** IGNORE_CONDITION_NO */
+    private Integer ignoreConditionNo;
+    /** 条件の種類   1:宛先が「条件文字」であった場合 */
+    private Integer conditionKind;
+    /** 条件の文字 */
+    private String condition;
+    /** 登録ユーザ */
+    private Integer insertUser;
+    /** 登録日時 */
+    private Timestamp insertDatetime;
+    /** 更新ユーザ */
+    private Integer updateUser;
+    /** 更新日時 */
+    private Timestamp updateDatetime;
+    /** 削除フラグ */
+    private Integer deleteFlag;
+
+    /**
+     * Get HOOK_ID.
+     * @return HOOK_ID
+     */
+    public Integer getHookId() {
+        return this.hookId;
+    }
+    /**
+     * Set HOOK_ID.
+     * @param hookId HOOK_ID
+     * @return this object     */
+    public GenMailHookIgnoreConditionsEntity setHookId(Integer hookId) {
+        this.hookId = hookId;
+        return this;
+    }
+
+    /**
+     * Get CONDITION_NO.
+     * @return CONDITION_NO
+     */
+    public Integer getConditionNo() {
+        return this.conditionNo;
+    }
+    /**
+     * Set CONDITION_NO.
+     * @param conditionNo CONDITION_NO
+     * @return this object     */
+    public GenMailHookIgnoreConditionsEntity setConditionNo(Integer conditionNo) {
+        this.conditionNo = conditionNo;
+        return this;
+    }
+
+    /**
+     * Get IGNORE_CONDITION_NO.
+     * @return IGNORE_CONDITION_NO
+     */
+    public Integer getIgnoreConditionNo() {
+        return this.ignoreConditionNo;
+    }
+    /**
+     * Set IGNORE_CONDITION_NO.
+     * @param ignoreConditionNo IGNORE_CONDITION_NO
+     * @return this object     */
+    public GenMailHookIgnoreConditionsEntity setIgnoreConditionNo(Integer ignoreConditionNo) {
+        this.ignoreConditionNo = ignoreConditionNo;
+        return this;
+    }
+
+    /**
+     * Get 条件の種類   1:宛先が「条件文字」であった場合.
+     * @return 条件の種類   1:宛先が「条件文字」であった場合
+     */
+    public Integer getConditionKind() {
+        return this.conditionKind;
+    }
+    /**
+     * Set 条件の種類   1:宛先が「条件文字」であった場合.
+     * @param conditionKind 条件の種類   1:宛先が「条件文字」であった場合
+     * @return this object     */
+    public GenMailHookIgnoreConditionsEntity setConditionKind(Integer conditionKind) {
+        this.conditionKind = conditionKind;
+        return this;
+    }
+
+    /**
+     * Get 条件の文字.
+     * @return 条件の文字
+     */
+    public String getCondition() {
+        return this.condition;
+    }
+    /**
+     * Set 条件の文字.
+     * @param condition 条件の文字
+     * @return this object     */
+    public GenMailHookIgnoreConditionsEntity setCondition(String condition) {
+        this.condition = condition;
+        return this;
+    }
+
+    /**
+     * Get 登録ユーザ.
+     * @return 登録ユーザ
+     */
+    public Integer getInsertUser() {
+        return this.insertUser;
+    }
+    /**
+     * Set 登録ユーザ.
+     * @param insertUser 登録ユーザ
+     * @return this object     */
+    public GenMailHookIgnoreConditionsEntity setInsertUser(Integer insertUser) {
+        this.insertUser = insertUser;
+        return this;
+    }
+
+    /**
+     * Get 登録日時.
+     * @return 登録日時
+     */
+    public Timestamp getInsertDatetime() {
+        return this.insertDatetime;
+    }
+    /**
+     * Set 登録日時.
+     * @param insertDatetime 登録日時
+     * @return this object     */
+    public GenMailHookIgnoreConditionsEntity setInsertDatetime(Timestamp insertDatetime) {
+        this.insertDatetime = insertDatetime;
+        return this;
+    }
+
+    /**
+     * Get 更新ユーザ.
+     * @return 更新ユーザ
+     */
+    public Integer getUpdateUser() {
+        return this.updateUser;
+    }
+    /**
+     * Set 更新ユーザ.
+     * @param updateUser 更新ユーザ
+     * @return this object     */
+    public GenMailHookIgnoreConditionsEntity setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+        return this;
+    }
+
+    /**
+     * Get 更新日時.
+     * @return 更新日時
+     */
+    public Timestamp getUpdateDatetime() {
+        return this.updateDatetime;
+    }
+    /**
+     * Set 更新日時.
+     * @param updateDatetime 更新日時
+     * @return this object     */
+    public GenMailHookIgnoreConditionsEntity setUpdateDatetime(Timestamp updateDatetime) {
+        this.updateDatetime = updateDatetime;
+        return this;
+    }
+
+    /**
+     * Get 削除フラグ.
+     * @return 削除フラグ
+     */
+    public Integer getDeleteFlag() {
+        return this.deleteFlag;
+    }
+    /**
+     * Set 削除フラグ.
+     * @param deleteFlag 削除フラグ
+     * @return this object     */
+    public GenMailHookIgnoreConditionsEntity setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
+    /**
+     * Get key values 
+     * @return values 
+     */
+    public Object[] getKeyValues() {
+        Object[] keyValues = new Object[3];
+        keyValues[0] = this.conditionNo;
+        keyValues[1] = this.hookId;
+        keyValues[2] = this.ignoreConditionNo;
+        return keyValues;
+    }
+    /**
+     * Set key values 
+     * @param conditionNo CONDITION_NO
+     * @param hookId HOOK_ID
+     * @param ignoreConditionNo IGNORE_CONDITION_NO
+     */
+    public void setKeyValues(Integer conditionNo, Integer hookId, Integer ignoreConditionNo) {
+        this.conditionNo = conditionNo;
+        this.hookId = hookId;
+        this.ignoreConditionNo = ignoreConditionNo;
+    }
+    /**
+     * compare on key 
+     * @param entity entity 
+     * @return result 
+     */
+    public boolean equalsOnKey(GenMailHookIgnoreConditionsEntity entity) {
+        Object[] keyValues1 = getKeyValues();
+        Object[] keyValues2 = entity.getKeyValues();
+        for (int i = 0; i < keyValues1.length; i++) {
+            Object val1 = keyValues1[i];
+            Object val2 = keyValues2[i];
+            if (val1 == null && val2 != null) {
+                return false;
+            }
+            if (val1 != null && val2 == null) {
+                return false;
+            }
+            if (val1 != null && val2 != null) {
+                if (!val1.equals(val2)) {
+                    return false;
+                }
+            }
+            
+        }
+        return true;
+    }
+    /**
+     * ToString 
+     * @return string 
+     */
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("conditionNo = ").append(conditionNo).append("\n");
+        builder.append("hookId = ").append(hookId).append("\n");
+        builder.append("ignoreConditionNo = ").append(ignoreConditionNo).append("\n");
+        builder.append("conditionKind = ").append(conditionKind).append("\n");
+        builder.append("condition = ").append(condition).append("\n");
+        builder.append("insertUser = ").append(insertUser).append("\n");
+        builder.append("insertDatetime = ").append(insertDatetime).append("\n");
+        builder.append("updateUser = ").append(updateUser).append("\n");
+        builder.append("updateDatetime = ").append(updateDatetime).append("\n");
+        builder.append("deleteFlag = ").append(deleteFlag).append("\n");
+        return builder.toString();
+    }
+    /**
+     * Convert label to display 
+     * @param label label
+     * @return convert label 
+     */
+    protected String convLabelName(String label) {
+        return label;
+    }
+    /**
+     * validate 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate() {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.hookId, convLabelName("Hook Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.hookId, convLabelName("Hook Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.conditionNo, convLabelName("Condition No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.conditionNo, convLabelName("Condition No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.ignoreConditionNo, convLabelName("Ignore Condition No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.ignoreConditionNo, convLabelName("Ignore Condition No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.conditionKind, convLabelName("Condition Kind"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.conditionKind, convLabelName("Condition Kind"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.MAX_LENGTH);
+        error = validator.validate(this.condition, convLabelName("Condition"), 256);
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.insertUser, convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.updateUser, convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.deleteFlag, convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+    /**
+     * validate 
+     * @param values value map 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate(Map<String, String> values) {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("hookId"), convLabelName("Hook Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("hookId"), convLabelName("Hook Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("conditionNo"), convLabelName("Condition No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("conditionNo"), convLabelName("Condition No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("ignoreConditionNo"), convLabelName("Ignore Condition No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("ignoreConditionNo"), convLabelName("Ignore Condition No"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("conditionKind"), convLabelName("Condition Kind"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("conditionKind"), convLabelName("Condition Kind"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.MAX_LENGTH);
+        error = validator.validate(values.get("condition"), convLabelName("Condition"), 256);
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("updateUser"), convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("deleteFlag"), convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenNotificationStatusEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenNotificationStatusEntity.java
new file mode 100644
index 000000000..7a9acee67
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/entity/gen/GenNotificationStatusEntity.java
@@ -0,0 +1,404 @@
+package org.support.project.knowledge.entity.gen;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+import java.sql.Timestamp;
+
+
+
+import org.support.project.common.bean.ValidateError;
+import org.support.project.common.validate.Validator;
+import org.support.project.common.validate.ValidatorFactory;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+
+/**
+ * いいねの通知状態
+ */
+@DI(instance = Instance.Prototype)
+public class GenNotificationStatusEntity implements Serializable {
+
+    /** SerialVersion */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Get instance from DI container.
+     * @return instance
+     */
+    public static GenNotificationStatusEntity get() {
+        return Container.getComp(GenNotificationStatusEntity.class);
+    }
+
+    /**
+     * Constructor.
+     */
+    public GenNotificationStatusEntity() {
+        super();
+    }
+
+    /**
+     * Constructor
+     * @param targetId ターゲットのID
+     * @param type 種類
+     * @param userId 登録者
+     */
+
+    public GenNotificationStatusEntity(Long targetId, Integer type, Integer userId) {
+        super();
+        this.targetId = targetId;
+        this.type = type;
+        this.userId = userId;
+    }
+    /** 種類 */
+    private Integer type;
+    /** ターゲットのID */
+    private Long targetId;
+    /** 登録者 */
+    private Integer userId;
+    /** 通知の状態 */
+    private Integer status;
+    /** 登録ユーザ */
+    private Integer insertUser;
+    /** 登録日時 */
+    private Timestamp insertDatetime;
+    /** 更新ユーザ */
+    private Integer updateUser;
+    /** 更新日時 */
+    private Timestamp updateDatetime;
+    /** 削除フラグ */
+    private Integer deleteFlag;
+
+    /**
+     * Get 種類.
+     * @return 種類
+     */
+    public Integer getType() {
+        return this.type;
+    }
+    /**
+     * Set 種類.
+     * @param type 種類
+     * @return this object     */
+    public GenNotificationStatusEntity setType(Integer type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get ターゲットのID.
+     * @return ターゲットのID
+     */
+    public Long getTargetId() {
+        return this.targetId;
+    }
+    /**
+     * Set ターゲットのID.
+     * @param targetId ターゲットのID
+     * @return this object     */
+    public GenNotificationStatusEntity setTargetId(Long targetId) {
+        this.targetId = targetId;
+        return this;
+    }
+
+    /**
+     * Get 登録者.
+     * @return 登録者
+     */
+    public Integer getUserId() {
+        return this.userId;
+    }
+    /**
+     * Set 登録者.
+     * @param userId 登録者
+     * @return this object     */
+    public GenNotificationStatusEntity setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    /**
+     * Get 通知の状態.
+     * @return 通知の状態
+     */
+    public Integer getStatus() {
+        return this.status;
+    }
+    /**
+     * Set 通知の状態.
+     * @param status 通知の状態
+     * @return this object     */
+    public GenNotificationStatusEntity setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get 登録ユーザ.
+     * @return 登録ユーザ
+     */
+    public Integer getInsertUser() {
+        return this.insertUser;
+    }
+    /**
+     * Set 登録ユーザ.
+     * @param insertUser 登録ユーザ
+     * @return this object     */
+    public GenNotificationStatusEntity setInsertUser(Integer insertUser) {
+        this.insertUser = insertUser;
+        return this;
+    }
+
+    /**
+     * Get 登録日時.
+     * @return 登録日時
+     */
+    public Timestamp getInsertDatetime() {
+        return this.insertDatetime;
+    }
+    /**
+     * Set 登録日時.
+     * @param insertDatetime 登録日時
+     * @return this object     */
+    public GenNotificationStatusEntity setInsertDatetime(Timestamp insertDatetime) {
+        this.insertDatetime = insertDatetime;
+        return this;
+    }
+
+    /**
+     * Get 更新ユーザ.
+     * @return 更新ユーザ
+     */
+    public Integer getUpdateUser() {
+        return this.updateUser;
+    }
+    /**
+     * Set 更新ユーザ.
+     * @param updateUser 更新ユーザ
+     * @return this object     */
+    public GenNotificationStatusEntity setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+        return this;
+    }
+
+    /**
+     * Get 更新日時.
+     * @return 更新日時
+     */
+    public Timestamp getUpdateDatetime() {
+        return this.updateDatetime;
+    }
+    /**
+     * Set 更新日時.
+     * @param updateDatetime 更新日時
+     * @return this object     */
+    public GenNotificationStatusEntity setUpdateDatetime(Timestamp updateDatetime) {
+        this.updateDatetime = updateDatetime;
+        return this;
+    }
+
+    /**
+     * Get 削除フラグ.
+     * @return 削除フラグ
+     */
+    public Integer getDeleteFlag() {
+        return this.deleteFlag;
+    }
+    /**
+     * Set 削除フラグ.
+     * @param deleteFlag 削除フラグ
+     * @return this object     */
+    public GenNotificationStatusEntity setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
+    /**
+     * Get key values 
+     * @return values 
+     */
+    public Object[] getKeyValues() {
+        Object[] keyValues = new Object[3];
+        keyValues[0] = this.targetId;
+        keyValues[1] = this.type;
+        keyValues[2] = this.userId;
+        return keyValues;
+    }
+    /**
+     * Set key values 
+     * @param targetId ターゲットのID
+     * @param type 種類
+     * @param userId 登録者
+     */
+    public void setKeyValues(Long targetId, Integer type, Integer userId) {
+        this.targetId = targetId;
+        this.type = type;
+        this.userId = userId;
+    }
+    /**
+     * compare on key 
+     * @param entity entity 
+     * @return result 
+     */
+    public boolean equalsOnKey(GenNotificationStatusEntity entity) {
+        Object[] keyValues1 = getKeyValues();
+        Object[] keyValues2 = entity.getKeyValues();
+        for (int i = 0; i < keyValues1.length; i++) {
+            Object val1 = keyValues1[i];
+            Object val2 = keyValues2[i];
+            if (val1 == null && val2 != null) {
+                return false;
+            }
+            if (val1 != null && val2 == null) {
+                return false;
+            }
+            if (val1 != null && val2 != null) {
+                if (!val1.equals(val2)) {
+                    return false;
+                }
+            }
+            
+        }
+        return true;
+    }
+    /**
+     * ToString 
+     * @return string 
+     */
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("targetId = ").append(targetId).append("\n");
+        builder.append("type = ").append(type).append("\n");
+        builder.append("userId = ").append(userId).append("\n");
+        builder.append("status = ").append(status).append("\n");
+        builder.append("insertUser = ").append(insertUser).append("\n");
+        builder.append("insertDatetime = ").append(insertDatetime).append("\n");
+        builder.append("updateUser = ").append(updateUser).append("\n");
+        builder.append("updateDatetime = ").append(updateDatetime).append("\n");
+        builder.append("deleteFlag = ").append(deleteFlag).append("\n");
+        return builder.toString();
+    }
+    /**
+     * Convert label to display 
+     * @param label label
+     * @return convert label 
+     */
+    protected String convLabelName(String label) {
+        return label;
+    }
+    /**
+     * validate 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate() {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.type, convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.type, convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.targetId, convLabelName("Target Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(this.userId, convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.userId, convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.status, convLabelName("Status"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.insertUser, convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.updateUser, convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(this.deleteFlag, convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+    /**
+     * validate 
+     * @param values value map 
+     * @return validate error list 
+     */
+    public List<ValidateError> validate(Map<String, String> values) {
+        List<ValidateError> errors = new ArrayList<>();
+        Validator validator;
+        ValidateError error;
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("type"), convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("type"), convLabelName("Type"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("targetId"), convLabelName("Target Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.REQUIRED);
+        error = validator.validate(values.get("userId"), convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("userId"), convLabelName("User Id"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("status"), convLabelName("Status"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("insertUser"), convLabelName("Insert User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("updateUser"), convLabelName("Update User"));
+        if (error != null) {
+            errors.add(error);
+        }
+        validator = ValidatorFactory.getInstance(Validator.INTEGER);
+        error = validator.validate(values.get("deleteFlag"), convLabelName("Delete Flag"));
+        if (error != null) {
+            errors.add(error);
+        }
+        return errors;
+    }
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
index 85e9f74b1..ded6eb270 100644
--- a/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
+++ b/src/main/java/org/support/project/knowledge/logic/notification/LikeInsertNotification.java
@@ -90,6 +90,11 @@ public void notify(NotifyQueuesEntity notifyQueue) throws Exception {
             LOG.warn("Like record not found. id: " + notifyQueue.getId());
             return;
         }
+        
+        // 同一ユーザでは、イイネの通知は１回きりにする
+        
+        
+        
 
         KnowledgesDao knowledgesDao = KnowledgesDao.get();
         KnowledgesEntity knowledge = knowledgesDao.selectOnKey(like.getKnowledgeId());
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_delete.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_delete.sql
new file mode 100644
index 000000000..c7ea88beb
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_delete.sql
@@ -0,0 +1,6 @@
+DELETE FROM MAIL_HOOK_IGNORE_CONDITIONS
+WHERE 
+CONDITION_NO = ?
+ AND HOOK_ID = ?
+ AND IGNORE_CONDITION_NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_insert.sql
new file mode 100644
index 000000000..69a692a00
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_insert.sql
@@ -0,0 +1,24 @@
+INSERT INTO MAIL_HOOK_IGNORE_CONDITIONS
+( 
+CONDITION_NO
+ , HOOK_ID
+ , IGNORE_CONDITION_NO
+ , CONDITION_KIND
+ , CONDITION
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_all.sql
new file mode 100644
index 000000000..774463af0
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_all.sql
@@ -0,0 +1,2 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_all_with_pager.sql
new file mode 100644
index 000000000..201f9da59
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_all_with_pager.sql
@@ -0,0 +1,3 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+ORDER BY INSERT_DATETIME %s
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_condition_no.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_condition_no.sql
new file mode 100644
index 000000000..46bc77246
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_condition_no.sql
@@ -0,0 +1,4 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+ WHERE 
+CONDITION_NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_hook_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_hook_id.sql
new file mode 100644
index 000000000..97e5babf3
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_hook_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+ WHERE 
+HOOK_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_ignore_condition_no.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_ignore_condition_no.sql
new file mode 100644
index 000000000..7723258bc
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_ignore_condition_no.sql
@@ -0,0 +1,4 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+ WHERE 
+IGNORE_CONDITION_NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_key.sql
new file mode 100644
index 000000000..28fd46afe
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_physical_select_on_key.sql
@@ -0,0 +1,6 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+ WHERE 
+CONDITION_NO = ?
+ AND HOOK_ID = ?
+ AND IGNORE_CONDITION_NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_raw_insert.sql
new file mode 100644
index 000000000..69a692a00
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_raw_insert.sql
@@ -0,0 +1,24 @@
+INSERT INTO MAIL_HOOK_IGNORE_CONDITIONS
+( 
+CONDITION_NO
+ , HOOK_ID
+ , IGNORE_CONDITION_NO
+ , CONDITION_KIND
+ , CONDITION
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_all.sql
new file mode 100644
index 000000000..1c25609c9
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_all.sql
@@ -0,0 +1,3 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_all_with_pager.sql
new file mode 100644
index 000000000..5a443dde7
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_all_with_pager.sql
@@ -0,0 +1,4 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME %s
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_count_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_count_all.sql
new file mode 100644
index 000000000..60f550e7e
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_count_all.sql
@@ -0,0 +1,2 @@
+SELECT COUNT(*) FROM MAIL_HOOK_IGNORE_CONDITIONS
+WHERE DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_condition_no.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_condition_no.sql
new file mode 100644
index 000000000..b351b19f0
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_condition_no.sql
@@ -0,0 +1,4 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+ WHERE 
+CONDITION_NO = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_hook_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_hook_id.sql
new file mode 100644
index 000000000..6dcddf1fa
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_hook_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+ WHERE 
+HOOK_ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_ignore_condition_no.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_ignore_condition_no.sql
new file mode 100644
index 000000000..ae71c6390
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_ignore_condition_no.sql
@@ -0,0 +1,4 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+ WHERE 
+IGNORE_CONDITION_NO = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_key.sql
new file mode 100644
index 000000000..592fbd2ba
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_select_on_key.sql
@@ -0,0 +1,6 @@
+SELECT * FROM MAIL_HOOK_IGNORE_CONDITIONS
+ WHERE 
+CONDITION_NO = ?
+ AND HOOK_ID = ?
+ AND IGNORE_CONDITION_NO = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_update.sql
new file mode 100644
index 000000000..a803a807b
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/MailHookIgnoreConditionsDao/MailHookIgnoreConditionsDao_update.sql
@@ -0,0 +1,14 @@
+UPDATE MAIL_HOOK_IGNORE_CONDITIONS
+SET 
+   CONDITION_KIND = ?
+ , CONDITION = ?
+ , INSERT_USER = ?
+ , INSERT_DATETIME = ?
+ , UPDATE_USER = ?
+ , UPDATE_DATETIME = ?
+ , DELETE_FLAG = ?
+WHERE 
+CONDITION_NO = ?
+ AND HOOK_ID = ?
+ AND IGNORE_CONDITION_NO = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_delete.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_delete.sql
new file mode 100644
index 000000000..1098a665e
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_delete.sql
@@ -0,0 +1,6 @@
+DELETE FROM NOTIFICATION_STATUS
+WHERE 
+TARGET_ID = ?
+ AND TYPE = ?
+ AND USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_insert.sql
new file mode 100644
index 000000000..8cc13cfa9
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_insert.sql
@@ -0,0 +1,22 @@
+INSERT INTO NOTIFICATION_STATUS
+( 
+TARGET_ID
+ , TYPE
+ , USER_ID
+ , STATUS
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_all.sql
new file mode 100644
index 000000000..fecc7eacd
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_all.sql
@@ -0,0 +1,2 @@
+SELECT * FROM NOTIFICATION_STATUS
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_all_with_pager.sql
new file mode 100644
index 000000000..692c5cce6
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_all_with_pager.sql
@@ -0,0 +1,3 @@
+SELECT * FROM NOTIFICATION_STATUS
+ORDER BY INSERT_DATETIME %s
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_id.sql
new file mode 100644
index 000000000..ba388bba5
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_key.sql
new file mode 100644
index 000000000..d5c980226
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_key.sql
@@ -0,0 +1,6 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+TARGET_ID = ?
+ AND TYPE = ?
+ AND USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_target_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_target_id.sql
new file mode 100644
index 000000000..c183fc2fa
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_target_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+TARGET_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_type.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_type.sql
new file mode 100644
index 000000000..72d33dffb
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_type.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+TYPE = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_user.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_user.sql
new file mode 100644
index 000000000..a8aba77e3
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_user.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+USER = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_user_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_user_id.sql
new file mode 100644
index 000000000..551bd000e
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_physical_select_on_user_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_raw_insert.sql
new file mode 100644
index 000000000..8cc13cfa9
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_raw_insert.sql
@@ -0,0 +1,22 @@
+INSERT INTO NOTIFICATION_STATUS
+( 
+TARGET_ID
+ , TYPE
+ , USER_ID
+ , STATUS
+ , INSERT_USER
+ , INSERT_DATETIME
+ , UPDATE_USER
+ , UPDATE_DATETIME
+ , DELETE_FLAG
+) VALUES (
+?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+ , ?
+);
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_all.sql
new file mode 100644
index 000000000..84d4e3efb
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_all.sql
@@ -0,0 +1,3 @@
+SELECT * FROM NOTIFICATION_STATUS
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME %s;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_all_with_pager.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_all_with_pager.sql
new file mode 100644
index 000000000..1ff44cc6d
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_all_with_pager.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+WHERE DELETE_FLAG = 0
+ORDER BY INSERT_DATETIME %s
+LIMIT ? OFFSET ?;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_count_all.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_count_all.sql
new file mode 100644
index 000000000..aff8f34db
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_count_all.sql
@@ -0,0 +1,2 @@
+SELECT COUNT(*) FROM NOTIFICATION_STATUS
+WHERE DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_id.sql
new file mode 100644
index 000000000..70f8092d8
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_key.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_key.sql
new file mode 100644
index 000000000..c702833af
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_key.sql
@@ -0,0 +1,6 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+TARGET_ID = ?
+ AND TYPE = ?
+ AND USER_ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_target_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_target_id.sql
new file mode 100644
index 000000000..25616e354
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_target_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+TARGET_ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_type.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_type.sql
new file mode 100644
index 000000000..92cf7d607
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_type.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+TYPE = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_user.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_user.sql
new file mode 100644
index 000000000..802ede629
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_user.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+USER = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_user_id.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_user_id.sql
new file mode 100644
index 000000000..bd9904403
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_select_on_user_id.sql
@@ -0,0 +1,4 @@
+SELECT * FROM NOTIFICATION_STATUS
+ WHERE 
+USER_ID = ?
+ AND DELETE_FLAG = 0;
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_update.sql
new file mode 100644
index 000000000..caf9af8b5
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/NotificationStatusDao/NotificationStatusDao_update.sql
@@ -0,0 +1,13 @@
+UPDATE NOTIFICATION_STATUS
+SET 
+   STATUS = ?
+ , INSERT_USER = ?
+ , INSERT_DATETIME = ?
+ , UPDATE_USER = ?
+ , UPDATE_DATETIME = ?
+ , DELETE_FLAG = ?
+WHERE 
+TARGET_ID = ?
+ AND TYPE = ?
+ AND USER_ID = ?
+;
diff --git a/src/main/resources/org/support/project/knowledge/database/ddl.sql b/src/main/resources/org/support/project/knowledge/database/ddl.sql
index 9b38d1985..8b0e9fe1f 100644
--- a/src/main/resources/org/support/project/knowledge/database/ddl.sql
+++ b/src/main/resources/org/support/project/knowledge/database/ddl.sql
@@ -1,3 +1,36 @@
+-- いいねの通知状態
+drop table if exists NOTIFICATION_STATUS cascade;
+
+create table NOTIFICATION_STATUS (
+  TYPE integer not null
+  , TARGET_ID bigint not null
+  , USER_ID integer not null
+  , STATUS integer
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint NOTIFICATION_STATUS_PKC primary key (TYPE,TARGET_ID,USER_ID)
+) ;
+
+-- メールから投稿の際の除外条件
+drop table if exists MAIL_HOOK_IGNORE_CONDITIONS cascade;
+
+create table MAIL_HOOK_IGNORE_CONDITIONS (
+  HOOK_ID INTEGER not null
+  , CONDITION_NO integer not null
+  , IGNORE_CONDITION_NO integer not null
+  , CONDITION_KIND integer not null
+  , CONDITION character varying(256)
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint MAIL_HOOK_IGNORE_CONDITIONS_PKC primary key (HOOK_ID,CONDITION_NO,IGNORE_CONDITION_NO)
+) ;
+
 -- ユーザのポイント獲得履歴
 drop table if exists POINT_USER_HISTORIES cascade;
 
@@ -860,6 +893,29 @@ create table KNOWLEDGES (
   , constraint KNOWLEDGES_PKC primary key (KNOWLEDGE_ID)
 ) ;
 
+comment on table NOTIFICATION_STATUS is 'いいねの通知状態';
+comment on column NOTIFICATION_STATUS.TYPE is '種類';
+comment on column NOTIFICATION_STATUS.TARGET_ID is 'ターゲットのID';
+comment on column NOTIFICATION_STATUS.USER_ID is '登録者';
+comment on column NOTIFICATION_STATUS.STATUS is '通知の状態';
+comment on column NOTIFICATION_STATUS.INSERT_USER is '登録ユーザ';
+comment on column NOTIFICATION_STATUS.INSERT_DATETIME is '登録日時';
+comment on column NOTIFICATION_STATUS.UPDATE_USER is '更新ユーザ';
+comment on column NOTIFICATION_STATUS.UPDATE_DATETIME is '更新日時';
+comment on column NOTIFICATION_STATUS.DELETE_FLAG is '削除フラグ';
+
+comment on table MAIL_HOOK_IGNORE_CONDITIONS is 'メールから投稿の際の除外条件';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.HOOK_ID is 'HOOK_ID';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.CONDITION_NO is 'CONDITION_NO';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.IGNORE_CONDITION_NO is 'IGNORE_CONDITION_NO';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.CONDITION_KIND is '条件の種類   1:宛先が「条件文字」であった場合';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.CONDITION is '条件の文字';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.INSERT_USER is '登録ユーザ';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.INSERT_DATETIME is '登録日時';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.UPDATE_USER is '更新ユーザ';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.UPDATE_DATETIME is '更新日時';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.DELETE_FLAG is '削除フラグ';
+
 comment on table POINT_USER_HISTORIES is 'ユーザのポイント獲得履歴';
 comment on column POINT_USER_HISTORIES.USER_ID is 'ユーザID';
 comment on column POINT_USER_HISTORIES.HISTORY_NO is '履歴番号';
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
index c39e628c3..ba3732456 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
@@ -445,7 +445,7 @@ public void testReLikeByLoginUser1() throws Exception {
 
         execNotificationQueue();
         assertNotificationCount(COMMENT_POST_USER, 0);
-        assertNotificationCount(KNOWLEDGE_POST_USER, 1);
+        assertNotificationCount(KNOWLEDGE_POST_USER, 0);
     }
     
     

From 51dffcb686e825715c404dc2ffe003d31a06ba88 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 9 Oct 2017 13:21:31 +0900
Subject: [PATCH 115/138] #877 Add migration script

---
 pom.xml                                       |   2 +-
 .../control/open/KnowledgeControl.java        |   8 +-
 .../project/knowledge/deploy/InitDB.java      |   4 +-
 .../deploy/v1_11_0/Migrate_1_11_3.java        |   2 +-
 .../deploy/v1_12/Migrate_1_12_0.java          |  21 +++
 .../knowledge/logic/KnowledgeLogic.java       |  99 ------------
 .../project/knowledge/logic/LikeLogic.java    | 144 ++++++++++++++++++
 src/main/resources/appresource.properties     |   2 +-
 src/main/resources/appresource_ja.properties  |   2 +-
 .../deploy/v1_11_0/migrate_v1_11_3.sql        |  11 ++
 .../deploy/v1_12/migrate_v1_12_0.sql          |  57 ++++++-
 .../knowledge/dao/KnowledgesDaoTest.java      |   5 +-
 .../integration/IntegrationPostTest.java      |   5 +-
 .../CommentLikedNotificationTest.java         |   3 +-
 .../LikeInsertNotificationTest.java           |   4 +-
 15 files changed, 245 insertions(+), 124 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java
 create mode 100644 src/main/java/org/support/project/knowledge/logic/LikeLogic.java
 create mode 100644 src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_3.sql

diff --git a/pom.xml b/pom.xml
index 102761664..fa37d9c8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.support-project</groupId>
     <artifactId>knowledge</artifactId>
-    <version>1.11.1-SNAPSHOT</version>
+    <version>1.12.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>knowledge</name>
diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index f05558c33..461ff938a 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -45,6 +45,7 @@
 import org.support.project.knowledge.logic.GroupLogic;
 import org.support.project.knowledge.logic.KeywordLogic;
 import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.LikeLogic;
 import org.support.project.knowledge.logic.MarkdownLogic;
 import org.support.project.knowledge.logic.TagLogic;
 import org.support.project.knowledge.logic.TargetLogic;
@@ -661,8 +662,7 @@ public Boundary stocks() throws InvalidParamException {
     @Post(subscribeToken="knowledge")
     public Boundary like() throws InvalidParamException {
         Long knowledgeId = super.getPathLong(Long.valueOf(-1));
-        KnowledgeLogic knowledgeLogic = KnowledgeLogic.get();
-        Long count = knowledgeLogic.addLike(knowledgeId, getLoginedUser(), getLocale());
+        Long count = LikeLogic.get().addLike(knowledgeId, getLoginedUser(), getLocale());
         LikeCount likeCount = new LikeCount();
         likeCount.setKnowledgeId(knowledgeId);
         likeCount.setCount(count);
@@ -676,11 +676,9 @@ public Boundary like() throws InvalidParamException {
     @Post(subscribeToken="knowledge")
     public Boundary likecomment() throws InvalidParamException {
         Long commentNo = super.getPathLong(Long.valueOf(-1));
-        KnowledgeLogic knowledgeLogic = KnowledgeLogic.get();
-        Long count = knowledgeLogic.addLikeComment(commentNo, getLoginedUser(), getLocale());
+        Long count = LikeLogic.get().addLikeComment(commentNo, getLoginedUser(), getLocale());
         LikeCount likeCount = new LikeCount();
         likeCount.setCount(count);
-        
         return send(likeCount);
     }
 
diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
index 92a71f12f..1f702a85d 100644
--- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java
+++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
@@ -26,6 +26,7 @@
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_1;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_2;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_3;
+import org.support.project.knowledge.deploy.v1_12.Migrate_1_12_0;
 import org.support.project.knowledge.deploy.v1_1_0pre1.Migrate_1_1_0pre1;
 import org.support.project.knowledge.deploy.v1_4_0.Migrate_1_4_0;
 import org.support.project.knowledge.deploy.v1_5_0.Migrate_1_5_0;
@@ -51,7 +52,7 @@ public class InitDB {
     private static final Map<String, Migrate> MAP = new LinkedHashMap<>();
 
     private static final Migrate INIT = InitializeSystem.get();
-    public static final String CURRENT = "1.11.3";
+    public static final String CURRENT = "1.12.0";
 
     public InitDB() {
         super();
@@ -85,6 +86,7 @@ public InitDB() {
         MAP.put("1.11.1", Migrate_1_11_1.get());
         MAP.put("1.11.2", Migrate_1_11_2.get());
         MAP.put("1.11.3", Migrate_1_11_3.get());
+        MAP.put("1.12.0", Migrate_1_12_0.get());
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java
index b5a53023e..05ffb887f 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java
@@ -13,7 +13,7 @@ public static Migrate_1_11_3 get() {
     public boolean doMigrate() throws Exception {
         InitializeDao initializeDao = InitializeDao.get();
         String[] sqlpaths = {
-            "/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql",
+            "/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_3.sql",
         };
         initializeDao.initializeDatabase(sqlpaths);
         return true;
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java b/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java
new file mode 100644
index 000000000..aa18566d8
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java
@@ -0,0 +1,21 @@
+package org.support.project.knowledge.deploy.v1_12;
+
+import org.support.project.knowledge.deploy.Migrate;
+import org.support.project.ormapping.tool.dao.InitializeDao;
+
+public class Migrate_1_12_0 implements Migrate {
+
+    public static Migrate_1_12_0 get() {
+        return org.support.project.di.Container.getComp(Migrate_1_12_0.class);
+    }
+
+    @Override
+    public boolean doMigrate() throws Exception {
+        InitializeDao initializeDao = InitializeDao.get();
+        String[] sqlpaths = {
+            "/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql",
+        };
+        initializeDao.initializeDatabase(sqlpaths);
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
index 7cac9f684..ed229cda2 100644
--- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java
@@ -5,11 +5,9 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import org.support.project.aop.Aspect;
-import org.support.project.common.config.Resources;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.DateUtils;
@@ -21,7 +19,6 @@
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.bat.FileParseBat;
-import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.IndexType;
 import org.support.project.knowledge.config.SystemConfig;
 import org.support.project.knowledge.dao.CommentsDao;
@@ -37,7 +34,6 @@
 import org.support.project.knowledge.dao.KnowledgeTagsDao;
 import org.support.project.knowledge.dao.KnowledgeUsersDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
-import org.support.project.knowledge.dao.LikeCommentsDao;
 import org.support.project.knowledge.dao.LikesDao;
 import org.support.project.knowledge.dao.StockKnowledgesDao;
 import org.support.project.knowledge.dao.StocksDao;
@@ -56,8 +52,6 @@
 import org.support.project.knowledge.entity.KnowledgeTagsEntity;
 import org.support.project.knowledge.entity.KnowledgeUsersEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
-import org.support.project.knowledge.entity.LikeCommentsEntity;
-import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.StocksEntity;
 import org.support.project.knowledge.entity.TagsEntity;
 import org.support.project.knowledge.entity.TemplateItemsEntity;
@@ -75,14 +69,8 @@
 import org.support.project.knowledge.vo.StockKnowledge;
 import org.support.project.web.bean.LabelValue;
 import org.support.project.web.bean.LoginedUser;
-import org.support.project.web.bean.MessageResult;
-import org.support.project.web.common.HttpStatus;
-import org.support.project.web.config.MessageStatus;
-import org.support.project.web.dao.SystemConfigsDao;
 import org.support.project.web.entity.GroupsEntity;
-import org.support.project.web.entity.SystemConfigsEntity;
 import org.support.project.web.exception.AuthenticateException;
-import org.support.project.web.exception.InvalidParamException;
 
 /**
  * Logic class for knowledge data
@@ -1131,93 +1119,6 @@ public void addViewHistory(Long knowledgeId, LoginedUser loginedUser) {
             KnowledgesDao.get().updateViewCount(count, knowledgeId);
         }
     }
-    
-    /**
-     * イイネの重複チェックを行うかをシステム設定情報から取得
-     * @return
-     */
-    private boolean getCheckOfLike() {
-        boolean check = false;
-        SystemConfigsEntity config = SystemConfigsDao.get().selectOnKey(SystemConfig.LIKE_CONFIG, AppConfig.get().getSystemName());
-        if (config != null) {
-            if (SystemConfig.LIKE_CONFIG_ONLY_ONE.equals(config.getConfigValue())) {
-                check = true;
-            }
-        }
-        return check;
-    }
-    /**
-     * いいね！を追加
-     * 
-     * @param knowledgeId
-     * @param loginedUser
-     * @return
-     * @throws InvalidParamException 
-     */
-    public Long addLike(Long knowledgeId, LoginedUser loginedUser, Locale locale) throws InvalidParamException {
-        if (getCheckOfLike()) {
-            Resources resources = Resources.getInstance(locale);
-            if (loginedUser == null || loginedUser.getUserId().equals(Integer.MIN_VALUE)) {
-                throw new InvalidParamException(new MessageResult(
-                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.required.signin"), ""));
-            }
-            LikesEntity likesEntity = LikesDao.get().selectExistsOnUser(knowledgeId, loginedUser.getUserId());
-            if (likesEntity != null) {
-                throw new InvalidParamException(new MessageResult(
-                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.duplicate"), ""));
-            }
-        }
-        LikesDao likesDao = LikesDao.get();
-        LikesEntity likesEntity = new LikesEntity();
-        likesEntity.setKnowledgeId(knowledgeId);
-        likesDao.insert(likesEntity);
-
-        updateKnowledgeExInfo(knowledgeId);
-
-        Long count = likesDao.countOnKnowledgeId(knowledgeId);
-
-        // 通知
-        NotifyLogic.get().notifyOnKnowledgeLiked(knowledgeId, likesEntity);
-
-        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, loginedUser, DateUtils.now(),
-                KnowledgesDao.get().selectOnKey(knowledgeId));
-
-        return count;
-    }
-    /**
-     * コメントにイイネを追加
-     * @param commentNo
-     * @param loginedUser
-     * @return
-     * @throws InvalidParamException 
-     */
-    public Long addLikeComment(Long commentNo, LoginedUser loginedUser, Locale locale) throws InvalidParamException {
-        if (getCheckOfLike()) {
-            Resources resources = Resources.getInstance(locale);
-            if (loginedUser == null || loginedUser.getUserId().equals(Integer.MIN_VALUE)) {
-                throw new InvalidParamException(new MessageResult(
-                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.required.signin"), ""));
-            }
-            LikeCommentsEntity like = LikeCommentsDao.get().selectExistsOnUser(commentNo, loginedUser.getUserId());
-            if (like != null) {
-                throw new InvalidParamException(new MessageResult(
-                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.duplicate"), ""));
-            }
-        }
-        LikeCommentsEntity like = new LikeCommentsEntity();
-        like.setCommentNo(commentNo);
-        like = LikeCommentsDao.get().insert(like);
-        Long count = LikeCommentsDao.get().selectOnCommentNo(commentNo);
-        
-        // 通知
-        NotifyLogic.get().notifyOnCommentLiked(like);
-
-        ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, loginedUser, DateUtils.now(),
-                CommentsDao.get().selectOnKey(commentNo));
-
-        return count;
-    }
-    
 
     /**
      * ナレッジテーブルの タグやイイネ件数、コメント件数などの付加情報を 更新する（一覧表示用）
diff --git a/src/main/java/org/support/project/knowledge/logic/LikeLogic.java b/src/main/java/org/support/project/knowledge/logic/LikeLogic.java
new file mode 100644
index 000000000..18531afb1
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/LikeLogic.java
@@ -0,0 +1,144 @@
+package org.support.project.knowledge.logic;
+
+import java.util.Locale;
+
+import org.support.project.common.config.Resources;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.DateUtils;
+import org.support.project.di.Container;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.SystemConfig;
+import org.support.project.knowledge.dao.CommentsDao;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.LikeCommentsDao;
+import org.support.project.knowledge.dao.LikesDao;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
+import org.support.project.knowledge.entity.LikesEntity;
+import org.support.project.knowledge.logic.activity.Activity;
+import org.support.project.knowledge.logic.activity.ActivityLogic;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.bean.MessageResult;
+import org.support.project.web.common.HttpStatus;
+import org.support.project.web.config.MessageStatus;
+import org.support.project.web.dao.SystemConfigsDao;
+import org.support.project.web.entity.SystemConfigsEntity;
+import org.support.project.web.exception.InvalidParamException;
+
+public class LikeLogic {
+    /** LOG */
+    private static final Log LOG = LogFactory.getLog(LikeLogic.class);
+    /** Get instance */
+    public static LikeLogic get() {
+        return Container.getComp(LikeLogic.class);
+    }
+
+    
+    /**
+     * イイネの重複チェックを行うかをシステム設定情報から取得
+     * @return
+     */
+    private boolean getCheckOfLike() {
+        boolean check = false;
+        SystemConfigsEntity config = SystemConfigsDao.get().selectOnKey(SystemConfig.LIKE_CONFIG, AppConfig.get().getSystemName());
+        if (config != null) {
+            if (SystemConfig.LIKE_CONFIG_ONLY_ONE.equals(config.getConfigValue())) {
+                check = true;
+            }
+        }
+        return check;
+    }
+
+    private boolean duplicateLike(Long knowledgeId, Integer userId) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+    private boolean duplicateLikeComment(Long commentNo, Integer userId) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    
+    /**
+     * いいね！を追加
+     * 
+     * @param knowledgeId
+     * @param loginedUser
+     * @return
+     * @throws InvalidParamException 
+     */
+    public Long addLike(Long knowledgeId, LoginedUser loginedUser, Locale locale) throws InvalidParamException {
+        LOG.debug("start addLike");
+        if (getCheckOfLike()) {
+            Resources resources = Resources.getInstance(locale);
+            if (loginedUser == null || loginedUser.getUserId().equals(Integer.MIN_VALUE)) {
+                throw new InvalidParamException(new MessageResult(
+                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.required.signin"), ""));
+            }
+            LikesEntity likesEntity = LikesDao.get().selectExistsOnUser(knowledgeId, loginedUser.getUserId());
+            if (likesEntity != null) {
+                throw new InvalidParamException(new MessageResult(
+                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.duplicate"), ""));
+            }
+        }
+        LikesDao likesDao = LikesDao.get();
+        LikesEntity likesEntity = new LikesEntity();
+        likesEntity.setKnowledgeId(knowledgeId);
+        likesDao.insert(likesEntity);
+        
+        KnowledgeLogic.get().updateKnowledgeExInfo(knowledgeId);
+
+        Long count = likesDao.countOnKnowledgeId(knowledgeId);
+
+        // 通知
+        if (!duplicateLike(knowledgeId, loginedUser.getUserId())) {
+            NotifyLogic.get().notifyOnKnowledgeLiked(knowledgeId, likesEntity);
+        }
+
+        ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, loginedUser, DateUtils.now(),
+                KnowledgesDao.get().selectOnKey(knowledgeId));
+
+        return count;
+    }
+
+
+    /**
+     * コメントにイイネを追加
+     * @param commentNo
+     * @param loginedUser
+     * @return
+     * @throws InvalidParamException 
+     */
+    public Long addLikeComment(Long commentNo, LoginedUser loginedUser, Locale locale) throws InvalidParamException {
+        LOG.debug("start addLikeComment");
+        if (getCheckOfLike()) {
+            Resources resources = Resources.getInstance(locale);
+            if (loginedUser == null || loginedUser.getUserId().equals(Integer.MIN_VALUE)) {
+                throw new InvalidParamException(new MessageResult(
+                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.required.signin"), ""));
+            }
+            LikeCommentsEntity like = LikeCommentsDao.get().selectExistsOnUser(commentNo, loginedUser.getUserId());
+            if (like != null) {
+                throw new InvalidParamException(new MessageResult(
+                        MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.likes.duplicate"), ""));
+            }
+        }
+        LikeCommentsEntity like = new LikeCommentsEntity();
+        like.setCommentNo(commentNo);
+        like = LikeCommentsDao.get().insert(like);
+        Long count = LikeCommentsDao.get().selectOnCommentNo(commentNo);
+        
+        // 通知
+        if (!duplicateLikeComment(commentNo, loginedUser.getUserId())) {
+            NotifyLogic.get().notifyOnCommentLiked(like);
+        }
+
+        ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, loginedUser, DateUtils.now(),
+                CommentsDao.get().selectOnKey(commentNo));
+
+        return count;
+    }
+
+
+    
+}
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 8a38cf21f..f4e2b7b45 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -59,7 +59,7 @@ message.allready.started=Already started.
 message.confirm.delete=Are you sure you want to delete?
 
 # Common Label
-label.version=v1.11.0 pre2
+label.version=v1.12.0 pre1
 label.login=Sign in
 label.previous= Previous
 label.next=Next
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index f31e42d5d..3527df032 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -59,7 +59,7 @@ message.allready.started=すでに開始済です
 message.confirm.delete=本当に削除しますか?
 
 # Common Label
-label.version=v1.11.0 pre2
+label.version=v1.12.0 pre1
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_3.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_3.sql
new file mode 100644
index 000000000..f8fc68aab
--- /dev/null
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_3.sql
@@ -0,0 +1,11 @@
+ALTER TABLE TEMPLATE_MASTERS DROP COLUMN IF EXISTS INITIAL_VALUE;
+ALTER TABLE TEMPLATE_MASTERS ADD COLUMN INITIAL_VALUE text;
+
+comment on column TEMPLATE_MASTERS.INITIAL_VALUE is '本文の初期値';
+
+ALTER TABLE TEMPLATE_ITEMS DROP COLUMN IF EXISTS INITIAL_VALUE;
+ALTER TABLE TEMPLATE_ITEMS ADD COLUMN INITIAL_VALUE text;
+
+comment on column TEMPLATE_ITEMS.INITIAL_VALUE is '初期値';
+
+
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql
index f8fc68aab..485dcaae0 100644
--- a/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql
+++ b/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql
@@ -1,11 +1,56 @@
-ALTER TABLE TEMPLATE_MASTERS DROP COLUMN IF EXISTS INITIAL_VALUE;
-ALTER TABLE TEMPLATE_MASTERS ADD COLUMN INITIAL_VALUE text;
+-- いいねの通知状態
+drop table if exists NOTIFICATION_STATUS cascade;
 
-comment on column TEMPLATE_MASTERS.INITIAL_VALUE is '本文の初期値';
+create table NOTIFICATION_STATUS (
+  TYPE integer not null
+  , TARGET_ID bigint not null
+  , USER_ID integer not null
+  , STATUS integer
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint NOTIFICATION_STATUS_PKC primary key (TYPE,TARGET_ID,USER_ID)
+) ;
 
-ALTER TABLE TEMPLATE_ITEMS DROP COLUMN IF EXISTS INITIAL_VALUE;
-ALTER TABLE TEMPLATE_ITEMS ADD COLUMN INITIAL_VALUE text;
+-- メールから投稿の際の除外条件
+drop table if exists MAIL_HOOK_IGNORE_CONDITIONS cascade;
 
-comment on column TEMPLATE_ITEMS.INITIAL_VALUE is '初期値';
+create table MAIL_HOOK_IGNORE_CONDITIONS (
+  HOOK_ID INTEGER not null
+  , CONDITION_NO integer not null
+  , IGNORE_CONDITION_NO integer not null
+  , CONDITION_KIND integer not null
+  , CONDITION character varying(256)
+  , INSERT_USER integer
+  , INSERT_DATETIME timestamp
+  , UPDATE_USER integer
+  , UPDATE_DATETIME timestamp
+  , DELETE_FLAG integer
+  , constraint MAIL_HOOK_IGNORE_CONDITIONS_PKC primary key (HOOK_ID,CONDITION_NO,IGNORE_CONDITION_NO)
+) ;
 
+comment on table NOTIFICATION_STATUS is 'いいねの通知状態';
+comment on column NOTIFICATION_STATUS.TYPE is '種類';
+comment on column NOTIFICATION_STATUS.TARGET_ID is 'ターゲットのID';
+comment on column NOTIFICATION_STATUS.USER_ID is '登録者';
+comment on column NOTIFICATION_STATUS.STATUS is '通知の状態';
+comment on column NOTIFICATION_STATUS.INSERT_USER is '登録ユーザ';
+comment on column NOTIFICATION_STATUS.INSERT_DATETIME is '登録日時';
+comment on column NOTIFICATION_STATUS.UPDATE_USER is '更新ユーザ';
+comment on column NOTIFICATION_STATUS.UPDATE_DATETIME is '更新日時';
+comment on column NOTIFICATION_STATUS.DELETE_FLAG is '削除フラグ';
+
+comment on table MAIL_HOOK_IGNORE_CONDITIONS is 'メールから投稿の際の除外条件';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.HOOK_ID is 'HOOK_ID';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.CONDITION_NO is 'CONDITION_NO';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.IGNORE_CONDITION_NO is 'IGNORE_CONDITION_NO';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.CONDITION_KIND is '条件の種類   1:宛先が「条件文字」であった場合';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.CONDITION is '条件の文字';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.INSERT_USER is '登録ユーザ';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.INSERT_DATETIME is '登録日時';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.UPDATE_USER is '更新ユーザ';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.UPDATE_DATETIME is '更新日時';
+comment on column MAIL_HOOK_IGNORE_CONDITIONS.DELETE_FLAG is '削除フラグ';
 
diff --git a/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java b/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java
index 82b77df1b..15390ebd2 100644
--- a/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java
+++ b/src/test/java/org/support/project/knowledge/dao/KnowledgesDaoTest.java
@@ -14,6 +14,7 @@
 import org.support.project.knowledge.TestCommon;
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.LikeLogic;
 import org.support.project.knowledge.vo.KnowledgeData;
 import org.support.project.ormapping.common.DBUserPool;
 
@@ -68,7 +69,7 @@ public void testSelectPopularity() throws Exception {
             knowledge.add(entity);
 
             if (i == 29) {
-                KnowledgeLogic.get().addLike(entity.getKnowledgeId(), loginedUser2, Locale.JAPAN);
+                LikeLogic.get().addLike(entity.getKnowledgeId(), loginedUser2, Locale.JAPAN);
             }
             entity = KnowledgesDao.get().selectOnKey(entity.getKnowledgeId());
             LOG.info("[" + i + "]" + entity.getPoint());
@@ -109,7 +110,7 @@ public void testSelectPopularityWithAccessControl() throws Exception {
             entity = logic.insert(data, loginedUser);
             knowledge.add(entity);
             if (i == 29) {
-                KnowledgeLogic.get().addLike(entity.getKnowledgeId(), loginedUser2, Locale.JAPAN);
+                LikeLogic.get().addLike(entity.getKnowledgeId(), loginedUser2, Locale.JAPAN);
             }
         }
 
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
index ba3732456..fb3146cc5 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
@@ -428,10 +428,7 @@ public void testNotificationAfterLikeByUser2() throws Exception {
     
     /**
      * ログインユーザ1にて、イイネを押下（再実行)
-     * 
-     * TODO 再度実行してもポイントなどはつかないが、通知は押した回数分送っている
-     * 一度送った場合は、そのユーザが何回いいねを押しても通知しない方がよさげ
-     * 
+     * 再度実行してもポイントなどはつかず、通知も送らないないように
      * @throws Exception
      */
     @Test
diff --git a/src/test/java/org/support/project/knowledge/logic/notification/CommentLikedNotificationTest.java b/src/test/java/org/support/project/knowledge/logic/notification/CommentLikedNotificationTest.java
index d62e9fbad..617adb2fb 100644
--- a/src/test/java/org/support/project/knowledge/logic/notification/CommentLikedNotificationTest.java
+++ b/src/test/java/org/support/project/knowledge/logic/notification/CommentLikedNotificationTest.java
@@ -13,6 +13,7 @@
 import org.support.project.knowledge.entity.LikeCommentsEntity;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.LikeLogic;
 import org.support.project.knowledge.logic.NotificationLogic;
 import org.support.project.knowledge.logic.notification.Notification.TARGET;
 import org.support.project.web.bean.MessageResult;
@@ -25,7 +26,7 @@ public void testNotification() throws Exception {
         // Knowledgeを登録し、そこにコメント登録し、それにいいねを押した
         KnowledgesEntity knowledge = super.insertKnowledge("テスト", loginedUser2);
         CommentsEntity comment = KnowledgeLogic.get().saveComment(knowledge.getKnowledgeId(), "コメント", new ArrayList<>(), loginedUser);
-        KnowledgeLogic.get().addLikeComment(comment.getCommentNo(), loginedUser2, loginedUser.getLocale());
+        LikeLogic.get().addLikeComment(comment.getCommentNo(), loginedUser2, loginedUser.getLocale());
 
         List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
         LOG.info(list);
diff --git a/src/test/java/org/support/project/knowledge/logic/notification/LikeInsertNotificationTest.java b/src/test/java/org/support/project/knowledge/logic/notification/LikeInsertNotificationTest.java
index 66c349f6b..db0de89bd 100644
--- a/src/test/java/org/support/project/knowledge/logic/notification/LikeInsertNotificationTest.java
+++ b/src/test/java/org/support/project/knowledge/logic/notification/LikeInsertNotificationTest.java
@@ -12,7 +12,7 @@
 import org.support.project.knowledge.entity.KnowledgesEntity;
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
-import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.LikeLogic;
 import org.support.project.knowledge.logic.NotificationLogic;
 import org.support.project.knowledge.logic.notification.Notification.TARGET;
 import org.support.project.web.bean.MessageResult;
@@ -25,7 +25,7 @@ public class LikeInsertNotificationTest extends NotificationTestCommon {
     public void testNotification() throws Exception {
         // Knowledgeを登録し、それにいいねを押した
         KnowledgesEntity knowledge = super.insertKnowledge("テスト", loginedUser);
-        KnowledgeLogic.get().addLike(knowledge.getKnowledgeId(), loginedUser2, loginedUser.getLocale());
+        LikeLogic.get().addLike(knowledge.getKnowledgeId(), loginedUser2, loginedUser.getLocale());
         
         List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
         LOG.info(list);

From c32b0f0b04e67a8bed403fe0c36148bcbe02f753 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 9 Oct 2017 15:14:40 +0900
Subject: [PATCH 116/138] #877 Change a notification by single on multi liked

---
 .../project/knowledge/logic/LikeLogic.java    | 48 +++++++++++++++----
 .../integration/IntegrationPostTest.java      |  5 +-
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/logic/LikeLogic.java b/src/main/java/org/support/project/knowledge/logic/LikeLogic.java
index 18531afb1..d8a5e6267 100644
--- a/src/main/java/org/support/project/knowledge/logic/LikeLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/LikeLogic.java
@@ -13,8 +13,10 @@
 import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.dao.LikeCommentsDao;
 import org.support.project.knowledge.dao.LikesDao;
+import org.support.project.knowledge.dao.NotificationStatusDao;
 import org.support.project.knowledge.entity.LikeCommentsEntity;
 import org.support.project.knowledge.entity.LikesEntity;
+import org.support.project.knowledge.entity.NotificationStatusEntity;
 import org.support.project.knowledge.logic.activity.Activity;
 import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.web.bean.LoginedUser;
@@ -32,6 +34,9 @@ public class LikeLogic {
     public static LikeLogic get() {
         return Container.getComp(LikeLogic.class);
     }
+    
+    private static final int TYPE_KNOWLEDGE = 1;
+    private static final int TYPE_COMMENT = 2;
 
     
     /**
@@ -50,14 +55,31 @@ private boolean getCheckOfLike() {
     }
 
     private boolean duplicateLike(Long knowledgeId, Integer userId) {
-        // TODO Auto-generated method stub
-        return false;
+        NotificationStatusEntity status = NotificationStatusDao.get().selectOnKey(knowledgeId, TYPE_KNOWLEDGE, userId);
+        if (status == null) {
+            return false;
+        }
+        return true;
     }
     private boolean duplicateLikeComment(Long commentNo, Integer userId) {
-        // TODO Auto-generated method stub
-        return false;
+        NotificationStatusEntity status = NotificationStatusDao.get().selectOnKey(commentNo, TYPE_COMMENT, userId);
+        if (status == null) {
+            return false;
+        }
+        return true;
     }
 
+    private void saveNotifyStatusLike(Long knowledgeId, Integer userId) {
+        NotificationStatusEntity status = new NotificationStatusEntity(knowledgeId, TYPE_KNOWLEDGE, userId);
+        status.setStatus(0);
+        NotificationStatusDao.get().save(status);
+    }
+    private void saveNotifyStatusLikeComment(Long commentNo, Integer userId) {
+        NotificationStatusEntity status = new NotificationStatusEntity(commentNo, TYPE_COMMENT, userId);
+        status.setStatus(0);
+        NotificationStatusDao.get().save(status);
+    }
+    
     
     /**
      * いいね！を追加
@@ -91,8 +113,13 @@ public Long addLike(Long knowledgeId, LoginedUser loginedUser, Locale locale) th
         Long count = likesDao.countOnKnowledgeId(knowledgeId);
 
         // 通知
-        if (!duplicateLike(knowledgeId, loginedUser.getUserId())) {
+        int userId = Integer.MIN_VALUE;
+        if (loginedUser != null) {
+            userId = loginedUser.getUserId();
+        }
+        if (!duplicateLike(knowledgeId, userId)) {
             NotifyLogic.get().notifyOnKnowledgeLiked(knowledgeId, likesEntity);
+            saveNotifyStatusLike(knowledgeId, userId);
         }
 
         ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, loginedUser, DateUtils.now(),
@@ -101,7 +128,6 @@ public Long addLike(Long knowledgeId, LoginedUser loginedUser, Locale locale) th
         return count;
     }
 
-
     /**
      * コメントにイイネを追加
      * @param commentNo
@@ -129,8 +155,13 @@ public Long addLikeComment(Long commentNo, LoginedUser loginedUser, Locale local
         Long count = LikeCommentsDao.get().selectOnCommentNo(commentNo);
         
         // 通知
-        if (!duplicateLikeComment(commentNo, loginedUser.getUserId())) {
+        int userId = Integer.MIN_VALUE;
+        if (loginedUser != null) {
+            userId = loginedUser.getUserId();
+        }
+        if (!duplicateLikeComment(commentNo, userId)) {
             NotifyLogic.get().notifyOnCommentLiked(like);
+            saveNotifyStatusLikeComment(commentNo, userId);
         }
 
         ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, loginedUser, DateUtils.now(),
@@ -138,7 +169,4 @@ public Long addLikeComment(Long commentNo, LoginedUser loginedUser, Locale local
 
         return count;
     }
-
-
-    
 }
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
index fb3146cc5..dc708b532 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationPostTest.java
@@ -8,8 +8,10 @@
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.test.Order;
 import org.support.project.common.util.PropertyUtil;
+import org.support.project.knowledge.dao.NotifyQueuesDao;
 import org.support.project.knowledge.entity.CommentsEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.web.bean.MessageResult;
 import org.support.project.web.boundary.ForwardBoundary;
@@ -440,7 +442,8 @@ public void testReLikeByLoginUser1() throws Exception {
         assertCP(KNOWLEDGE_POST_USER, 0); // 変化無し
         assertKnowledgeCP(COMMENT_POST_USER, knowledgeId, 0); // 変化無し
 
-        execNotificationQueue();
+        List<NotifyQueuesEntity> list = NotifyQueuesDao.get().selectAll();
+        Assert.assertEquals(0, list.size());
         assertNotificationCount(COMMENT_POST_USER, 0);
         assertNotificationCount(KNOWLEDGE_POST_USER, 0);
     }

From b955a146c572118d51b097526cea2a4e3513c8fd Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 9 Oct 2017 20:35:28 +0900
Subject: [PATCH 117/138] #863 Change unread style on dark thema

---
 src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp | 2 ++
 src/main/webapp/css/knowledge-list.css                        | 4 ----
 src/main/webapp/css/thema/cerulean.css                        | 3 +++
 src/main/webapp/css/thema/cosmo.css                           | 3 +++
 src/main/webapp/css/thema/cyborg.css                          | 3 +++
 src/main/webapp/css/thema/darkly.css                          | 3 +++
 src/main/webapp/css/thema/flatly.css                          | 3 +++
 src/main/webapp/css/thema/journal.css                         | 3 +++
 src/main/webapp/css/thema/lumen.css                           | 3 +++
 src/main/webapp/css/thema/paper.css                           | 3 +++
 src/main/webapp/css/thema/readable.css                        | 3 +++
 src/main/webapp/css/thema/sandstone.css                       | 3 +++
 src/main/webapp/css/thema/simplex.css                         | 3 +++
 src/main/webapp/css/thema/slate.css                           | 3 +++
 src/main/webapp/css/thema/solar.css                           | 3 +++
 src/main/webapp/css/thema/spacelab.css                        | 3 +++
 src/main/webapp/css/thema/superhero.css                       | 3 +++
 src/main/webapp/css/thema/united.css                          | 3 +++
 src/main/webapp/css/thema/yeti.css                            | 3 +++
 19 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 src/main/webapp/css/thema/cerulean.css
 create mode 100644 src/main/webapp/css/thema/cosmo.css
 create mode 100644 src/main/webapp/css/thema/cyborg.css
 create mode 100644 src/main/webapp/css/thema/darkly.css
 create mode 100644 src/main/webapp/css/thema/flatly.css
 create mode 100644 src/main/webapp/css/thema/journal.css
 create mode 100644 src/main/webapp/css/thema/lumen.css
 create mode 100644 src/main/webapp/css/thema/paper.css
 create mode 100644 src/main/webapp/css/thema/readable.css
 create mode 100644 src/main/webapp/css/thema/sandstone.css
 create mode 100644 src/main/webapp/css/thema/simplex.css
 create mode 100644 src/main/webapp/css/thema/slate.css
 create mode 100644 src/main/webapp/css/thema/solar.css
 create mode 100644 src/main/webapp/css/thema/spacelab.css
 create mode 100644 src/main/webapp/css/thema/superhero.css
 create mode 100644 src/main/webapp/css/thema/united.css
 create mode 100644 src/main/webapp/css/thema/yeti.css

diff --git a/src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp b/src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp
index c216f94a9..e3c6c2d85 100644
--- a/src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp
+++ b/src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp
@@ -37,8 +37,10 @@
 
 <% if (StringUtils.isNotEmpty(jspUtil.out("thema"))) { %>
 <link rel="stylesheet" href="<%= request.getContextPath() %>/bower/bootswatch/<%= jspUtil.out("thema") %>/bootstrap.min.css" />
+<link rel="stylesheet" href="<%= request.getContextPath() %>/css/thema/<%= jspUtil.out("thema") %>.css" />
 <% } else { %>
 <link rel="stylesheet" href="<%= request.getContextPath() %>/bower/bootswatch/<%= jspUtil.cookie(SystemConfig.COOKIE_KEY_THEMA, "flatly") %>/bootstrap.min.css" />
+<link rel="stylesheet" href="<%= request.getContextPath() %>/css/thema/<%= jspUtil.cookie(SystemConfig.COOKIE_KEY_THEMA, "flatly") %>.css" />
 <% } %>
 
 <% if (StringUtils.isNotEmpty(jspUtil.out("highlight"))) { %>
diff --git a/src/main/webapp/css/knowledge-list.css b/src/main/webapp/css/knowledge-list.css
index 3cbed54a9..3cabd219f 100644
--- a/src/main/webapp/css/knowledge-list.css
+++ b/src/main/webapp/css/knowledge-list.css
@@ -24,10 +24,6 @@
     text-decoration: none;
     outline: 0;
 }
-.unread {
-    background-color: #e5fcff;
-}
-
 
 .list-title {
     font-size: 20px;
diff --git a/src/main/webapp/css/thema/cerulean.css b/src/main/webapp/css/thema/cerulean.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/cerulean.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/cosmo.css b/src/main/webapp/css/thema/cosmo.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/cosmo.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/cyborg.css b/src/main/webapp/css/thema/cyborg.css
new file mode 100644
index 000000000..3a4a46cc2
--- /dev/null
+++ b/src/main/webapp/css/thema/cyborg.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #101030;
+}
diff --git a/src/main/webapp/css/thema/darkly.css b/src/main/webapp/css/thema/darkly.css
new file mode 100644
index 000000000..3a4a46cc2
--- /dev/null
+++ b/src/main/webapp/css/thema/darkly.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #101030;
+}
diff --git a/src/main/webapp/css/thema/flatly.css b/src/main/webapp/css/thema/flatly.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/flatly.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/journal.css b/src/main/webapp/css/thema/journal.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/journal.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/lumen.css b/src/main/webapp/css/thema/lumen.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/lumen.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/paper.css b/src/main/webapp/css/thema/paper.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/paper.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/readable.css b/src/main/webapp/css/thema/readable.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/readable.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/sandstone.css b/src/main/webapp/css/thema/sandstone.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/sandstone.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/simplex.css b/src/main/webapp/css/thema/simplex.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/simplex.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/slate.css b/src/main/webapp/css/thema/slate.css
new file mode 100644
index 000000000..3a4a46cc2
--- /dev/null
+++ b/src/main/webapp/css/thema/slate.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #101030;
+}
diff --git a/src/main/webapp/css/thema/solar.css b/src/main/webapp/css/thema/solar.css
new file mode 100644
index 000000000..3a4a46cc2
--- /dev/null
+++ b/src/main/webapp/css/thema/solar.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #101030;
+}
diff --git a/src/main/webapp/css/thema/spacelab.css b/src/main/webapp/css/thema/spacelab.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/spacelab.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/superhero.css b/src/main/webapp/css/thema/superhero.css
new file mode 100644
index 000000000..3a4a46cc2
--- /dev/null
+++ b/src/main/webapp/css/thema/superhero.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #101030;
+}
diff --git a/src/main/webapp/css/thema/united.css b/src/main/webapp/css/thema/united.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/united.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}
diff --git a/src/main/webapp/css/thema/yeti.css b/src/main/webapp/css/thema/yeti.css
new file mode 100644
index 000000000..649228cad
--- /dev/null
+++ b/src/main/webapp/css/thema/yeti.css
@@ -0,0 +1,3 @@
+.unread {
+    background-color: #e5fcff;
+}

From e04dacc6230f7343a311203d8dbda7e2ffcfeb84 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 10 Oct 2017 11:29:40 +0900
Subject: [PATCH 118/138] Change feature to debug for mail send

---
 .../java/org/support/project/knowledge/bat/MailSendBat.java    | 3 ++-
 .../java/org/support/project/knowledge/logic/MailLogic.java    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/bat/MailSendBat.java b/src/main/java/org/support/project/knowledge/bat/MailSendBat.java
index 1ee75575a..d6f56a2a8 100644
--- a/src/main/java/org/support/project/knowledge/bat/MailSendBat.java
+++ b/src/main/java/org/support/project/knowledge/bat/MailSendBat.java
@@ -55,7 +55,8 @@ public static void main(String[] args) throws Exception {
     public void start() throws UnsupportedEncodingException, MessagingException, InvalidKeyException, NoSuchAlgorithmException,
             NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException {
         MailLogic.get().startSendMails();
-        MailsDao.get().physicalDeleteOnOldData();
+        int deletecount = MailsDao.get().physicalDeleteOnOldData();
+        LOG.info("delete old mails. [count]" + deletecount);
     }
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/MailLogic.java b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
index d4c04488b..078b01696 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailLogic.java
@@ -197,7 +197,7 @@ public void startSendMail(Session session, MailConfigsEntity mailConfigsEntity,
                 mailsEntity.setStatus(MAIL_STATUS_SENDED);
                 MailsDao.get().save(mailsEntity);
                 // 送信処理が終われば削除
-                MailsDao.get().delete(mailsEntity);
+                // MailsDao.get().delete(mailsEntity);
             } catch (Exception e) {
                 LOG.error("mail send error", e);
                 //メール送信失敗（3回リトライする）

From b8316ba7873e2517f35949fda779dd0dd92deedd Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 11 Oct 2017 00:13:05 +0900
Subject: [PATCH 119/138] #895 Add a feature what is retry aggregate process.

---
 .../project/knowledge/bat/AggregateBat.java   |  36 ++
 .../control/admin/AggregateControl.java       |  10 +
 .../project/knowledge/dao/ActivitiesDao.java  |  24 +-
 .../dao/PointKnowledgeHistoriesDao.java       |  11 +
 .../knowledge/dao/PointUserHistoriesDao.java  |   7 +
 .../project/knowledge/deploy/InitDB.java      |   6 +-
 .../deploy/v1_11_0/Migrate_1_11_2.java        | 444 +---------------
 .../Migrate_1_11_4.java}                      |  10 +-
 .../knowledge/logic/AggregateLogic.java       | 472 ++++++++++++++++++
 .../logic/activity/ActivityLogic.java         |   2 +-
 .../logic/activity/CommentLikeActivity.java   |   8 +-
 .../activity/KnowledgeEventActivity.java      |   8 +-
 .../logic/activity/KnowledgeLikeActivity.java |   8 +-
 .../logic/activity/KnowledgeShowActivity.java |  14 +-
 .../logic/activity/KnowledgesaveActivity.java |   8 +-
 .../websocket/AggregateEndpoint.java          |  72 +++
 src/main/resources/appresource.properties     |   5 +
 src/main/resources/appresource_ja.properties  |   5 +-
 .../migrate_v1_11_4.sql}                      |   0
 .../WEB-INF/views/admin/aggregate/index.jsp   |  83 +++
 .../WEB-INF/views/admin/config/system.jsp     |   4 +-
 .../views/admin/systemconfig/index.jsp        |   3 +
 .../WEB-INF/views/commons/maintenance.jsp     |  38 +-
 .../webapp/WEB-INF/views/commons/migrate.jsp  |  38 +-
 24 files changed, 772 insertions(+), 544 deletions(-)
 create mode 100644 src/main/java/org/support/project/knowledge/bat/AggregateBat.java
 create mode 100644 src/main/java/org/support/project/knowledge/control/admin/AggregateControl.java
 rename src/main/java/org/support/project/knowledge/deploy/{v1_12/Migrate_1_12_0.java => v1_11_0/Migrate_1_11_4.java} (64%)
 create mode 100644 src/main/java/org/support/project/knowledge/logic/AggregateLogic.java
 create mode 100644 src/main/java/org/support/project/knowledge/websocket/AggregateEndpoint.java
 rename src/main/resources/org/support/project/knowledge/deploy/{v1_12/migrate_v1_12_0.sql => v1_11_0/migrate_v1_11_4.sql} (100%)
 create mode 100644 src/main/webapp/WEB-INF/views/admin/aggregate/index.jsp

diff --git a/src/main/java/org/support/project/knowledge/bat/AggregateBat.java b/src/main/java/org/support/project/knowledge/bat/AggregateBat.java
new file mode 100644
index 000000000..b9070b654
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/bat/AggregateBat.java
@@ -0,0 +1,36 @@
+package org.support.project.knowledge.bat;
+
+import org.apache.commons.lang.ClassUtils;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.knowledge.logic.AggregateLogic;
+
+public class AggregateBat extends AbstractBat {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(AggregateBat.class);
+
+    public static void main(String[] args) throws Exception {
+        try {
+            initLogName("AggregateBat.log");
+            configInit(ClassUtils.getShortClassName(AggregateBat.class));
+            
+            AggregateBat bat = new AggregateBat();
+            bat.dbInit();
+            bat.start();
+            
+            finishInfo();
+        } catch (Exception e) {
+            LOG.error("any error", e);
+            throw e;
+        }
+    }
+
+    /**
+     * 処理の実行
+     * @throws Exception Exception
+     */
+    public void start() throws Exception {
+        AggregateLogic aggregateLogic = AggregateLogic.get();
+        aggregateLogic.startAggregate();
+    }
+}
diff --git a/src/main/java/org/support/project/knowledge/control/admin/AggregateControl.java b/src/main/java/org/support/project/knowledge/control/admin/AggregateControl.java
new file mode 100644
index 000000000..30464ea17
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/control/admin/AggregateControl.java
@@ -0,0 +1,10 @@
+package org.support.project.knowledge.control.admin;
+
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.control.Control;
+
+@DI(instance = Instance.Prototype)
+public class AggregateControl extends Control {
+    
+}
diff --git a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
index 02e1a8307..57fa54746 100644
--- a/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ActivitiesDao.java
@@ -4,6 +4,8 @@
 import java.util.List;
 
 import org.support.project.aop.Aspect;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -15,6 +17,8 @@
  */
 @DI(instance = Instance.Singleton)
 public class ActivitiesDao extends GenActivitiesDao {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(ActivitiesDao.class);
 
     /** SerialVersion */
     private static final long serialVersionUID = 1L;
@@ -36,10 +40,9 @@ public List<ActivitiesEntity> selectOnNos(List<Long> activityNos) {
         sql.append("SELECT *, USERS.USER_NAME FROM ACTIVITIES INNER JOIN USERS ON (ACTIVITIES.USER_ID = USERS.USER_ID) ");
         sql.append("WHERE ACTIVITY_NO IN (");
         boolean appended = false;
-        for (Long no : activityNos) {
+        for (@SuppressWarnings("unused") Long no : activityNos) {
             if (appended) {
                 sql.append(", ");
-                
             }
             sql.append("?");
             appended = true;
@@ -70,6 +73,23 @@ public ActivitiesEntity selectBefore(Integer userId, String target, int... kinds
         sql.append(") ORDER BY INSERT_DATETIME DESC LIMIT 1 OFFSET 0");
         return executeQuerySingle(sql.toString(), ActivitiesEntity.class, params.toArray(new Object[0]));
     }
+    /**
+     * 指定のアクティビティの件数を取得
+     * @param kind
+     * @param targetId
+     * @return
+     */
+    public long selectCountByTarget(int kind, Long targetId) {
+        String target = String.valueOf(targetId);
+        String sql = "SELECT COUNT(*) FROM ACTIVITIES WHERE KIND = ? AND TARGET = ?";
+        return executeQuerySingle(sql, Long.class, kind, target);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void removeAll() {
+        LOG.warn("Remove all activities");
+        String sql = "DELETE FROM ACTIVITIES";
+        executeUpdate(sql);
+    }
 
 
 
diff --git a/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
index 83cfd1d7c..4dc9a9b6c 100644
--- a/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/PointKnowledgeHistoriesDao.java
@@ -4,6 +4,8 @@
 import java.util.List;
 
 import org.support.project.aop.Aspect;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
@@ -14,6 +16,8 @@
  */
 @DI(instance = Instance.Singleton)
 public class PointKnowledgeHistoriesDao extends GenPointKnowledgeHistoriesDao {
+    /** LOG */
+    private static final Log LOG = LogFactory.getLog(PointKnowledgeHistoriesDao.class);
 
     /** SerialVersion */
     private static final long serialVersionUID = 1L;
@@ -53,6 +57,13 @@ public int selectBeforePoint(Long knowledgeId, int... types) {
         }
         return point;
     }
+    
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void removeAll() {
+        LOG.warn("Remove all point knowledge histories");
+        String sql = "DELETE FROM POINT_KNOWLEDGE_HISTORIES";
+        executeUpdate(sql);
+    }
 
 
 
diff --git a/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
index 806732a09..2c7ca08b2 100644
--- a/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/PointUserHistoriesDao.java
@@ -84,6 +84,13 @@ public List<PointUserHistoriesEntity> selectOnUser(Integer userId, int limit, in
         return executeQueryList(sql, PointUserHistoriesEntity.class, userId, limit, offset);
     }
 
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void removeAll() {
+        LOG.warn("Remove all point user histories");
+        String sql = "DELETE FROM POINT_USER_HISTORIES";
+        executeUpdate(sql);
+    }
+
 
 
 }
diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
index 1f702a85d..3dd82b3fd 100644
--- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java
+++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java
@@ -26,7 +26,7 @@
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_1;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_2;
 import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_3;
-import org.support.project.knowledge.deploy.v1_12.Migrate_1_12_0;
+import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_4;
 import org.support.project.knowledge.deploy.v1_1_0pre1.Migrate_1_1_0pre1;
 import org.support.project.knowledge.deploy.v1_4_0.Migrate_1_4_0;
 import org.support.project.knowledge.deploy.v1_5_0.Migrate_1_5_0;
@@ -52,7 +52,7 @@ public class InitDB {
     private static final Map<String, Migrate> MAP = new LinkedHashMap<>();
 
     private static final Migrate INIT = InitializeSystem.get();
-    public static final String CURRENT = "1.12.0";
+    public static final String CURRENT = "1.11.4";
 
     public InitDB() {
         super();
@@ -86,7 +86,7 @@ public InitDB() {
         MAP.put("1.11.1", Migrate_1_11_1.get());
         MAP.put("1.11.2", Migrate_1_11_2.get());
         MAP.put("1.11.3", Migrate_1_11_3.get());
-        MAP.put("1.12.0", Migrate_1_12_0.get());
+        MAP.put("1.11.4", Migrate_1_11_4.get());
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
index 35fe10803..07b27bd8e 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_2.java
@@ -1,55 +1,13 @@
 package org.support.project.knowledge.deploy.v1_11_0;
 
-import java.util.List;
-
-import org.support.project.aop.Aspect;
-import org.support.project.common.log.Log;
-import org.support.project.common.log.LogFactory;
-import org.support.project.common.util.DateUtils;
-import org.support.project.knowledge.config.AppConfig;
-import org.support.project.knowledge.config.UserConfig;
-import org.support.project.knowledge.dao.CommentsDao;
-import org.support.project.knowledge.dao.KnowledgesDao;
-import org.support.project.knowledge.dao.LikeCommentsDao;
-import org.support.project.knowledge.dao.LikesDao;
-import org.support.project.knowledge.dao.ParticipantsDao;
-import org.support.project.knowledge.dao.PointUserHistoriesDao;
-import org.support.project.knowledge.dao.StockKnowledgesDao;
-import org.support.project.knowledge.dao.SurveyAnswersDao;
-import org.support.project.knowledge.dao.ViewHistoriesDao;
 import org.support.project.knowledge.deploy.Migrate;
-import org.support.project.knowledge.entity.CommentsEntity;
-import org.support.project.knowledge.entity.KnowledgesEntity;
-import org.support.project.knowledge.entity.LikeCommentsEntity;
-import org.support.project.knowledge.entity.LikesEntity;
-import org.support.project.knowledge.entity.ParticipantsEntity;
-import org.support.project.knowledge.entity.PointUserHistoriesEntity;
-import org.support.project.knowledge.entity.StockKnowledgesEntity;
-import org.support.project.knowledge.entity.SurveyAnswersEntity;
-import org.support.project.knowledge.entity.ViewHistoriesEntity;
-import org.support.project.knowledge.logic.activity.Activity;
-import org.support.project.knowledge.logic.activity.ActivityLogic;
-import org.support.project.ormapping.config.Order;
+import org.support.project.knowledge.logic.AggregateLogic;
 import org.support.project.ormapping.tool.dao.InitializeDao;
-import org.support.project.web.bean.LoginedUser;
-import org.support.project.web.dao.UserConfigsDao;
-import org.support.project.web.dao.UsersDao;
-import org.support.project.web.entity.UsersEntity;
 
 public class Migrate_1_11_2 implements Migrate {
-    private static final int _WAIT = 100;
-    /** ログ */
-    private static final Log LOG = LogFactory.getLog(Migrate_1_11_2.class);
-
     public static Migrate_1_11_2 get() {
         return org.support.project.di.Container.getComp(Migrate_1_11_2.class);
     }
-    private int limit = 1; // 1件毎にコミットいれないと、別コネクションで取得して結果をクリアしてしまう？
-    
-    private int calcTotal = 0; // トータルポイントの再計算に使う内部保持変数（シーケンシャルに1件づつ処理をすること）
-    
-    private int processCount = 0;
-    
     
     @Override
     public boolean doMigrate() throws Exception {
@@ -59,407 +17,11 @@ public boolean doMigrate() throws Exception {
         };
         initializeDao.initializeDatabase(sqlpaths);
         
-        // 参照回数を集計
-        doSetViewCountToKnowledge();
-        // ユーザについているポイントをクリア
-        clearUserPoint();
-        // Knowledgeを登録したイベントによりポイントを集計
-        doAddPointByKnowledge();
-        // Knowledgeを参照したイベントによりポイントを集計
-        doAddPointByKnowledgeShow();
-        // Knowledgeにイイネを押したイベントによりポイント集計
-        doAddPointByKnowledgeLike();
-        // Knowledgeをストックイベントによりポイント集計
-        doAddPointByKnowledgeStock();
-        // Knowledgeのアンケートを回答したイベントによりポイント集計
-        doAddPointByKnowledgeAnswer();
-        // Knowledgeイベント参加したイベントによりポイント集計
-        doAddPointByKnowledgeJoinEvent();
-        // コメントを登録したイベントによりポイント集計
-        doAddPointByCommentInsert();
-        // コメントへのイイネイベントによりポイント集計
-        doAddPointByCommentLike();
-        
-        // ポイント集計は、今後は時系列になり問題は無いが、このマイグレーションの中では、時系列にはならんでいないので、履歴のトータルを再構築
-        reCalcPointUserHistory();
-        
+        AggregateLogic aggregateLogic = AggregateLogic.get();
+        aggregateLogic.startAggregate();
         
         return true;
     }
     
-    private void reCalcPointUserHistory() throws InterruptedException {
-        LOG.info("Recalc user cp");
-        List<UsersEntity> list;
-        int offset = 0;
-        do {
-            list = reCalcPointUserHistory(offset);
-            offset = offset + limit;
-            synchronized (this) {
-                wait(_WAIT);
-            }
-        } while (list.size() > 0);
-    }
-    private List<UsersEntity> reCalcPointUserHistory(int offset) throws InterruptedException {
-        List<UsersEntity> list;
-        list = UsersDao.get().selectAllWidthPager(limit, offset, Order.ASC);
-        for (UsersEntity item : list) {
-            processCount = 0;
-            LOG.info("  Recalculation total point. [user]" + item.getUserId());
-            int offset2 = 0;
-            calcTotal = 0; // ユーザ毎にトータルポイントを初期化
-            List<PointUserHistoriesEntity> histories;
-            do {
-                logging(" Recalculation... ");
-                histories = reCalcPointUserHistoryOnUser(item.getUserId(), offset2);
-                offset2 = offset2 + limit;
-                synchronized (this) {
-                    wait(_WAIT);
-                }
-            } while (histories.size() > 0);
-        }
-        return list;
-    }
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private List<PointUserHistoriesEntity> reCalcPointUserHistoryOnUser(Integer userId, int offset2) {
-        List<PointUserHistoriesEntity> list;
-        list = PointUserHistoriesDao.get().selectOnUser(userId, limit, offset2, Order.ASC);
-        for (PointUserHistoriesEntity item : list) {
-            item.setBeforeTotal(calcTotal);
-            calcTotal += item.getPoint();
-            item.setTotal(calcTotal); // 日付毎に処理してトータルを再計算
-            LOG.debug("\t" + DateUtils.getSimpleFormat().format(item.getInsertDatetime()) + " [total]" + calcTotal);
-            PointUserHistoriesDao.get().physicalUpdate(item);
-        }
-        return list;
-    }
-
-    private void doAddPointByCommentLike() throws InterruptedException {
-        LOG.info("Aggregate point by comment like");
-        processCount = 0;
-        List<LikeCommentsEntity> list;
-        int offset = 0;
-        do {
-            logging("Aggregate point by comment like");
-            list = doAddPointByCommentLike(offset);
-            offset = offset + limit;
-            synchronized (this) {
-                wait(_WAIT);
-            }
-        } while (list.size() > 0);
-    }
-
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    private List<LikeCommentsEntity> doAddPointByCommentLike(int offset) {
-        List<LikeCommentsEntity> list;
-        list = LikeCommentsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
-        for (LikeCommentsEntity item : list) {
-            CommentsEntity comment = CommentsDao.get().selectOnKey(item.getCommentNo());
-            if (comment == null) {
-                LOG.debug("    comment [" + item.getCommentNo() + "] is not found. so skip add point by comment like.");
-                continue;
-            }
-            LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
-            if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by comment like.");
-                continue;
-            }
-            user.setLoginUser(account);
-            LOG.debug("    comment [" + item.getCommentNo() + "], knowledge [ " + comment.getKnowledgeId() + "]");
-            ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, user, item.getInsertDatetime(), comment);
-        }
-        return list;
-    }
-
-    private void doAddPointByCommentInsert() throws InterruptedException {
-        LOG.info("Aggregate point by comment insert");
-        processCount = 0;
-        List<CommentsEntity> list;
-        int offset = 0;
-        do {
-            logging("Aggregate point by comment insert");
-            list = doAddPointByKnowledgeComment(offset);
-            offset = offset + limit;
-            synchronized (this) {
-                wait(_WAIT);
-            }
-        } while (list.size() > 0);
-    }
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<CommentsEntity> doAddPointByKnowledgeComment(int offset) {
-        List<CommentsEntity> list;
-        list = CommentsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
-        for (CommentsEntity item : list) {
-            LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
-            if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by comment insert.");
-                continue;
-            }
-            user.setLoginUser(account);
-            LOG.debug("    comment [" + item.getCommentNo() + "], knowledge [ " + item.getKnowledgeId() + "]");
-            ActivityLogic.get().processActivity(Activity.COMMENT_INSERT, user, item.getInsertDatetime(), item);
-        }
-        return list;
-    }
-
-    private void doAddPointByKnowledgeJoinEvent() throws InterruptedException {
-        LOG.info("Aggregate point by knowledge join event");
-        processCount = 0;
-        List<ParticipantsEntity> list;
-        int offset = 0;
-        do {
-            logging("Aggregate point by knowledge join event");
-            list = doAddPointByKnowledgeJoinEvent(offset);
-            offset = offset + limit;
-            synchronized (this) {
-                wait(_WAIT);
-            }
-        } while (list.size() > 0);
-    }
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<ParticipantsEntity> doAddPointByKnowledgeJoinEvent(int offset) {
-        List<ParticipantsEntity> list;
-        list = ParticipantsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
-        for (ParticipantsEntity item : list) {
-            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
-            if (knowledge == null) {
-                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge event.");
-                continue;
-            }
-            LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
-            if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge event.");
-                continue;
-            }
-            user.setLoginUser(account);
-            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_ADD, user, item.getInsertDatetime(), knowledge);
-        }
-        return list;
-    }
-
-    private void doAddPointByKnowledgeAnswer() throws InterruptedException {
-        LOG.info("Aggregate point by knowledge answer");
-        processCount = 0;
-        List<SurveyAnswersEntity> list;
-        int offset = 0;
-        do {
-            logging("Aggregate point by knowledge answer");
-            list = doAddPointByKnowledgeAnswer(offset);
-            offset = offset + limit;
-            synchronized (this) {
-                wait(_WAIT);
-            }
-        } while (list.size() > 0);
-    }
-
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<SurveyAnswersEntity> doAddPointByKnowledgeAnswer(int offset) {
-        List<SurveyAnswersEntity> list;
-        list = SurveyAnswersDao.get().selectAllWidthPager(limit, offset, Order.ASC);
-        for (SurveyAnswersEntity item : list) {
-            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
-            if (knowledge == null) {
-                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge survey answer.");
-                continue;
-            }
-            LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
-            if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge survey answer.");
-                continue;
-            }
-            user.setLoginUser(account);
-            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_ANSWER, user, item.getInsertDatetime(), knowledge);
-        }
-        return list;
-    }
-
-    private void doAddPointByKnowledgeStock() throws InterruptedException {
-        LOG.info("Aggregate point by knowledge stock");
-        processCount = 0;
-        List<StockKnowledgesEntity> list;
-        int offset = 0;
-        do {
-            logging("Aggregate point by knowledge stock");
-            list = doAddPointByKnowledgeStock(offset);
-            offset = offset + limit;
-            synchronized (this) {
-                wait(_WAIT);
-            }
-        } while (list.size() > 0);
-    }
-
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset) {
-        List<StockKnowledgesEntity> list;
-        list = StockKnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
-        for (StockKnowledgesEntity item : list) {
-            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
-            if (knowledge == null) {
-                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge stock.");
-                continue;
-            }
-            LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
-            if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge stock.");
-                continue;
-            }
-            user.setLoginUser(account);
-            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_STOCK, user, item.getInsertDatetime(), knowledge);
-        }
-        return list;
-    }
-
-    private void doAddPointByKnowledgeLike() throws InterruptedException {
-        LOG.info("Aggregate point by knowledge like");
-        processCount = 0;
-        List<LikesEntity> list;
-        int offset = 0;
-        do {
-            logging("Aggregate point by knowledge like");
-            list = doAddPointByKnowledgeLike(offset);
-            offset = offset + limit;
-            synchronized (this) {
-                wait(_WAIT);
-            }
-        } while (list.size() > 0);
-    }
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<LikesEntity> doAddPointByKnowledgeLike(int offset) {
-        List<LikesEntity> list;
-        list = LikesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
-        for (LikesEntity item : list) {
-            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
-            if (knowledge == null) {
-                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
-                continue;
-            }
-            LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
-            if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
-                continue;
-            }
-            user.setLoginUser(account);
-            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, user, item.getInsertDatetime(), knowledge);
-        }
-        return list;
-    }
-    
-    private void doAddPointByKnowledgeShow() throws InterruptedException {
-        LOG.info("Aggregate point by knowledge show");
-        processCount = 0;
-        List<ViewHistoriesEntity> list;
-        int offset = 0;
-        do {
-            logging("Aggregate point by knowledge show");
-            list = doAddPointByKnowledgeShow(offset);
-            offset = offset + limit;
-            synchronized (this) {
-                wait(_WAIT);
-            }
-        } while (list.size() > 0);
-    }
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset) {
-        List<ViewHistoriesEntity> list;
-        list = ViewHistoriesDao.get().selectDistinctAllWidthPager(limit, offset);
-        for (ViewHistoriesEntity item : list) {
-            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
-            if (knowledge == null) {
-                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge show.");
-                continue;
-            }
-            LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
-            if (account == null) {
-                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge show.");
-                continue;
-            }
-            user.setLoginUser(account);
-            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
-            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, user, item.getInsertDatetime(), knowledge);
-        }
-        return list;
-    }
-
-    public void doAddPointByKnowledge() throws InterruptedException {
-        LOG.info("Aggregate point by knowledge insert");
-        processCount = 0;
-        List<KnowledgesEntity> knowledges;
-        int offset = 0;
-        do {
-            logging("Aggregate point by knowledge insert");
-            knowledges = doAddPointByKnowledge(offset);
-            offset = offset + limit;
-            synchronized (this) {
-                wait(_WAIT);
-            }
-        } while (knowledges.size() > 0);
-    }
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<KnowledgesEntity> doAddPointByKnowledge(int offset) {
-        List<KnowledgesEntity> knowledges;
-        knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
-        for (KnowledgesEntity item : knowledges) {
-            LoginedUser user = new LoginedUser();
-            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
-            if (account == null) {
-                LOG.debug("    insert user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge insert.");
-                continue;
-            }
-            user.setLoginUser(account);
-            LOG.debug("    knowledge [" + item.getKnowledgeId() + "] ");
-            ActivityLogic.get().processKnowledgeSaveActivity(user, item.getInsertDatetime(), item);
-        }
-        return knowledges;
-    }
-    
-    private void doSetViewCountToKnowledge() throws InterruptedException {
-        LOG.info("Set view count to Knowledge");
-        processCount = 0;
-        List<KnowledgesEntity> knowledges;
-        int offset = 0;
-        do {
-            logging("Set view count to Knowledge");
-            knowledges = doSetViewCountToKnowledge(offset);
-            offset = offset + limit;
-            synchronized (this) {
-                wait(_WAIT);
-            }
-        } while (knowledges.size() > 0);
-    }
-
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public List<KnowledgesEntity> doSetViewCountToKnowledge(int offset) {
-        List<KnowledgesEntity> knowledges;
-        knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
-        for (KnowledgesEntity knowledge : knowledges) {
-            long count = ViewHistoriesDao.get().selectCountOnKnowledgeId(knowledge.getKnowledgeId());
-            KnowledgesDao.get().updateViewCount(count, knowledge.getKnowledgeId());
-            //ついでにポイントも初期化
-            KnowledgesDao.get().updatePoint(knowledge.getKnowledgeId(), 0);
-            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] is updated. view count : " + count);
-        }
-        return knowledges;
-    }
-    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
-    public void clearUserPoint() {
-        UserConfigsDao.get().removeAllUserConfig(AppConfig.get().getSystemName(), UserConfig.POINT);
-    }
-    
-    private void logging(String string) {
-        processCount++;
-        if (processCount % 100 == 0) {
-            LOG.info("\t During execution of the " + string + ". [count]" + processCount);
-        }
-    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_4.java
similarity index 64%
rename from src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java
rename to src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_4.java
index aa18566d8..19cc4d671 100644
--- a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java
+++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_4.java
@@ -1,19 +1,19 @@
-package org.support.project.knowledge.deploy.v1_12;
+package org.support.project.knowledge.deploy.v1_11_0;
 
 import org.support.project.knowledge.deploy.Migrate;
 import org.support.project.ormapping.tool.dao.InitializeDao;
 
-public class Migrate_1_12_0 implements Migrate {
+public class Migrate_1_11_4 implements Migrate {
 
-    public static Migrate_1_12_0 get() {
-        return org.support.project.di.Container.getComp(Migrate_1_12_0.class);
+    public static Migrate_1_11_4 get() {
+        return org.support.project.di.Container.getComp(Migrate_1_11_4.class);
     }
 
     @Override
     public boolean doMigrate() throws Exception {
         InitializeDao initializeDao = InitializeDao.get();
         String[] sqlpaths = {
-            "/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql",
+            "/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_4.sql",
         };
         initializeDao.initializeDatabase(sqlpaths);
         return true;
diff --git a/src/main/java/org/support/project/knowledge/logic/AggregateLogic.java b/src/main/java/org/support/project/knowledge/logic/AggregateLogic.java
new file mode 100644
index 000000000..84b20d31c
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/logic/AggregateLogic.java
@@ -0,0 +1,472 @@
+package org.support.project.knowledge.logic;
+
+import java.util.List;
+
+import org.support.project.aop.Aspect;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.DateUtils;
+import org.support.project.di.Container;
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.config.AppConfig;
+import org.support.project.knowledge.config.UserConfig;
+import org.support.project.knowledge.dao.ActivitiesDao;
+import org.support.project.knowledge.dao.CommentsDao;
+import org.support.project.knowledge.dao.KnowledgesDao;
+import org.support.project.knowledge.dao.LikeCommentsDao;
+import org.support.project.knowledge.dao.LikesDao;
+import org.support.project.knowledge.dao.ParticipantsDao;
+import org.support.project.knowledge.dao.PointKnowledgeHistoriesDao;
+import org.support.project.knowledge.dao.PointUserHistoriesDao;
+import org.support.project.knowledge.dao.StockKnowledgesDao;
+import org.support.project.knowledge.dao.SurveyAnswersDao;
+import org.support.project.knowledge.dao.ViewHistoriesDao;
+import org.support.project.knowledge.entity.CommentsEntity;
+import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
+import org.support.project.knowledge.entity.LikesEntity;
+import org.support.project.knowledge.entity.ParticipantsEntity;
+import org.support.project.knowledge.entity.PointUserHistoriesEntity;
+import org.support.project.knowledge.entity.StockKnowledgesEntity;
+import org.support.project.knowledge.entity.SurveyAnswersEntity;
+import org.support.project.knowledge.entity.ViewHistoriesEntity;
+import org.support.project.knowledge.logic.activity.Activity;
+import org.support.project.knowledge.logic.activity.ActivityLogic;
+import org.support.project.ormapping.config.Order;
+import org.support.project.web.bean.LoginedUser;
+import org.support.project.web.dao.UserConfigsDao;
+import org.support.project.web.dao.UsersDao;
+import org.support.project.web.entity.UsersEntity;
+
+@DI(instance = Instance.Prototype)
+public class AggregateLogic {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(AggregateLogic.class);
+    /** Get instance */
+    public static AggregateLogic get() {
+        return Container.getComp(AggregateLogic.class);
+    }
+    
+    private static final int _WAIT = 100;
+    private int limit = 1; // 1件毎にコミットいれないと、別コネクションで取得して結果をクリアしてしまう？
+    private int calcTotal = 0; // トータルポイントの再計算に使う内部保持変数（シーケンシャルに1件づつ処理をすること）
+    private int processCount = 0;
+
+    private void logging(String string) {
+        processCount++;
+        if (processCount % 100 == 0) {
+            LOG.info("\t During execution of the " + string + ". [count]" + processCount);
+        }
+    }
+    
+    /**
+     * 全て再集計
+     * @throws Exception 
+     */
+    public void startAggregate() throws Exception {
+        // 参照回数を集計
+        this.doSetViewCountToKnowledge();
+        // ユーザについているポイントをクリア
+        this.clearUserPoint();
+        // 既に登録済のActivityの履歴があればクリア
+        this.initActivities();
+        // Knowledgeを登録したイベントによりポイントを集計
+        this.doAddPointByKnowledge();
+        // Knowledgeを参照したイベントによりポイントを集計
+        this.doAddPointByKnowledgeShow();
+        // Knowledgeにイイネを押したイベントによりポイント集計
+        this.doAddPointByKnowledgeLike();
+        // Knowledgeをストックイベントによりポイント集計
+        this.doAddPointByKnowledgeStock();
+        // Knowledgeのアンケートを回答したイベントによりポイント集計
+        this.doAddPointByKnowledgeAnswer();
+        // Knowledgeイベント参加したイベントによりポイント集計
+        this.doAddPointByKnowledgeJoinEvent();
+        // コメントを登録したイベントによりポイント集計
+        this.doAddPointByCommentInsert();
+        // コメントへのイイネイベントによりポイント集計
+        this.doAddPointByCommentLike();
+        
+        // ポイント集計は、今後は時系列になり問題は無いが、このマイグレーションの中では、時系列にはならんでいないので、履歴のトータルを再構築
+        this.reCalcPointUserHistory();
+    }
+
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void initActivities() {
+        PointKnowledgeHistoriesDao.get().removeAll();
+        PointUserHistoriesDao.get().removeAll();
+        ActivitiesDao.get().removeAll();
+    }
+
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void doSetViewCountToKnowledge() throws InterruptedException {
+        LOG.info("Set view count to Knowledge");
+        processCount = 0;
+        List<KnowledgesEntity> knowledges;
+        int offset = 0;
+        do {
+            logging("Set view count to Knowledge");
+            knowledges = doSetViewCountToKnowledge(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (knowledges.size() > 0);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public void clearUserPoint() {
+        UserConfigsDao.get().removeAllUserConfig(AppConfig.get().getSystemName(), UserConfig.POINT);
+    }
+    
+    public void reCalcPointUserHistory() throws InterruptedException {
+        LOG.info("Recalc user cp");
+        List<UsersEntity> list;
+        int offset = 0;
+        do {
+            list = reCalcPointUserHistory(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+    private List<UsersEntity> reCalcPointUserHistory(int offset) throws InterruptedException {
+        List<UsersEntity> list;
+        list = UsersDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (UsersEntity item : list) {
+            processCount = 0;
+            LOG.info("  Recalculation total point. [user]" + item.getUserId());
+            int offset2 = 0;
+            calcTotal = 0; // ユーザ毎にトータルポイントを初期化
+            List<PointUserHistoriesEntity> histories;
+            do {
+                logging(" Recalculation... ");
+                histories = reCalcPointUserHistoryOnUser(item.getUserId(), offset2);
+                offset2 = offset2 + limit;
+                synchronized (this) {
+                    wait(_WAIT);
+                }
+            } while (histories.size() > 0);
+        }
+        return list;
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private List<PointUserHistoriesEntity> reCalcPointUserHistoryOnUser(Integer userId, int offset2) {
+        List<PointUserHistoriesEntity> list;
+        list = PointUserHistoriesDao.get().selectOnUser(userId, limit, offset2, Order.ASC);
+        for (PointUserHistoriesEntity item : list) {
+            item.setBeforeTotal(calcTotal);
+            calcTotal += item.getPoint();
+            item.setTotal(calcTotal); // 日付毎に処理してトータルを再計算
+            LOG.debug("\t" + DateUtils.getSimpleFormat().format(item.getInsertDatetime()) + " [total]" + calcTotal);
+            PointUserHistoriesDao.get().physicalUpdate(item);
+        }
+        return list;
+    }
+
+    public void doAddPointByCommentLike() throws InterruptedException {
+        LOG.info("Aggregate point by comment like");
+        processCount = 0;
+        List<LikeCommentsEntity> list;
+        int offset = 0;
+        do {
+            logging("Aggregate point by comment like");
+            list = doAddPointByCommentLike(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    private List<LikeCommentsEntity> doAddPointByCommentLike(int offset) {
+        List<LikeCommentsEntity> list;
+        list = LikeCommentsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (LikeCommentsEntity item : list) {
+            CommentsEntity comment = CommentsDao.get().selectOnKey(item.getCommentNo());
+            if (comment == null) {
+                LOG.debug("    comment [" + item.getCommentNo() + "] is not found. so skip add point by comment like.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by comment like.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.debug("    comment [" + item.getCommentNo() + "], knowledge [ " + comment.getKnowledgeId() + "]");
+            ActivityLogic.get().processActivity(Activity.COMMENT_LIKE, user, item.getInsertDatetime(), comment);
+        }
+        return list;
+    }
+
+    public void doAddPointByCommentInsert() throws InterruptedException {
+        LOG.info("Aggregate point by comment insert");
+        processCount = 0;
+        List<CommentsEntity> list;
+        int offset = 0;
+        do {
+            logging("Aggregate point by comment insert");
+            list = doAddPointByKnowledgeComment(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<CommentsEntity> doAddPointByKnowledgeComment(int offset) {
+        List<CommentsEntity> list;
+        list = CommentsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (CommentsEntity item : list) {
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by comment insert.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.debug("    comment [" + item.getCommentNo() + "], knowledge [ " + item.getKnowledgeId() + "]");
+            ActivityLogic.get().processActivity(Activity.COMMENT_INSERT, user, item.getInsertDatetime(), item);
+        }
+        return list;
+    }
+
+    public void doAddPointByKnowledgeJoinEvent() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge join event");
+        processCount = 0;
+        List<ParticipantsEntity> list;
+        int offset = 0;
+        do {
+            logging("Aggregate point by knowledge join event");
+            list = doAddPointByKnowledgeJoinEvent(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ParticipantsEntity> doAddPointByKnowledgeJoinEvent(int offset) {
+        List<ParticipantsEntity> list;
+        list = ParticipantsDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (ParticipantsEntity item : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
+            if (knowledge == null) {
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge event.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge event.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_EVENT_ADD, user, item.getInsertDatetime(), knowledge);
+        }
+        return list;
+    }
+
+    public void doAddPointByKnowledgeAnswer() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge answer");
+        processCount = 0;
+        List<SurveyAnswersEntity> list;
+        int offset = 0;
+        do {
+            logging("Aggregate point by knowledge answer");
+            list = doAddPointByKnowledgeAnswer(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<SurveyAnswersEntity> doAddPointByKnowledgeAnswer(int offset) {
+        List<SurveyAnswersEntity> list;
+        list = SurveyAnswersDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (SurveyAnswersEntity item : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
+            if (knowledge == null) {
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge survey answer.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge survey answer.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_ANSWER, user, item.getInsertDatetime(), knowledge);
+        }
+        return list;
+    }
+
+    public void doAddPointByKnowledgeStock() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge stock");
+        processCount = 0;
+        List<StockKnowledgesEntity> list;
+        int offset = 0;
+        do {
+            logging("Aggregate point by knowledge stock");
+            list = doAddPointByKnowledgeStock(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<StockKnowledgesEntity> doAddPointByKnowledgeStock(int offset) {
+        List<StockKnowledgesEntity> list;
+        list = StockKnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (StockKnowledgesEntity item : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
+            if (knowledge == null) {
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge stock.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge stock.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_STOCK, user, item.getInsertDatetime(), knowledge);
+        }
+        return list;
+    }
+
+    public void doAddPointByKnowledgeLike() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge like");
+        processCount = 0;
+        List<LikesEntity> list;
+        int offset = 0;
+        do {
+            logging("Aggregate point by knowledge like");
+            list = doAddPointByKnowledgeLike(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<LikesEntity> doAddPointByKnowledgeLike(int offset) {
+        List<LikesEntity> list;
+        list = LikesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (LikesEntity item : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
+            if (knowledge == null) {
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge like.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_LIKE, user, item.getInsertDatetime(), knowledge);
+        }
+        return list;
+    }
+    
+    public void doAddPointByKnowledgeShow() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge show");
+        processCount = 0;
+        List<ViewHistoriesEntity> list;
+        int offset = 0;
+        do {
+            logging("Aggregate point by knowledge show");
+            list = doAddPointByKnowledgeShow(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (list.size() > 0);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<ViewHistoriesEntity> doAddPointByKnowledgeShow(int offset) {
+        List<ViewHistoriesEntity> list;
+        list = ViewHistoriesDao.get().selectDistinctAllWidthPager(limit, offset);
+        for (ViewHistoriesEntity item : list) {
+            KnowledgesEntity knowledge = KnowledgesDao.get().selectOnKey(item.getKnowledgeId());
+            if (knowledge == null) {
+                LOG.debug("    knowledge [" + item.getKnowledgeId() + "] is not found. so skip add point by knowledge show.");
+                continue;
+            }
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.debug("    event user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge show.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] ");
+            ActivityLogic.get().processActivity(Activity.KNOWLEDGE_SHOW, user, item.getInsertDatetime(), knowledge);
+        }
+        return list;
+    }
+
+    public void doAddPointByKnowledge() throws InterruptedException {
+        LOG.info("Aggregate point by knowledge insert");
+        processCount = 0;
+        List<KnowledgesEntity> knowledges;
+        int offset = 0;
+        do {
+            logging("Aggregate point by knowledge insert");
+            knowledges = doAddPointByKnowledge(offset);
+            offset = offset + limit;
+            synchronized (this) {
+                wait(_WAIT);
+            }
+        } while (knowledges.size() > 0);
+    }
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgesEntity> doAddPointByKnowledge(int offset) {
+        List<KnowledgesEntity> knowledges;
+        knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (KnowledgesEntity item : knowledges) {
+            LoginedUser user = new LoginedUser();
+            UsersEntity account = UsersDao.get().selectOnKey(item.getInsertUser());
+            if (account == null) {
+                LOG.debug("    insert user [" + item.getInsertUser() + "] is not found. so skip add point by knowledge insert.");
+                continue;
+            }
+            user.setLoginUser(account);
+            LOG.debug("    knowledge [" + item.getKnowledgeId() + "] ");
+            ActivityLogic.get().processKnowledgeSaveActivity(user, item.getInsertDatetime(), item);
+        }
+        return knowledges;
+    }
+
+    @Aspect(advice = org.support.project.ormapping.transaction.Transaction.class)
+    public List<KnowledgesEntity> doSetViewCountToKnowledge(int offset) {
+        List<KnowledgesEntity> knowledges;
+        knowledges = KnowledgesDao.get().selectAllWidthPager(limit, offset, Order.ASC);
+        for (KnowledgesEntity knowledge : knowledges) {
+            long count = ViewHistoriesDao.get().selectCountOnKnowledgeId(knowledge.getKnowledgeId());
+            KnowledgesDao.get().updateViewCount(count, knowledge.getKnowledgeId());
+            //ついでにポイントも初期化
+            KnowledgesDao.get().updatePoint(knowledge.getKnowledgeId(), 0);
+            LOG.debug("    knowledge [" + knowledge.getKnowledgeId() + "] is updated. view count : " + count);
+        }
+        return knowledges;
+    }
+
+
+}
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index 4a9bb47d8..ac429e2d6 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -48,7 +48,7 @@ private List<ActivityProcessor> getActivityProcessors(Activity activity) {
         if (activity == Activity.KNOWLEDGE_POST_PUBLIC
                 || activity == Activity.KNOWLEDGE_POST_PROTECTED
                 || activity == Activity.KNOWLEDGE_POST_PRIVATE) {
-            array.add(KnowledgesaveActivity.get());
+            array.add(KnowledgeSaveActivity.get());
         } else if (activity == Activity.KNOWLEDGE_SHOW) {
             array.add(KnowledgeShowActivity.get());
         } else if (activity == Activity.KNOWLEDGE_LIKE) {
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
index 2ae15010c..f03beb918 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/CommentLikeActivity.java
@@ -6,7 +6,7 @@
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-import org.support.project.knowledge.dao.LikeCommentsDao;
+import org.support.project.knowledge.dao.ActivitiesDao;
 
 /**
  * 
@@ -31,7 +31,8 @@ private int getPoint() {
         }
         // 指定のコメントについたイイネの件数（ユニーク件数）でポイントを増やす
         int point = 10;
-        long count = LikeCommentsDao.get().selectUniqueUserCountOnCommentNo(getComment().getCommentNo());
+        long count = ActivitiesDao.get().selectCountByTarget(
+                getActivity().getValue(), getComment().getCommentNo());
         int add = 0;
         if (count > 100) {
             add = 1000;
@@ -42,6 +43,9 @@ private int getPoint() {
             int[] points = {1,1,1,1,1,2,2,2,2,3};
             add += points[RandomUtil.randamNum(0, 10)]; // ランダムで値が増減するボーナスポイント
         }
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("[Bonus point]: " + add + " [COUNT]:" + count);
+        }
         point += add;
         this.point = point;
         return point;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
index 7f5a2d327..2d3abc4d3 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeEventActivity.java
@@ -6,7 +6,7 @@
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-import org.support.project.knowledge.dao.ParticipantsDao;
+import org.support.project.knowledge.dao.ActivitiesDao;
 
 /**
  * 
@@ -31,7 +31,8 @@ private int getPoint() {
         }
         // 参加者人数により増減
         int point = 5;
-        long count = ParticipantsDao.get().selectUniqueUserCountOnKnowledgeId(getKnowledge().getKnowledgeId());
+        long count = ActivitiesDao.get().selectCountByTarget(
+                getActivity().getValue(), getKnowledge().getKnowledgeId());
         int add = 0;
         if (count > 100) {
             add = 1000;
@@ -42,6 +43,9 @@ private int getPoint() {
             int[] points = {1,1,1,1,1,2,2,2,2,3};
             add += points[RandomUtil.randamNum(0, 10)]; // ランダムで値が増減するボーナスポイント
         }
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("[Bonus point]: " + add + " [COUNT]:" + count);
+        }
         point += add;
         this.point = point;
         return point;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
index 25fe4865c..ae8590e58 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeLikeActivity.java
@@ -6,7 +6,7 @@
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-import org.support.project.knowledge.dao.LikesDao;
+import org.support.project.knowledge.dao.ActivitiesDao;
 
 /**
  * 
@@ -31,7 +31,8 @@ private int getPoint() {
         }
         // ユニークユーザのイイネ件数によりポイントを増やす
         int point = 10;
-        long count = LikesDao.get().selectUniqueUserCountOnKnowledgeId(getKnowledge().getKnowledgeId());
+        long count = ActivitiesDao.get().selectCountByTarget(
+                getActivity().getValue(), getKnowledge().getKnowledgeId());
         int add = 0;
         if (count > 100) {
             add = 1000;
@@ -42,6 +43,9 @@ private int getPoint() {
             int[] points = {1,1,1,1,1,2,2,2,2,3};
             add += points[RandomUtil.randamNum(0, 10)]; // ランダムで値が増減するボーナスポイント
         }
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("[Bonus point]: " + add + " [COUNT]:" + count);
+        }
         point += add;
         this.point = point;
         return point;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
index 11aa26f95..02242d665 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeShowActivity.java
@@ -5,7 +5,7 @@
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-import org.support.project.knowledge.dao.ViewHistoriesDao;
+import org.support.project.knowledge.dao.ActivitiesDao;
 
 /**
  * 
@@ -31,14 +31,18 @@ protected Activity getActivity() {
     private int getPoint() {
         // ユニークな参照者が多くなると、ポイントが増えるように調整(投稿数が少なくても、良い記事を書けばポイントが高くなる）
         int point = 1;
-        long count = ViewHistoriesDao.get().selectUniqueUserCountOnKnowledgeId(getKnowledge().getKnowledgeId());
+        long count = ActivitiesDao.get().selectCountByTarget(
+                getActivity().getValue(), getKnowledge().getKnowledgeId());
         int add = 0;
         if (count > 1000) {
-            add = 200;
+            add = 100; // 1000 人以上だと100固定
         } else if (count > 100){
-            add = ((int) count - 100 ) / 5; // 100人を超えると、5人毎に1ポイント増えるようになる
+            add = 10 + ((int) count - 100) / 15; // 100人を超えると、20人毎に1ポイント増えるようになる
         } else if (count > 10){
-            add = (int) count / 10; // 10人を超えると、ポイントが増える(10人毎に１ポイント）
+            add = ((int) count) / 10; // 10人を超えると、ポイントが増える(10人毎に１ポイント）
+        }
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("[Bonus point]: " + add + " [COUNT]:" + count);
         }
         point += add;
         return point;
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
index 7443c1f93..1f3cc61d1 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
@@ -21,10 +21,10 @@
  * @author koda
  */
 @DI(instance = Instance.Prototype)
-public class KnowledgesaveActivity extends AbstractAddPointForKnowledgeProcessor implements MultiActivityProcessor {
-    private static final Log LOG = LogFactory.getLog(KnowledgesaveActivity.class);
-    public static KnowledgesaveActivity get() {
-        return Container.getComp(KnowledgesaveActivity.class);
+public class KnowledgeSaveActivity extends AbstractAddPointForKnowledgeProcessor implements MultiActivityProcessor {
+    private static final Log LOG = LogFactory.getLog(KnowledgeSaveActivity.class);
+    public static KnowledgeSaveActivity get() {
+        return Container.getComp(KnowledgeSaveActivity.class);
     }
     private Activity activity;
     public void setActivity(Activity activity) {
diff --git a/src/main/java/org/support/project/knowledge/websocket/AggregateEndpoint.java b/src/main/java/org/support/project/knowledge/websocket/AggregateEndpoint.java
new file mode 100644
index 000000000..55ac44564
--- /dev/null
+++ b/src/main/java/org/support/project/knowledge/websocket/AggregateEndpoint.java
@@ -0,0 +1,72 @@
+package org.support.project.knowledge.websocket;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+
+import org.support.project.common.bat.JobResult;
+import org.support.project.common.log.Log;
+import org.support.project.common.log.LogFactory;
+import org.support.project.knowledge.bat.AggregateBat;
+import org.support.project.web.websocket.CallBatchEndpoint;
+import org.support.project.web.websocket.EndpointConfigurator;
+
+import net.arnx.jsonic.JSONException;
+
+@ServerEndpoint(value = "/aggregate", configurator = EndpointConfigurator.class)
+public class AggregateEndpoint extends CallBatchEndpoint {
+    /** ログ */
+    private static final Log LOG = LogFactory.getLog(AggregateEndpoint.class);
+    
+    @OnOpen
+    public void onOpen(Session session) throws IOException {
+        LOG.info("Endpoint instance: " + this.hashCode());
+        if (!super.isAdmin(session)) {
+            session.close();
+        }
+    }
+    
+    @OnClose
+    public void onClose(Session session) {
+        super.onClose(session);
+    }
+
+    @OnMessage
+    public void onMessage(String text, Session session) throws JSONException, IOException {
+        LOG.info(text);
+        if (text.equals("START_PROCESS") && super.isAdmin(session)) {
+            setSendPlefix("");
+            call(session, AggregateBat.class);
+        }
+    }
+
+
+    @OnError
+    public void onError(Throwable t) {
+        LOG.warn("websocket on error." + t.getClass().getName() + " : " + t.getMessage());
+        if (LOG.isDebugEnabled()) {
+            LOG.warn("websocket error -> ", t);
+        }
+    }
+
+    @Override
+    public void finishJob(JobResult result, Class<?> batch, List<Session> sessions) {
+        super.finishJob(result, batch, sessions);
+        for (Session session : sessions) {
+            if (!super.isAdmin(session)) {
+                return;
+            }
+            try {
+                session.close();
+            } catch (IOException e) {
+                LOG.warn("websocket on error." + e.getClass().getName() + " : " + e.getMessage());
+            }
+        }
+    }
+}
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index f4e2b7b45..2adc70e39 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -728,6 +728,8 @@ knowledge.stock.label.link=link to stock
 
 knowledge.language.title=Language
 
+knowledge.admin.menu=System menu
+knowledge.admin.backtomenu=Back to System menu
 knowledge.admin.logging.files=Log files
 knowledge.admin.logging.delete=Delete config
 knowledge.admin.logging.delete.info=When the setting is enabled, you can delete it to older than this number of days
@@ -874,3 +876,6 @@ knowledge.activity.type.1032.comment.liked=This user's comment on {1} was liked
 
 knowledge.activity.type.13.inserted={1} was posted by {2}
 knowledge.activity.type.23.shown={1} was shown by {2}
+
+knowledge.aggregate.title=ReAggregation
+knowledge.aggregate.msg=ReAggregation Contribution Point and View count.<br/>Since it takes quite a long time to execute, please execute it in a period with less access.
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index 3527df032..d6b6c08ae 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -728,6 +728,8 @@ knowledge.stock.label.link=ストック管理画面へ移動。
 
 knowledge.language.title=Language
 
+knowledge.admin.menu=システム設定
+knowledge.admin.backtomenu=システム設定メニューへ戻る
 knowledge.admin.logging.files=ログファイル一覧
 knowledge.admin.logging.delete=ログの保存期間（自動削除）
 knowledge.admin.logging.delete.info=設定を有効にすると、この日数以上経過すると削除します
@@ -875,4 +877,5 @@ knowledge.activity.type.1032.comment.liked=このユーザが投稿した {1} 
 knowledge.activity.type.13.inserted={1} の記事が、{2} によって投稿されました
 knowledge.activity.type.23.shown={1} の記事を、{2} が参照しました
 
-
+knowledge.aggregate.title=再集計
+knowledge.aggregate.msg=Contribution Point や、参照回数などの数値を再集計します。<br/>実行にはかなり時間がかかりますので、アクセスの少ない期間に実行してください。
diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_4.sql
similarity index 100%
rename from src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql
rename to src/main/resources/org/support/project/knowledge/deploy/v1_11_0/migrate_v1_11_4.sql
diff --git a/src/main/webapp/WEB-INF/views/admin/aggregate/index.jsp b/src/main/webapp/WEB-INF/views/admin/aggregate/index.jsp
new file mode 100644
index 000000000..bc394838e
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/admin/aggregate/index.jsp
@@ -0,0 +1,83 @@
+<%@page pageEncoding="UTF-8" isELIgnored="false" session="false" errorPage="/WEB-INF/views/commons/errors/jsp_error.jsp"%>
+<%@page import="org.support.project.web.util.JspUtil"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<% JspUtil jspUtil = new JspUtil(request, pageContext); %>
+
+
+<c:import url="/WEB-INF/views/commons/layout/layoutMain.jsp">
+
+<c:param name="PARAM_HEAD">
+</c:param>
+
+<c:param name="PARAM_SCRIPTS">
+
+<!-- build:js(src/main/webapp) js/page-aggregate.js -->
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/jquery/dist/jquery.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/bootstrap/dist/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/bower/bluebird/js/browser/bluebird.min.js"></script>
+<!-- endbuild -->
+
+<script>
+$('#log').val('');
+var msgs = [];
+var appendMsg = function(msg) {
+    msgs.push(msg);
+    if (msgs.length > 100) {
+        msgs.shift();
+    }
+    $('#log').val(msgs.join("\n"));
+    var psconsole = $('#log');
+    psconsole.scrollTop(
+        psconsole[0].scrollHeight - psconsole.height()
+    );
+};
+
+var forRtoA = document.createElement('a');
+forRtoA.href = '<%= request.getContextPath() %>/aggregate';
+console.log(forRtoA.href.replace("http://", "ws://").replace("https://", "wss://"));
+webSocket = new WebSocket(forRtoA.href.replace("http://", "ws://").replace("https://", "wss://"));
+webSocket.onopen = function() {
+    console.log('onopen');
+    appendMsg('start websocket.');
+}
+webSocket.onclose = function() {
+    console.log('onclose');
+}
+webSocket.onmessage = function(message) {
+    console.log(message);
+    var obj = JSON.parse(message.data);
+    console.log(obj.message);
+    appendMsg(obj.message);
+}
+webSocket.onerror = function(message) {
+    console.log(message);
+}
+$('#startMigrate').click(function() {
+    webSocket.send('START_PROCESS');
+});
+
+</script>
+</c:param>
+
+
+<c:param name="PARAM_CONTENT">
+<h4 class="title">
+<%= jspUtil.label("knowledge.aggregate.title") %>
+</h4>
+<%= jspUtil.label("knowledge.aggregate.msg") %>
+<br/>
+<button class="btn btn-primary" id="startMigrate">Execute</button><br/>
+<br/>
+
+-- Execute Log-- <br/>
+<textarea class="form-control" id="log" readonly="readonly" rows="5"></textarea>
+
+<a href="<%= request.getContextPath() %>/admin.systemconfig/index"><%= jspUtil.label("knowledge.admin.backtomenu") %></a>
+
+</c:param>
+
+</c:import>
+
diff --git a/src/main/webapp/WEB-INF/views/admin/config/system.jsp b/src/main/webapp/WEB-INF/views/admin/config/system.jsp
index 46a74abd3..3a2b87728 100644
--- a/src/main/webapp/WEB-INF/views/admin/config/system.jsp
+++ b/src/main/webapp/WEB-INF/views/admin/config/system.jsp
@@ -79,8 +79,8 @@
 </form>
 
 <hr/>
-Database version: <%= jspUtil.out("db_version") %><br/>
-
+Application version: <%= jspUtil.label("label.version") %><br/>
+Database schema version: <%= jspUtil.out("db_version") %><br/>
 
 </c:param>
 
diff --git a/src/main/webapp/WEB-INF/views/admin/systemconfig/index.jsp b/src/main/webapp/WEB-INF/views/admin/systemconfig/index.jsp
index b42b95965..294813e72 100644
--- a/src/main/webapp/WEB-INF/views/admin/systemconfig/index.jsp
+++ b/src/main/webapp/WEB-INF/views/admin/systemconfig/index.jsp
@@ -102,6 +102,9 @@
             <li><a href="<%=request.getContextPath()%>/admin.database/reindexing" style="cursor: pointer;">
                 <i class="fa fa-refresh"></i>&nbsp;<%=jspUtil.label("knowledge.navbar.data.reindexing")%>
             </a></li>
+            <li><a href="<%=request.getContextPath()%>/admin.aggregate/index" style="cursor: pointer;">
+                <i class="fa fa-calculator"></i>&nbsp;<%=jspUtil.label("knowledge.aggregate.title")%>
+            </a></li>
             <li><a href="<%=request.getContextPath()%>/admin.database/export" style="cursor: pointer;">
                 <i class="fa fa-external-link"></i>&nbsp;<%=jspUtil.label("knowledge.navbar.data.export")%>
             </a></li>
diff --git a/src/main/webapp/WEB-INF/views/commons/maintenance.jsp b/src/main/webapp/WEB-INF/views/commons/maintenance.jsp
index d12710fcb..8713cd577 100644
--- a/src/main/webapp/WEB-INF/views/commons/maintenance.jsp
+++ b/src/main/webapp/WEB-INF/views/commons/maintenance.jsp
@@ -14,43 +14,7 @@
 <html>
 <head>
 
-<meta charset="UTF-8">
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta http-equiv="imagetoolbar" content="no" />
-
-<meta http-equiv="expires" content="0" />
-<meta http-equiv="Pragma" content="no-cache" />
-<meta http-equiv="Cache-Control" content="no-cache">
-
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-
-<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
-
-<meta content="<%= jspUtil.label("knowledge.header.meta.title") %>" name="title">
-<meta content="<%= jspUtil.label("knowledge.header.meta.description") %>" name="description">
-<meta content='ナレッジマネジメント,ナレッジベース,情報共有,オープンソース,KnowledgeBase,KnowledgeManagement,OSS,Markdown' name='keywords'>
-<meta property="og:type" content="article"/>
-<meta property="og:title" content="<%= jspUtil.label("knowledge.header.meta.title") %>"/>
-<meta property="og:description" content="<%= jspUtil.label("knowledge.header.meta.description") %>" />
-<%-- <meta property="og:image" content="" /> --%>
-<meta property="og:url" content="https://support-project.org/knowledge/index" />
-<meta property="og:site_name" content="Knowledge"/>
-
-<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/vnd.microsoft.icon" /> 
-
-<% if (StringUtils.isNotEmpty(jspUtil.out("thema"))) { %>
-<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/bootswatch/<%= jspUtil.out("thema") %>/bootstrap.min.css" />
-<% } else { %>
-<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/bootswatch/<%= jspUtil.cookie(SystemConfig.COOKIE_KEY_THEMA, "flatly") %>/bootstrap.min.css" />
-<% } %>
-
-<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/font-awesome/css/font-awesome.min.css" />
-<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/flag-icon-css/css/flag-icon.min.css" />
-
-<!-- Knowledge - <%= jspUtil.label("label.version") %> -->
+<c:import url="/WEB-INF/views/commons/layout/commonHeader.jsp" />
 
 </head>
 
diff --git a/src/main/webapp/WEB-INF/views/commons/migrate.jsp b/src/main/webapp/WEB-INF/views/commons/migrate.jsp
index 11c6a8b85..9e6dddbdd 100644
--- a/src/main/webapp/WEB-INF/views/commons/migrate.jsp
+++ b/src/main/webapp/WEB-INF/views/commons/migrate.jsp
@@ -15,43 +15,7 @@
 <html>
 <head>
 
-<meta charset="UTF-8">
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta http-equiv="imagetoolbar" content="no" />
-
-<meta http-equiv="expires" content="0" />
-<meta http-equiv="Pragma" content="no-cache" />
-<meta http-equiv="Cache-Control" content="no-cache">
-
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-
-<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
-
-<meta content="<%= jspUtil.label("knowledge.header.meta.title") %>" name="title">
-<meta content="<%= jspUtil.label("knowledge.header.meta.description") %>" name="description">
-<meta content='ナレッジマネジメント,ナレッジベース,情報共有,オープンソース,KnowledgeBase,KnowledgeManagement,OSS,Markdown' name='keywords'>
-<meta property="og:type" content="article"/>
-<meta property="og:title" content="<%= jspUtil.label("knowledge.header.meta.title") %>"/>
-<meta property="og:description" content="<%= jspUtil.label("knowledge.header.meta.description") %>" />
-<%-- <meta property="og:image" content="" /> --%>
-<meta property="og:url" content="https://support-project.org/knowledge/index" />
-<meta property="og:site_name" content="Knowledge"/>
-
-<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/vnd.microsoft.icon" /> 
-
-<% if (StringUtils.isNotEmpty(jspUtil.out("thema"))) { %>
-<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/bootswatch/<%= jspUtil.out("thema") %>/bootstrap.min.css" />
-<% } else { %>
-<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/bootswatch/<%= jspUtil.cookie(SystemConfig.COOKIE_KEY_THEMA, "flatly") %>/bootstrap.min.css" />
-<% } %>
-
-<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/font-awesome/css/font-awesome.min.css" />
-<link rel="stylesheet" href="<%= request.getContextPath() %>/bower/flag-icon-css/css/flag-icon.min.css" />
-
-<!-- Knowledge - <%= jspUtil.label("label.version") %> -->
+<c:import url="/WEB-INF/views/commons/layout/commonHeader.jsp" />
 
 </head>
 

From 880a739f1a2b2f1d8b136602c2821c23e0ec7224 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 11 Oct 2017 00:25:21 +0900
Subject: [PATCH 120/138] #895 Change filename

---
 .../{KnowledgesaveActivity.java => KnowledgeSaveActivityAAA.java} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/main/java/org/support/project/knowledge/logic/activity/{KnowledgesaveActivity.java => KnowledgeSaveActivityAAA.java} (100%)

diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeSaveActivityAAA.java
similarity index 100%
rename from src/main/java/org/support/project/knowledge/logic/activity/KnowledgesaveActivity.java
rename to src/main/java/org/support/project/knowledge/logic/activity/KnowledgeSaveActivityAAA.java

From 52ddfa807f48ecf1917951159d97e20f927fc2e8 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 11 Oct 2017 00:25:38 +0900
Subject: [PATCH 121/138] #895 Change filename

---
 .../{KnowledgeSaveActivityAAA.java => KnowledgeSaveActivity.java} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/main/java/org/support/project/knowledge/logic/activity/{KnowledgeSaveActivityAAA.java => KnowledgeSaveActivity.java} (100%)

diff --git a/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeSaveActivityAAA.java b/src/main/java/org/support/project/knowledge/logic/activity/KnowledgeSaveActivity.java
similarity index 100%
rename from src/main/java/org/support/project/knowledge/logic/activity/KnowledgeSaveActivityAAA.java
rename to src/main/java/org/support/project/knowledge/logic/activity/KnowledgeSaveActivity.java

From c5815cae223ec233fa36ac247e40733367c24ee7 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 11 Oct 2017 00:51:04 +0900
Subject: [PATCH 122/138] #899 Change the position of the button on the login
 page

---
 src/main/webapp/WEB-INF/views/auth/form.jsp | 127 ++++++++++----------
 1 file changed, 64 insertions(+), 63 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/auth/form.jsp b/src/main/webapp/WEB-INF/views/auth/form.jsp
index c7f5a2a36..57dfc4974 100644
--- a/src/main/webapp/WEB-INF/views/auth/form.jsp
+++ b/src/main/webapp/WEB-INF/views/auth/form.jsp
@@ -19,73 +19,74 @@
 <c:param name="PARAM_CONTENT">
 <h4 class="title"><%= jspUtil.label("label.login") %></h4>
 
-	<div class="container">
-		<form class=""
-			action="<%=request.getContextPath()%>/signin"
-			name="login" method="post">
-			
-			<% if (!StringUtils.isEmpty(request.getAttribute("page")) 
-					&& !"/open.knowledge/list".equals(request.getAttribute("page"))) { %>
-				<div class="form-group">
-					<div class="">
-					<%= jspUtil.label("knowledge.auth.description") %>
-					</div>
-				</div>
-			<% } %>
-			
-			<c:if test="${loginError}">
-				<div class="form-group">
-					<div class="">
-						<div class="alert alert-danger alert-dismissible" role="alert">
-						<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-						<%= jspUtil.label("message.login.error") %>
-						</div>
-					</div>
-				</div>
-			</c:if>
-			
-			<div class="form-group">
-				<label for="inputEmail" class="control-label"><%= jspUtil.label("knowledge.auth.label.id") %></label>
-				<div class="">
-				<input type="text" class="form-control"
-					name="username" value="<%= jspUtil.out("username") %>"
-					placeholder="<%= jspUtil.label("knowledge.auth.label.id") %>" autofocus>
-				</div>
-			</div>
-			<div class="form-group">
-				<label for="inputPass" class="control-label"><%= jspUtil.label("knowledge.auth.label.password") %></label>
-				<div class="">
-				<input type="password" class="form-control"
-					name="password" value="<%= jspUtil.out("password") %>"
-					placeholder="<%= jspUtil.label("knowledge.auth.label.password") %>">
-				</div>
-			</div>
-			<input type="hidden" name="page" value="<%= jspUtil.out("page") %>" id="page">
-			
-			<a href="<%=request.getContextPath()%>/open.PasswordInitialization/view" class="text-primary">
-				<i class="fa fa-key"></i>&nbsp;<%= jspUtil.label("knowledge.auth.forgot.password") %>
-			</a>
-			<br/><br/>
-			
-			<div class="form-group">
-				<div class="">
-					<button class="btn btn-primary " type="submit">
-						<i class="fa fa-sign-in"></i>&nbsp;<%= jspUtil.label("knowledge.auth.signin") %>
-					</button>
+    <div class="container">
+        <form class=""
+            action="<%=request.getContextPath()%>/signin"
+            name="login" method="post">
+            
+            <% if (!StringUtils.isEmpty(request.getAttribute("page")) 
+                    && !"/open.knowledge/list".equals(request.getAttribute("page"))) { %>
+                <div class="form-group">
+                    <div class="">
+                    <%= jspUtil.label("knowledge.auth.description") %>
+                    </div>
+                </div>
+            <% } %>
+            
+            <c:if test="${loginError}">
+                <div class="form-group">
+                    <div class="">
+                        <div class="alert alert-danger alert-dismissible" role="alert">
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                        <%= jspUtil.label("message.login.error") %>
+                        </div>
+                    </div>
+                </div>
+            </c:if>
+            
+            <div class="form-group">
+                <label for="inputEmail" class="control-label"><%= jspUtil.label("knowledge.auth.label.id") %></label>
+                <div class="">
+                <input type="text" class="form-control"
+                    name="username" value="<%= jspUtil.out("username") %>"
+                    placeholder="<%= jspUtil.label("knowledge.auth.label.id") %>" autofocus>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="inputPass" class="control-label"><%= jspUtil.label("knowledge.auth.label.password") %></label>
+                <div class="">
+                <input type="password" class="form-control"
+                    name="password" value="<%= jspUtil.out("password") %>"
+                    placeholder="<%= jspUtil.label("knowledge.auth.label.password") %>">
+                </div>
+            </div>
+            <input type="hidden" name="page" value="<%= jspUtil.out("page") %>" id="page">
+            
+            <div class="form-group">
+                <div class="">
+                    <button class="btn btn-primary " type="submit">
+                        <i class="fa fa-sign-in"></i>&nbsp;<%= jspUtil.label("knowledge.auth.signin") %>
+                    </button>
 <% if (SystemConfigLogic.get().isUserAddAble()) { %>
-					<a href="<%= request.getContextPath() %>/open.signup/view" class="btn btn-info">
-						<i class="fa fa-plus-square"></i>&nbsp;<%= jspUtil.label("knowledge.auth.signup") %>
-					</a>
+                    <a href="<%= request.getContextPath() %>/open.signup/view" class="btn btn-info">
+                        <i class="fa fa-plus-square"></i>&nbsp;<%= jspUtil.label("knowledge.auth.signup") %>
+                    </a>
 <% } %>
 
-				</div>
-			</div>
-				
-				
-		</form>
+            <br/><br/>
+            <a href="<%=request.getContextPath()%>/open.PasswordInitialization/view" class="text-primary">
+                <i class="fa fa-key"></i>&nbsp;<%= jspUtil.label("knowledge.auth.forgot.password") %>
+            </a>
 
-	</div>
-	
+
+                </div>
+            </div>
+                
+                
+        </form>
+
+    </div>
+    
 </c:param>
 
 </c:import>

From 3314f76ad46ab0b662a33168de2c72561bdae7e8 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Thu, 12 Oct 2017 00:22:08 +0900
Subject: [PATCH 123/138] Change feature to debug for mail send

---
 .gitignore                                    |  1 +
 pom.xml                                       |  2 +-
 src/main/resources/appresource.properties     |  2 +-
 src/main/resources/appresource_ja.properties  | 30 +++++++++----------
 .../ExUsersDao/selectNotifyPublicUsers.sql    |  2 +-
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 10c382125..7a0cb9db2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ target
 node
 .idea
 .m2
+knowledge.iml
diff --git a/pom.xml b/pom.xml
index fa37d9c8d..e616a908e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.support-project</groupId>
     <artifactId>knowledge</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.11.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>knowledge</name>
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 2adc70e39..1212da0ec 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -59,7 +59,7 @@ message.allready.started=Already started.
 message.confirm.delete=Are you sure you want to delete?
 
 # Common Label
-label.version=v1.12.0 pre1
+label.version=v1.11.0 pre3
 label.login=Sign in
 label.previous= Previous
 label.next=Next
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index d6b6c08ae..559e93ac8 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -59,7 +59,7 @@ message.allready.started=すでに開始済です
 message.confirm.delete=本当に削除しますか?
 
 # Common Label
-label.version=v1.12.0 pre1
+label.version=v1.11.0 pre3
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ
@@ -545,22 +545,22 @@ knowledge.notify.target=通知先
 knowledge.notify.target.mail=メール通知
 knowledge.notify.target.desktop=デスクトップ通知(Chrome/Firefoxのみ)
 knowledge.notify.conditions=通知する条件
-knowledge.notify.conditions.myitem.comment=自分が登録した投稿にコメントが登録されたら通知
-knowledge.notify.conditions.myitem.like=自分が登録した投稿に「いいね！」が追加されたら通知
-knowledge.notify.conditions.myitem.stock=自分が登録した投稿がストックされたら通知
-knowledge.notify.conditions.to.save=自分宛の投稿が更新されたら通知
-knowledge.notify.conditions.to.comment=自分宛の投稿にコメントが登録されたら通知
-knowledge.notify.conditions.to.ignore.public=自分宛の投稿で「公開」は除外
+knowledge.notify.conditions.myitem.comment=自分が登録した記事にコメントが登録されたら通知
+knowledge.notify.conditions.myitem.like=自分が登録した記事に「いいね！」が追加されたら通知
+knowledge.notify.conditions.myitem.stock=自分が登録した記事がストックされたら通知
+knowledge.notify.conditions.to.save=記事が登録／更新されたら通知
+knowledge.notify.conditions.to.comment=記事にコメントが登録されたら通知
+knowledge.notify.conditions.to.ignore.public=記事の登録通知で「公開」は除外
 knowledge.notify.conditions.stock.save=ストックしたナレッジが更新されたら通知
 knowledge.notify.conditions.stock.comment=ストックしたナレッジにコメントが登録されたら通知
-knowledge.notify.msg.desktop.myitem.comment=あなたが投稿したナレッジ {1} にコメントが投稿されました
-knowledge.notify.msg.desktop.myitem.like=あなたが投稿したナレッジ {1} に「いいね！」が押されました
-knowledge.notify.msg.desktop.myitem.stock=あなたが投稿したナレッジ {1} がストックされました
-knowledge.notify.msg.desktop.to.insert=ナレッジ {1} が登録されました
-knowledge.notify.msg.desktop.to.update=ナレッジ {1} が更新されました
-knowledge.notify.msg.desktop.to.comment=ナレッジ {1} にコメントが投稿されました
-knowledge.notify.msg.desktop.stoke.update=ストックしているナレッジ {1} が更新されました
-knowledge.notify.msg.desktop.stoke.comment=ストックしているナレッジ {1} にコメントが投稿されました
+knowledge.notify.msg.desktop.myitem.comment=あなたが登録した記事 {1} にコメントが投稿されました
+knowledge.notify.msg.desktop.myitem.like=あなたが登録した記事 {1} に「いいね！」が押されました
+knowledge.notify.msg.desktop.myitem.stock=あなたが登録した記事 {1} がストックされました
+knowledge.notify.msg.desktop.to.insert=記事 {1} が登録されました
+knowledge.notify.msg.desktop.to.update=記事 {1} が更新されました
+knowledge.notify.msg.desktop.to.comment=記事 {1} にコメントが投稿されました
+knowledge.notify.msg.desktop.stoke.update=ストックしている記事 {1} が更新されました
+knowledge.notify.msg.desktop.stoke.comment=ストックしている記事 {1} にコメントが投稿されました
 
 knowledge.export.title=データをエクスポート
 knowledge.export.msg1=データをエクスポートします。(zip形式でダウンロード)
diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/ExUsersDao/selectNotifyPublicUsers.sql b/src/main/resources/org/support/project/knowledge/dao/sql/ExUsersDao/selectNotifyPublicUsers.sql
index 2ae9270f6..6e3c0699b 100644
--- a/src/main/resources/org/support/project/knowledge/dao/sql/ExUsersDao/selectNotifyPublicUsers.sql
+++ b/src/main/resources/org/support/project/knowledge/dao/sql/ExUsersDao/selectNotifyPublicUsers.sql
@@ -3,5 +3,5 @@ FROM USERS
 INNER JOIN NOTIFY_CONFIGS ON (USERS.USER_ID = NOTIFY_CONFIGS.USER_ID)
 WHERE NOTIFY_CONFIGS.NOTIFY_MAIL = 1
 AND NOTIFY_CONFIGS.TO_ITEM_SAVE = 1
-AND NOTIFY_CONFIGS.TO_ITEM_IGNORE_PUBLIC != 1
+AND (NOTIFY_CONFIGS.TO_ITEM_IGNORE_PUBLIC != 1 OR NOTIFY_CONFIGS.TO_ITEM_IGNORE_PUBLIC IS NULL)
 AND USERS.DELETE_FLAG != 1

From 856ed371ba6b56255d45eb30105262e8bed78f20 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 17 Oct 2017 22:31:35 +0900
Subject: [PATCH 124/138] #905 Fix a check on survey editable

---
 .../control/protect/SurveyControl.java        |  5 +-
 .../integration/IntegrationSurveyTest.java    | 63 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
index 60eaec35d..e86788c21 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
@@ -25,9 +25,11 @@
 import org.support.project.knowledge.entity.TemplateMastersEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.knowledge.logic.SurveyLogic;
+import org.support.project.knowledge.logic.TargetLogic;
 import org.support.project.knowledge.logic.activity.Activity;
 import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.knowledge.vo.SurveyReport;
+import org.support.project.web.bean.LabelValue;
 import org.support.project.web.bean.Msg;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.common.HttpStatus;
@@ -73,7 +75,8 @@ public Boundary save() throws InstantiationException, IllegalAccessException, JS
             return sendError(HttpStatus.SC_400_BAD_REQUEST, "BAD_REQUEST");
         }
         KnowledgesEntity knowledge = KnowledgeLogic.get().select(knowledgeId, getLoginedUser());
-        if (knowledge == null || !KnowledgeLogic.get().isEditor(super.getLoginedUser(), knowledge, null)) {
+        List<LabelValue> editors = TargetLogic.get().selectEditorsOnKnowledgeId(knowledgeId);
+        if (knowledge == null || !KnowledgeLogic.get().isEditor(super.getLoginedUser(), knowledge, editors)) {
             return sendError(HttpStatus.SC_403_FORBIDDEN, "FORBIDDEN");
         }
         // テンプレートと同じ構造にしているが、アンケートに変換して保存する
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
index da132f391..b742383bd 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
@@ -11,7 +11,9 @@
 import org.support.project.knowledge.dao.NotifyQueuesDao;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
+import org.support.project.knowledge.logic.TargetLogic;
 import org.support.project.knowledge.logic.TemplateLogic;
+import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.bean.MessageResult;
 import org.support.project.web.bean.Msg;
 import org.support.project.web.boundary.ForwardBoundary;
@@ -215,4 +217,65 @@ public void testActivityHistory() throws Exception {
         assertPointHistoryCount(ANSWER_USER, 2);
     }
     
+    /**
+     * アンケートの編集権限の確認
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 700)
+    public void testEditAble() throws Exception {
+        // 登録
+        StubHttpServletRequest request = new StubHttpServletRequest();
+        StubHttpServletResponse response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.knowledge/view_add");
+        request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
+        ForwardBoundary boundary = invoke(request, response, ForwardBoundary.class);
+        Assert.assertEquals("/WEB-INF/views/protect/knowledge/edit.jsp", PropertyUtil.getPrivateFeildOnReflection(String.class, boundary, "path"));
+        String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        Assert.assertNotNull(csrfToken);
+        request.setServletPath("protect.knowledge/save");
+        request.setMethod("post");
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        request.addParameter("title", "タイトル");
+        request.addParameter("content", "内容");
+        request.addParameter("publicFlag", String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PROTECT));
+        request.addParameter("typeId", String.valueOf(TemplateLogic.TYPE_ID_KNOWLEDGE));
+        LoginedUser answerUser = super.getLoginUser(ANSWER_USER);
+        request.addParameter("groups", TargetLogic.ID_PREFIX_USER + answerUser.getUserId());
+        request.addParameter("editors", TargetLogic.ID_PREFIX_USER + answerUser.getUserId());
+        JsonBoundary jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult sendObject = (MessageResult) jsonBoundary.getObj();
+        LOG.info(sendObject);
+        Assert.assertEquals(200, sendObject.getCode().intValue());
+        
+        Long knowledgeId = new Long(sendObject.getResult());
+        
+        // アンケート登録
+        request = new StubHttpServletRequest();
+        response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.survey/load/" + knowledgeId);
+        request.setMethod("get");
+        JsonBoundary msg = invoke(request, response, JsonBoundary.class);
+        Msg result = (Msg) msg.getObj();
+        Assert.assertEquals("survey data is not exists.", result.getMsg());
+        request.setServletPath("protect.survey/save");
+        request.setMethod("post");
+        auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(ANSWER_USER, request, response);
+        csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
+        request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
+        request.addParameter("knowledgeId", String.valueOf(knowledgeId));
+        request.addParameter("typeName", "アンケート");
+        request.addParameter("itemType", "text_item0");
+        request.addParameter("title_item0", "入力項目1");
+        jsonBoundary = invoke(request, response, JsonBoundary.class);
+        MessageResult messageResult = (MessageResult) jsonBoundary.getObj();
+        LOG.info(messageResult);
+        Assert.assertEquals(HttpStatus.SC_200_OK, messageResult.getCode().intValue());
+    }
+    
+    
+    
 }

From 0f63268797d9685b32b2579b785c5ba445095391 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Tue, 17 Oct 2017 22:37:28 +0900
Subject: [PATCH 125/138] #907 Set link on user name to this user's information
 page

---
 .../logic/activity/ActivityLogic.java         | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index ac429e2d6..13c8045ee 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -185,51 +185,54 @@ private String getActivityMsg(PointUserHistoriesEntity history, Map<Long, Activi
                     convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_LIKE) {
             return resources.getResource("knowledge.activity.type.31.do.like", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_LIKED_BY_OHER) {
             return resources.getResource("knowledge.activity.type.32.liked", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_STOCK) {
             return resources.getResource("knowledge.activity.type.41.do.stock", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_STOCKED_BY_OHER) {
             return resources.getResource("knowledge.activity.type.42.stocked", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_ANSWER) {
             return resources.getResource("knowledge.activity.type.51.do.ansewer", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_ANSWERD_BY_OHER) {
             return resources.getResource("knowledge.activity.type.52.answered", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_JOIN_EVENT) {
             return resources.getResource("knowledge.activity.type.61.do.join", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_JOINED_BY_OHER) {
             return resources.getResource("knowledge.activity.type.62.joined", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
 
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_POST_PUBLIC) {
             return resources.getResource("knowledge.activity.type.101.do.post.public", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_POST_PROTECT) {
             return resources.getResource("knowledge.activity.type.111.do.post.protect", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
         } else if (history.getType() == ActivityProcessor.TYPE_KNOWLEDGE_DO_POST_PRIVATE) {
             return resources.getResource("knowledge.activity.type.121.do.post.private", convKnowledgeLink(systemUrl, activity.getTarget()),
-                    activity.getUserName());
+                    convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
 
         } else if (history.getType() >= ActivityProcessor.TYPE_COMMENT_DO_INSERT) {
             CommentsEntity comment = CommentsDao.get().selectOnKey(new Long(activity.getTarget()));
             if (comment != null) {
                 if (history.getType() == ActivityProcessor.TYPE_COMMENT_DO_INSERT) {
                     return resources.getResource("knowledge.activity.type.1011.do.comment.insert",
-                            convKnowledgeLink(systemUrl, String.valueOf(comment.getKnowledgeId())), activity.getUserName());
+                            convKnowledgeLink(systemUrl, String.valueOf(comment.getKnowledgeId())),
+                            convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
                 } else if (history.getType() == ActivityProcessor.TYPE_COMMENT_DO_LIKE) {
                     return resources.getResource("knowledge.activity.type.1031.do.comment.like",
-                            convKnowledgeLink(systemUrl, String.valueOf(comment.getKnowledgeId())), activity.getUserName());
+                            convKnowledgeLink(systemUrl, String.valueOf(comment.getKnowledgeId())),
+                            convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
                 } else if (history.getType() == ActivityProcessor.TYPE_COMMENT_LIKED_BY_OHER) {
                     return resources.getResource("knowledge.activity.type.1032.comment.liked",
-                            convKnowledgeLink(systemUrl, String.valueOf(comment.getKnowledgeId())), activity.getUserName());
+                            convKnowledgeLink(systemUrl, String.valueOf(comment.getKnowledgeId())),
+                            convUserLink(systemUrl, activity.getInsertUser(), activity.getUserName()));
                 }
             }
         }

From 35d05e169c7eccb4644efa9da47cbf8ee2cd4650 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 18 Oct 2017 20:06:57 +0900
Subject: [PATCH 126/138] #909 Convert display time by timezone on activity
 list

---
 .../support/project/knowledge/control/Control.java | 14 ++++++++++++++
 .../knowledge/logic/activity/ActivityLogic.java    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/support/project/knowledge/control/Control.java b/src/main/java/org/support/project/knowledge/control/Control.java
index 3d5d048bf..79cf3f7ad 100644
--- a/src/main/java/org/support/project/knowledge/control/Control.java
+++ b/src/main/java/org/support/project/knowledge/control/Control.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -13,6 +14,7 @@
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.log.LogLevel;
 import org.support.project.common.util.HtmlUtils;
+import org.support.project.common.util.StringUtils;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.config.UserConfig;
@@ -22,8 +24,10 @@
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.common.HttpUtil;
+import org.support.project.web.logic.DateConvertLogic;
 import org.support.project.web.logic.NotificationLogic;
 import org.support.project.web.logic.SanitizingLogic;
+import org.support.project.web.util.JspUtil;
 
 @DI(instance = Instance.Prototype)
 public abstract class Control extends org.support.project.web.control.Control {
@@ -198,6 +202,16 @@ protected UserConfigs getUserConfigs() {
         } else {
             userConfigs.setLocale(getLocale());
         }
+        
+        if (userConfigs.getTimezone().equals("UTC")) {
+            String offset = HttpUtil.getCookie(getRequest(), JspUtil.TIME_ZONE_OFFSET);
+            if (StringUtils.isInteger(offset)) {
+                int off = Integer.parseInt(offset);
+                userConfigs.setTimezoneOffset(off);
+                TimeZone zone = DateConvertLogic.get().getTimezone(getLocale(), off);
+                userConfigs.setTimezone(zone.getDisplayName());
+            }
+        }
         return userConfigs;
     }
 
diff --git a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
index 13c8045ee..9caaac1b5 100644
--- a/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/activity/ActivityLogic.java
@@ -146,7 +146,7 @@ public List<ContributionPointHistory> getUserPointHistoriesByDate(Integer userId
     }
 
     private String getDisplayDate(Date date, UserConfigs userConfigs) {
-        return DateConvertLogic.get().convertDate(date, userConfigs.getLocale(), String.valueOf(userConfigs.getTimezoneOffset()));
+        return DateConvertLogic.get().convertDate(date, userConfigs.getLocale(), userConfigs.getTimezoneOffset());
     }
     private String convKnowledgeLink(String systemUrl, String target) {
         StringBuilder builder = new StringBuilder();

From 270fe4c1cbdd4295087f283a77a7f7e5a6c81970 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 18 Oct 2017 20:19:05 +0900
Subject: [PATCH 127/138] #902 Change a check condition to part of the mail
 address matches to post article from E-mail.

---
 .../knowledge/logic/MailhookLogic.java        |   2 +-
 .../integration/IntegrationMailReadTest.java  | 129 ++++++++++++++++++
 2 files changed, 130 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/support/project/knowledge/logic/MailhookLogic.java b/src/main/java/org/support/project/knowledge/logic/MailhookLogic.java
index 7ba4d16cc..53987644d 100644
--- a/src/main/java/org/support/project/knowledge/logic/MailhookLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/MailhookLogic.java
@@ -742,7 +742,7 @@ private boolean checkCondition(Message msg, MailHookConditionsEntity condition)
             for (Address address : to) {
                 if (address instanceof InternetAddress) {
                     InternetAddress a = (InternetAddress) address;
-                    if (a.getAddress().equals(condition.getCondition())) {
+                    if (a.getAddress().indexOf(condition.getCondition())  != -1) {
                         return true;
                     }
                 } else {
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationMailReadTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationMailReadTest.java
index 950dec05a..88f9ebbe7 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationMailReadTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationMailReadTest.java
@@ -167,4 +167,133 @@ public void testCheckDataAfterComment() throws Exception {
         assertNotificationCount(COMMENT_USER, 1);
     }
     
+    
+    
+    /**
+     * メールアドレスで投稿
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 300)
+    public void testPostOnRecipient1() throws Exception {
+        // データ完全初期化
+        setUpBeforeClass();
+        
+        // テストユーザ追加
+        addUser(CONFIG_USER);
+        addUser(POST_USER);
+        LoginedUser user = super.getLoginUser(CONFIG_USER);
+        
+        // メールから投稿設定（受信メールアドレスの一部で）
+        MailHookConditionsEntity condition = new MailHookConditionsEntity();
+        condition.setHookId(MailhookLogic.MAIL_HOOK_ID);
+        condition.setConditionNo(-1);
+        condition.setConditionKind(MailHookCondition.Recipient.getValue());
+        condition.setCondition("hoge@example.com");
+        condition.setProcessUser(user.getUserId());
+        condition.setProcessUserKind(1);
+        condition.setPublicFlag(KnowledgeLogic.PUBLIC_FLAG_PUBLIC);
+        condition.setTags("メールの宛先の一部で投稿");
+        MailhookLogic.get().saveCondition(condition);
+        
+        // メールから投稿
+        user = super.getLoginUser(POST_USER);
+        List<MailHookConditionsEntity> conditions = MailHookConditionsDao.get().selectOnHookId(MailhookLogic.MAIL_HOOK_ID);
+        StubMessage msg = new StubMessage();
+        Address[] addresses = {new StubAddress(user.getLoginUser().getMailAddress())};
+        msg.addFrom(addresses);
+        Address[] recipients = {new StubAddress("hoge@example.com")};
+        msg.setAllRecipients(recipients);
+        msg.setContent("投稿の本文になる");
+        msg.setSubject("メールアドレスの部分一致で投稿");
+        msg.addHeader("Message-ID", "MailHookTest-02");
+        
+        MailhookLogic.get().checkConditionsAndPost(msg, conditions);
+        Knowledge result = knowledgeGetOnAPI(POST_USER, 1);
+        Assert.assertEquals((long) 1, result.getKnowledgeId().longValue());
+        Assert.assertEquals("メールアドレスの部分一致で投稿", result.getTitle());
+
+        // メールから投稿
+        user = super.getLoginUser(POST_USER);
+        conditions = MailHookConditionsDao.get().selectOnHookId(MailhookLogic.MAIL_HOOK_ID);
+        msg = new StubMessage();
+        addresses[0] = new StubAddress(user.getLoginUser().getMailAddress());
+        msg.addFrom(addresses);
+        recipients[0] = new StubAddress("hoge_info@example.com");
+        msg.setAllRecipients(recipients);
+        msg.setContent("投稿の本文になる");
+        msg.setSubject("これは対象外になる");
+        msg.addHeader("Message-ID", "MailHookTest-03");
+        
+        MailhookLogic.get().checkConditionsAndPost(msg, conditions);
+        result = knowledgeGetOnAPI(POST_USER, 1);
+        Assert.assertEquals((long) 1, result.getKnowledgeId().longValue());
+        Assert.assertEquals("メールアドレスの部分一致で投稿", result.getTitle());
+    }
+    
+    /**
+     * メールアドレスの一部で投稿
+     * @throws Exception
+     */
+    @Test
+    @Order(order = 301)
+    public void testPostOnRecipient2() throws Exception {
+        // データ完全初期化
+        setUpBeforeClass();
+        
+        // テストユーザ追加
+        addUser(CONFIG_USER);
+        addUser(POST_USER);
+        LoginedUser user = super.getLoginUser(CONFIG_USER);
+        
+        // メールから投稿設定（受信メールアドレスの一部で）
+        MailHookConditionsEntity condition = new MailHookConditionsEntity();
+        condition.setHookId(MailhookLogic.MAIL_HOOK_ID);
+        condition.setConditionNo(-1);
+        condition.setConditionKind(MailHookCondition.Recipient.getValue());
+        condition.setCondition("hoge");
+        condition.setProcessUser(user.getUserId());
+        condition.setProcessUserKind(1);
+        condition.setPublicFlag(KnowledgeLogic.PUBLIC_FLAG_PUBLIC);
+        condition.setTags("メールの宛先の一部で投稿");
+        MailhookLogic.get().saveCondition(condition);
+        
+        // メールから投稿
+        user = super.getLoginUser(POST_USER);
+        List<MailHookConditionsEntity> conditions = MailHookConditionsDao.get().selectOnHookId(MailhookLogic.MAIL_HOOK_ID);
+        StubMessage msg = new StubMessage();
+        Address[] addresses = {new StubAddress(user.getLoginUser().getMailAddress())};
+        msg.addFrom(addresses);
+        Address[] recipients = {new StubAddress("hoge@example.com")};
+        msg.setAllRecipients(recipients);
+        msg.setContent("投稿の本文になる");
+        msg.setSubject("メールアドレスの部分一致で投稿");
+        msg.addHeader("Message-ID", "MailHookTest-02");
+        
+        MailhookLogic.get().checkConditionsAndPost(msg, conditions);
+        Knowledge result = knowledgeGetOnAPI(POST_USER, 1);
+        Assert.assertEquals((long) 1, result.getKnowledgeId().longValue());
+        Assert.assertEquals("メールアドレスの部分一致で投稿", result.getTitle());
+        
+        // メールから投稿
+        user = super.getLoginUser(POST_USER);
+        conditions = MailHookConditionsDao.get().selectOnHookId(MailhookLogic.MAIL_HOOK_ID);
+        msg = new StubMessage();
+        addresses[0] = new StubAddress(user.getLoginUser().getMailAddress());
+        msg.addFrom(addresses);
+        recipients[0] = new StubAddress("hoge_info@example.com");
+        msg.setAllRecipients(recipients);
+        msg.setContent("投稿の本文になる");
+        msg.setSubject("こんどは投稿する");
+        msg.addHeader("Message-ID", "MailHookTest-03");
+        
+        MailhookLogic.get().checkConditionsAndPost(msg, conditions);
+        result = knowledgeGetOnAPI(POST_USER, 2);
+        Assert.assertEquals((long) 2, result.getKnowledgeId().longValue());
+        Assert.assertEquals("こんどは投稿する", result.getTitle());
+    }
+    
+    
+    
+    
 }

From 4c4e3b92620598ea69a8310ead721123d9035533 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 18 Oct 2017 20:44:17 +0900
Subject: [PATCH 128/138] #884 Show slide show button on comment edit page.

---
 .../views/protect/knowledge/edit_comment.jsp  | 24 +++++--
 src/main/webapp/js/comment.js                 | 72 -------------------
 2 files changed, 17 insertions(+), 79 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/protect/knowledge/edit_comment.jsp b/src/main/webapp/WEB-INF/views/protect/knowledge/edit_comment.jsp
index 3f73272d9..791a5bb96 100644
--- a/src/main/webapp/WEB-INF/views/protect/knowledge/edit_comment.jsp
+++ b/src/main/webapp/WEB-INF/views/protect/knowledge/edit_comment.jsp
@@ -39,6 +39,7 @@ var _REMOVE_FILE = '<%= jspUtil.label("knowledge.edit.label.delete.upload") %>';
 var _FAIL_REMOVE_FILE = '<%= jspUtil.label("knowledge.edit.label.fail.delete.upload") %>';
 var _CONFIRM = '<%= jspUtil.label("knowledge.edit.label.confirm.delete") %>';
 var _SET_IMAGE_LABEL= '<%= jspUtil.label("knowledge.edit.set.image.path") %>';
+var _SET_SLIDE_LABEL= '<%= jspUtil.label("knowledge.edit.set.slide.path") %>';
 </script>
 
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML,Safe"></script>
@@ -54,6 +55,7 @@ var _SET_IMAGE_LABEL= '<%= jspUtil.label("knowledge.edit.set.image.path") %>';
 
 <script type="text/javascript" src="<%= request.getContextPath() %>/js/knowledge-common.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/js/comment.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/js/knowledge-view-attachfile.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/js/slide.js"></script>
 
 <script type="text/javascript" src="<%= request.getContextPath() %>/js/emojilist.js"></script>
@@ -107,18 +109,26 @@ var _SET_IMAGE_LABEL= '<%= jspUtil.label("knowledge.edit.set.image.path") %>';
         </div>
         <div class="form-group" id="files">
         <c:forEach var="file" items="${comment_files}" >
-            <div class="filediv" id="file-<%= jspUtil.out("file.fileNo") %>">
-                <div class="file-image"><img src="<%= jspUtil.out("file.thumbnailUrl") %>" /></div>
-                <div class="file-label"><a href="<%= jspUtil.out("file.url") %>&amp;attachment=true"><%= jspUtil.out("file.name") %></a></div>
-                <br class="fileLabelBr"/>
+            <div class="filediv row" id="file-<%= jspUtil.out("file.fileNo") %>">
+                <div class="file-image col-xs-1"><img src="<%= jspUtil.out("file.thumbnailUrl") %>" /></div>
+                <div class="file-label col-xs-6"><a href="<%= jspUtil.out("file.url") %>&amp;attachment=true"><%= jspUtil.out("file.name") %></a></div>
                 <input type="hidden" name="files" value="<%= jspUtil.out("file.fileNo") %>" />
-                &nbsp;&nbsp;&nbsp;
-                <button type="button" class="btn btn-success" onclick="setImagePath('<%= jspUtil.out("file.url") %>', '<%= jspUtil.out("file.name") %>')">
+                <div class="col-xs-4">
+                <% if (jspUtil.is("image", "file.type")) { %>
+                <button type="button" class="btn btn-success btn-xs" onclick="setImagePath('<%= jspUtil.out("file.url") %>', '<%= jspUtil.out("file.name") %>')">
                     <i class="fa fa-file-image-o"></i>&nbsp;<%= jspUtil.label("knowledge.edit.set.image.path") %>
                 </button>
-                <button type="button" class="btn btn-danger" onclick="removeAddedFile(<%= jspUtil.out("file.fileNo") %>)">
+                <br/>
+                <% } else if (jspUtil.is("slide", "file.type")) { %>
+                <button type="button" class="btn btn-success btn-xs" onclick="setSlidePath('<%= jspUtil.out("file.fileNo") %>', '<%= jspUtil.out("file.name") %>')">
+                    <i class="fa fa-television"></i>&nbsp;<%= jspUtil.label("knowledge.edit.set.slide.path") %>
+                </button>
+                <br/>
+                <% } %>
+                <button type="button" class="btn btn-danger btn-xs" onclick="removeAddedFile(<%= jspUtil.out("file.fileNo") %>)">
                     <i class="fa fa-remove"></i>&nbsp;<%= jspUtil.label("label.delete") %>
                 </button>
+                </div>
             </div>
         </c:forEach>
         </div>
diff --git a/src/main/webapp/js/comment.js b/src/main/webapp/js/comment.js
index f824ace31..a34970b7e 100644
--- a/src/main/webapp/js/comment.js
+++ b/src/main/webapp/js/comment.js
@@ -34,72 +34,6 @@ $(document).ready(function() {
         $('html,body').animate({ scrollTop: p }, 'fast');
     });
     
-    var url = _CONTEXT + '/protect.file/upload';
-    $('#fileupload').fileupload({
-        url : url,
-        dataType : 'json',
-        autoUpload: true,
-        maxFileSize: 5000000, // 5 MB
-    }).on('fileuploaddone', function (e, data) {
-        //$('#files').show();
-        $.each(data.result.files, function(index, file) {
-            console.log(file);
-            var filediv = '<div class="filediv" id="file-' + file.fileNo + '">';
-            filediv += '<div class="file-image">';
-            filediv += '<img src="' + file.thumbnailUrl + '" />';
-            filediv += '</div>';
-            filediv += '<div class="file-label">';
-            filediv += '<a href="' + file.url + '">';
-            filediv += file.name;
-            filediv += '</a>';
-            filediv += '</div>';
-            filediv += '<br class="fileLabelBr"/>';
-            
-            filediv += '<input type="hidden" name="files" value="' + file.fileNo + '" />';
-            filediv += '&nbsp;&nbsp;&nbsp;';
-            filediv += '<button type="button" class="btn btn-success" onclick="setImagePath(\'' + file.url + '\', \'' + file.name + '\')">';
-            filediv += '<i class="fa fa-file-image-o"></i>&nbsp;' + _SET_IMAGE_LABEL;
-            filediv += '</button>';
-            filediv += '<button type="button" class="btn btn-danger" onclick="removeAddedFile(' + file.fileNo + ')">';
-            filediv += '<i class="fa fa-remove"></i>';
-            filediv += '&nbsp;' + _DELETE_LABEL + '</button>';
-            filediv += '</div>';
-            $('#files').append(filediv);
-        });
-        $.notify(_UPLOADED, 'success');
-        setTimeout(function() {
-            $('#progress').hide();
-        }, 5000);
-        
-     }).on('fileuploadprogressall', function (e, data) {
-            $('#progress').show();
-            var progress = parseInt(data.loaded / data.total * 100, 10);
-            console.log('' + progress + '%');
-            $('.progress .progress-bar').css('width', progress + '%');
-            $('.progress .progress-bar').text(progress + '%');
-            
-     }).on('fileuploadfail', function (e, data) {
-        if (data && data.jqXHR && data.jqXHR.responseJSON && data.jqXHR.responseJSON.msg) {
-            var msg = data.jqXHR.responseJSON.msg;
-            $.each(data.files, function (index) {
-                var filediv = '<div class="alert alert-warning alert-dismissible" role="alert">';
-                filediv += '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>';
-                filediv += '<strong>';
-                filediv += '<i class="fa fa-remove"></i>&nbsp;';
-                filediv += data.files[index].name;
-                filediv += '</strong>&nbsp;&nbsp;';
-                filediv += msg;
-                filediv += '</div>';
-                $('#files').append(filediv);
-                $.notify(_FAIL_UPLOAD, 'warn');
-            });
-        } else {
-            console.log(e);
-            console.log(data);
-            $.notify('アップロードに失敗しました', 'warn');
-        }
-     }).prop('disabled', !$.support.fileInput).parent().addClass($.support.fileInput ? undefined : 'disabled');
-    
     // Auto complete
     setAutoComplete($("#comment"));
 });
@@ -157,9 +91,3 @@ function deleteComment() {
     }); 
 };
 
-var setImagePath = function(url, name) {
-    var text = '\n![' + name + '](' + url + ')\n';
-    var textarea = $('#comment');
-    textarea.val(textarea.val() + text);
-}
-

From 9650724fd2d11da704c43d434f9695aaf32641fa Mon Sep 17 00:00:00 2001
From: nyoron <nyoron.jp@live.jp>
Date: Wed, 18 Oct 2017 22:07:46 +0900
Subject: [PATCH 129/138] Fix typo

---
 src/main/resources/appresource.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 1212da0ec..26f13d38c 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -426,7 +426,7 @@ knowledge.config.system.close=Login is required
 knowledge.config.system.like=Registration settings of "Like"
 knowledge.config.system.like.many=Can be registered any number of times.
 knowledge.config.system.like.onlyone=Can be registered only one. (Sign in required)
-knowledge.config.thema=Thema select
+knowledge.config.thema=Theme select
 knowledge.config.thema.enable=Enable
 knowledge.config.thema.now=Now
 knowledge.config.highlight=Code Highlight

From c7c265a6a6c4eca1b53b2055266738e24384a37f Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Wed, 18 Oct 2017 21:27:25 +0900
Subject: [PATCH 130/138] #861 Changed not to display group name if the group
 is removed.

---
 .../project/knowledge/logic/TargetLogic.java        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/logic/TargetLogic.java b/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
index a34f617cc..ffec8a2f2 100644
--- a/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
+++ b/src/main/java/org/support/project/knowledge/logic/TargetLogic.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.support.project.common.config.INT_FLAG;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
 import org.support.project.common.util.StringUtils;
@@ -138,6 +139,10 @@ public Map<Long, List<LabelValue>> selectTargetsOnKnowledgeIds(List<Long> knowle
 
         List<GroupsEntity> groups = targetsDao.selectGroupsOnKnowledgeIds(knowledgeIds);
         for (GroupsEntity groupsEntity : groups) {
+            if (groupsEntity.getDeleteFlag() != null && groupsEntity.getDeleteFlag().intValue() == INT_FLAG.ON.getValue()) {
+                // 削除済のユーザは表示しない
+                continue;
+            }
             LabelValue labelValue = new LabelValue();
             labelValue.setLabel(NAME_PREFIX_GROUP + groupsEntity.getGroupName());
             labelValue.setValue(ID_PREFIX_GROUP + groupsEntity.getGroupId());
@@ -166,9 +171,13 @@ public Map<Long, List<LabelValue>> selectTargetsOnKnowledgeIds(List<Long> knowle
             for (Integer groupId : groupIdMaps.get(usersEntity.getKnowledgeId())) {
                 if (groupUserIds.get(groupId).contains(usersEntity.getUserId())) {
                     continue;
-                }            		
+                }
+            }
+            
+            if (usersEntity.getDeleteFlag() != null && usersEntity.getDeleteFlag().intValue() == INT_FLAG.ON.getValue()) {
+                // 削除済のユーザは表示しない
+                continue;
             }
-
             LabelValue labelValue = new LabelValue();
             labelValue.setLabel(NAME_PREFIX_USER + usersEntity.getUserName());
             labelValue.setValue(ID_PREFIX_USER + usersEntity.getUserId());

From 11d454d3aa165eebccc582ca8c4246d211a5fd8c Mon Sep 17 00:00:00 2001
From: nyoronjp <nyoron.web.service+github@outlook.com>
Date: Fri, 20 Oct 2017 09:20:37 +0900
Subject: [PATCH 131/138] Change to wrap URL

---
 src/main/webapp/css/markdown.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/webapp/css/markdown.css b/src/main/webapp/css/markdown.css
index b51cafe0f..4586ebc51 100644
--- a/src/main/webapp/css/markdown.css
+++ b/src/main/webapp/css/markdown.css
@@ -1,6 +1,7 @@
 .markdown a {
     /* color: #4183C4; */
     /* color: #18bc9c; */
+    word-wrap: break-word;
 }
 
 .markdown a.absent {

From bd311746ed48ca0b929afbc8968ee5ce8d07f0bb Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sat, 21 Oct 2017 09:34:36 +0900
Subject: [PATCH 132/138] #879 Fix edit survey item

---
 .../control/protect/SurveyControl.java        | 15 ++++++-
 .../knowledge/entity/SurveysEntity.java       | 16 +++++++
 src/main/webapp/js/knowledge-view-survey.js   |  2 +-
 .../integration/IntegrationSurveyTest.java    | 43 ++++++++++++++++---
 4 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
index e86788c21..7b5724c01 100644
--- a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
+++ b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
@@ -30,7 +30,6 @@
 import org.support.project.knowledge.logic.activity.ActivityLogic;
 import org.support.project.knowledge.vo.SurveyReport;
 import org.support.project.web.bean.LabelValue;
-import org.support.project.web.bean.Msg;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.common.HttpStatus;
 import org.support.project.web.config.MessageStatus;
@@ -146,7 +145,19 @@ public Boundary load() throws InvalidParamException {
         Long id = super.getPathLong(new Long(-1));
         SurveysEntity entity = SurveyLogic.get().loadSurvey(id, getLoginUserId());
         if (entity == null) {
-            return send(new Msg("survey data is not exists."));
+            entity = new SurveysEntity();
+            entity.setDescription("");
+            entity.setItems(new ArrayList<>());
+            entity.setExist(false);
+        } else {
+            entity.setExist(true);
+        }
+        KnowledgesEntity knowledge = KnowledgeLogic.get().select(id, getLoginedUser());
+        List<LabelValue> editors = TargetLogic.get().selectEditorsOnKnowledgeId(id);
+        if (knowledge != null && KnowledgeLogic.get().isEditor(super.getLoginedUser(), knowledge, editors)) {
+            entity.setEditable(true);
+        } else {
+            entity.setEditable(false);
         }
         return send(entity);
     }
diff --git a/src/main/java/org/support/project/knowledge/entity/SurveysEntity.java b/src/main/java/org/support/project/knowledge/entity/SurveysEntity.java
index e4cfca0b1..b1510d31f 100644
--- a/src/main/java/org/support/project/knowledge/entity/SurveysEntity.java
+++ b/src/main/java/org/support/project/knowledge/entity/SurveysEntity.java
@@ -21,6 +21,8 @@ public class SurveysEntity extends GenSurveysEntity {
     
     private String knowledgeTitle;
     
+    private boolean exist = false;
+    
     /** SerialVersion */
     private static final long serialVersionUID = 1L;
 
@@ -90,4 +92,18 @@ public void setKnowledgeTitle(String knowledgeTitle) {
         this.knowledgeTitle = knowledgeTitle;
     }
 
+    /**
+     * @return the exist
+     */
+    public boolean isExist() {
+        return exist;
+    }
+
+    /**
+     * @param exist the exist to set
+     */
+    public void setExist(boolean exist) {
+        this.exist = exist;
+    }
+
 }
diff --git a/src/main/webapp/js/knowledge-view-survey.js b/src/main/webapp/js/knowledge-view-survey.js
index 1e5748b33..69f4cba00 100644
--- a/src/main/webapp/js/knowledge-view-survey.js
+++ b/src/main/webapp/js/knowledge-view-survey.js
@@ -6,7 +6,7 @@ $(document).ready(function() {
             url : _CONTEXT + '/protect.survey/load/' + knowledgeId
         }).done(function(data) {
             console.log(data);
-            if (data.msg) {
+            if (data.msg || !data.exist) {
                 return;
             }
             $('#btnAnswerSurvey').removeClass('hide');
diff --git a/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java b/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
index b742383bd..f03765462 100644
--- a/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
+++ b/src/test/java/org/support/project/knowledge/integration/IntegrationSurveyTest.java
@@ -10,12 +10,12 @@
 import org.support.project.common.util.PropertyUtil;
 import org.support.project.knowledge.dao.NotifyQueuesDao;
 import org.support.project.knowledge.entity.NotifyQueuesEntity;
+import org.support.project.knowledge.entity.SurveysEntity;
 import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.knowledge.logic.TargetLogic;
 import org.support.project.knowledge.logic.TemplateLogic;
 import org.support.project.web.bean.LoginedUser;
 import org.support.project.web.bean.MessageResult;
-import org.support.project.web.bean.Msg;
 import org.support.project.web.boundary.ForwardBoundary;
 import org.support.project.web.boundary.JsonBoundary;
 import org.support.project.web.common.HttpStatus;
@@ -34,6 +34,7 @@ public class IntegrationSurveyTest extends IntegrationCommon {
     
     private static final String POST_USER = "integration-test-user-01";
     private static final String ANSWER_USER = "integration-test-user-02";
+    private static final String OTHER_USER = "integration-test-user-03";
     
     private static long knowledgeId;
     
@@ -48,6 +49,7 @@ public void testUserInsert() throws Exception {
         LOG.info("ユーザ登録");
         addUser(POST_USER);
         addUser(ANSWER_USER);
+        addUser(OTHER_USER);
     }
     
     /**
@@ -114,14 +116,15 @@ public void testCreateSurvey() throws Exception {
         
         request.setServletPath("protect.survey/load/" + knowledgeId);
         request.setMethod("get");
+        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
+        auth.setSession(POST_USER, request, response);
         JsonBoundary msg = invoke(request, response, JsonBoundary.class);
-        Msg result = (Msg) msg.getObj();
-        Assert.assertEquals("survey data is not exists.", result.getMsg());
+        SurveysEntity result = (SurveysEntity) msg.getObj();
+        Assert.assertEquals("", result.getDescription());
+        Assert.assertEquals(true, result.isEditable());
         
         request.setServletPath("protect.survey/save");
         request.setMethod("post");
-        DefaultAuthenticationLogicImpl auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
-        auth.setSession(POST_USER, request, response);
         
         String csrfToken = (String) request.getAttribute(HttpRequestCheckLogic.REQ_ID_KEY);
         request.addParameter(HttpRequestCheckLogic.REQ_ID_KEY, csrfToken);
@@ -257,9 +260,24 @@ public void testEditAble() throws Exception {
         response = new StubHttpServletResponse(request);
         request.setServletPath("protect.survey/load/" + knowledgeId);
         request.setMethod("get");
+        auth.setSession(POST_USER, request, response);
         JsonBoundary msg = invoke(request, response, JsonBoundary.class);
-        Msg result = (Msg) msg.getObj();
-        Assert.assertEquals("survey data is not exists.", result.getMsg());
+        SurveysEntity result = (SurveysEntity) msg.getObj();
+        Assert.assertEquals("", result.getDescription());
+        Assert.assertEquals(true, result.isEditable());
+        Assert.assertEquals(false, result.isExist());
+        
+        request = new StubHttpServletRequest();
+        response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.survey/load/" + knowledgeId);
+        request.setMethod("get");
+        auth.setSession(OTHER_USER, request, response);
+        msg = invoke(request, response, JsonBoundary.class);
+        result = (SurveysEntity) msg.getObj();
+        Assert.assertEquals("", result.getDescription());
+        Assert.assertEquals(false, result.isEditable());
+        Assert.assertEquals(false, result.isExist());
+        
         request.setServletPath("protect.survey/save");
         request.setMethod("post");
         auth = org.support.project.di.Container.getComp(DefaultAuthenticationLogicImpl.class);
@@ -274,6 +292,17 @@ public void testEditAble() throws Exception {
         MessageResult messageResult = (MessageResult) jsonBoundary.getObj();
         LOG.info(messageResult);
         Assert.assertEquals(HttpStatus.SC_200_OK, messageResult.getCode().intValue());
+        
+        request = new StubHttpServletRequest();
+        response = new StubHttpServletResponse(request);
+        request.setServletPath("protect.survey/load/" + knowledgeId);
+        request.setMethod("get");
+        auth.setSession(OTHER_USER, request, response);
+        msg = invoke(request, response, JsonBoundary.class);
+        result = (SurveysEntity) msg.getObj();
+        Assert.assertEquals(null, result.getDescription());
+        Assert.assertEquals(false, result.isEditable());
+        Assert.assertEquals(true, result.isExist());
     }
     
     

From 2a616fb5b7b5c5f09f92155438eacb0b110ecc40 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sat, 21 Oct 2017 10:16:06 +0900
Subject: [PATCH 133/138] Update version label to v1.11.0 pre4

---
 src/main/resources/appresource.properties    | 2 +-
 src/main/resources/appresource_ja.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index 26f13d38c..d573b2e92 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -59,7 +59,7 @@ message.allready.started=Already started.
 message.confirm.delete=Are you sure you want to delete?
 
 # Common Label
-label.version=v1.11.0 pre3
+label.version=v1.11.0 pre4
 label.login=Sign in
 label.previous= Previous
 label.next=Next
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index 559e93ac8..be28ea5be 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -59,7 +59,7 @@ message.allready.started=すでに開始済です
 message.confirm.delete=本当に削除しますか?
 
 # Common Label
-label.version=v1.11.0 pre3
+label.version=v1.11.0 pre4
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ

From de2e1f3a293d866e07bb362c7f7e53c07f547424 Mon Sep 17 00:00:00 2001
From: nyoron <nyoron.jp@live.jp>
Date: Sat, 21 Oct 2017 10:29:57 +0900
Subject: [PATCH 134/138] Improve jump position from table of contents

---
 src/main/webapp/js/knowledge-view-toc.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/js/knowledge-view-toc.js b/src/main/webapp/js/knowledge-view-toc.js
index 27dcece03..2d50a8f90 100644
--- a/src/main/webapp/js/knowledge-view-toc.js
+++ b/src/main/webapp/js/knowledge-view-toc.js
@@ -2,6 +2,7 @@ var shownAgenda = false;
 var agenda;
 var createAgenda = function() {
     console.log('createAgenda');
+    var navbarHeight = $('nav.navbar-fixed-top').outerHeight(true);
     var toc = $('#toc');
     var exists = false;
     $('.markdown h1, .markdown h2, .markdown h3').each(function() {
@@ -17,7 +18,7 @@ var createAgenda = function() {
 
         $a.click(function() {
             $('body, html').animate({
-                scrollTop : $('#' + targetId).offset().top
+                scrollTop : $('#' + targetId).offset().top - navbarHeight
             }, 500);
             return false;
         });

From 5211cabc041aa4a10d972b3382d94df45c0b8bf4 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 29 Oct 2017 16:16:47 +0900
Subject: [PATCH 135/138] Release v1.11.0

---
 pom.xml                                      | 4 ++--
 src/main/resources/appresource.properties    | 2 +-
 src/main/resources/appresource_ja.properties | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e616a908e..095ac8973 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.support-project</groupId>
     <artifactId>knowledge</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
+    <version>1.11.0</version>
     <packaging>war</packaging>
 
     <name>knowledge</name>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.support-project</groupId>
             <artifactId>web</artifactId>
-            <version>1.11.1-SNAPSHOT</version>
+            <version>1.11.1</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
index d573b2e92..c10f8f89d 100644
--- a/src/main/resources/appresource.properties
+++ b/src/main/resources/appresource.properties
@@ -59,7 +59,7 @@ message.allready.started=Already started.
 message.confirm.delete=Are you sure you want to delete?
 
 # Common Label
-label.version=v1.11.0 pre4
+label.version=v1.11.0
 label.login=Sign in
 label.previous= Previous
 label.next=Next
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
index be28ea5be..14d13c17d 100644
--- a/src/main/resources/appresource_ja.properties
+++ b/src/main/resources/appresource_ja.properties
@@ -59,7 +59,7 @@ message.allready.started=すでに開始済です
 message.confirm.delete=本当に削除しますか?
 
 # Common Label
-label.version=v1.11.0 pre4
+label.version=v1.11.0
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ

From 67482695351855fd299845a59528a11853447cf2 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 29 Oct 2017 16:32:11 +0900
Subject: [PATCH 136/138] Change CI setting

---
 .travis.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 20ae945b9..d1541df6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,5 @@
-sudo: required
-
-services:
-  - docker
-
-before_install:
-    - docker -v
-    - docker-compose -v
-
-script: docker-compose run --rm dev mvn clean test
-
+language: java
+jdk: oraclejdk8
+  
+install: mvn install -DskipTests=true
+script: mvn test
\ No newline at end of file

From e5ae14c3e679b6de8465158b5f6d017c0fda3e0c Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 29 Oct 2017 16:56:26 +0900
Subject: [PATCH 137/138] Change CI setting

---
 .travis.yml | 4 +---
 pom.xml     | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1541df6c..57e21ad57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
 language: java
 jdk: oraclejdk8
-  
-install: mvn install -DskipTests=true
-script: mvn test
\ No newline at end of file
+script: mvn clean test -Dmaven.exec.skip=true
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 095ac8973..871c61cd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,9 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <skip>${maven.exec.skip}</skip>
+                </configuration>
                 <executions>
                     <execution>
                         <id>npm</id>

From 95acddf7866289f3a55351b266b800dfdf871532 Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Sun, 29 Oct 2017 21:15:05 +0900
Subject: [PATCH 138/138] Change CI setting

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 57e21ad57..1e77d5617 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: java
 jdk: oraclejdk8
-script: mvn clean test -Dmaven.exec.skip=true
\ No newline at end of file
+
+install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.exec.skip=true -B -V
+script: mvn clean test