Merge pull request #802 from support-project/develop

Release v1.10.0

document/database/knowledge.a5er

@@ -46,6 +46,61 @@ SqlSeparator=0
 ShowTag=1
 ShowCommonAttributes=0
 
+[Entity]
+PName=TOKENS
+LName=認証トークン
+Comment=
+TableOption=
+Page=MAIN
+Left=1600
+Top=50
+Field="TOKEN","TOKEN","@VARCHAR(128)","NOT NULL",0,"","",$FFFFFFFF,""
+Field="ユーザID","USER_ID","@INT","NOT NULL",,"","",$FFFFFFFF,""
+Field="有効期限","EXPIRES","@DATETIME","NOT NULL",,"","",$FFFFFFFF,""
+Index==1,USER_ID
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20170620125822
+Position="MAIN",1600,50
+
+[Relation]
+Entity1=MAIL_HOOKS
+Entity2=MAIL_PROPERTIES
+RelationType1=1
+RelationType2=3
+Fields1=HOOK_ID
+Fields2=HOOK_ID
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,1836,5081,4896,R,R
+Dependence=1
+Caption=
+PName=
+LineMode=0
+Bar1=184
+Bar2=508
+Bar3=490
+TermPos1=R
+TermPos2=R
+
+[Entity]
+PName=MAIL_PROPERTIES
+LName=メール受信設定
+Comment=
+TableOption=
+Page=MAIN
+Left=2950
+Top=50
+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,""
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20170616214751
+Position="MAIN",2950,50
+
 [Relation]
 Entity1=LOCALES
 Entity2=MAIL_LOCALE_TEMPLATES
@@ -55,14 +110,14 @@ Fields1=KEY
 Fields2=KEY
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,5226,5024,4040,R,R
+Position="MAIN",0,5226,5024,4720,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
 Bar1=523
 Bar2=502
-Bar3=404
+Bar3=472
 TermPos1=R
 TermPos2=R
 
@@ -92,8 +147,8 @@ LName=ロケール毎のメールテンプレート
 Comment=
 TableOption=
 Page=MAIN
-Left=2950
-Top=250
+Left=3600
+Top=300
 Field="テンプレートID","TEMPLATE_ID","@VARCHAR(32)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="キー","KEY","@VARCHAR(12)","NOT NULL",1,"","",$FFFFFFFF,""
 Field=" タイトル","TITLE","text","NOT NULL",,"","",$FFFFFFFF,""
@@ -102,15 +157,15 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170228163618
-Position="MAIN",2950,250
+Position="MAIN",3600,300
 
 [Entity]
 PName=LOCALES
 LName=ロケール
 Comment=
 TableOption=
 Page=MAIN
-Left=3550
+Left=3600
 Top=50
 Field="キー","KEY","@VARCHAR(12)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="言語","LANGUAGE","@VARCHAR(4)","NOT NULL",,"","",$FFFFFFFF,""
@@ -124,7 +179,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170228162957
-Position="MAIN",3550,50
+Position="MAIN",3600,50
 
 [Entity]
 PName=MAIL_TEMPLATES
@@ -133,15 +188,15 @@ Comment=
 TableOption=
 Page=MAIN
 Left=2950
-Top=50
+Top=200
 Field="テンプレートID","TEMPLATE_ID","@VARCHAR(32)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="テンプレートタイトル","TEMPLATE_TITLE","@VARCHAR(128)","NOT NULL",,"","",$FFFFFFFF,""
 Field="説明文","DESCRIPTION","text",,,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20170301131519
-Position="MAIN",2950,50
+Position="MAIN",2950,200
 
 [Relation]
 Entity1=SURVEY_ANSWERS
@@ -212,14 +267,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4662,4335,5401,R,R
+Position="MAIN",0,4662,4335,5351,R,R
 Dependence=0
 Caption=
 PName=
 LineMode=0
 Bar1=466
 Bar2=434
-Bar3=540
+Bar3=535
 TermPos1=R
 TermPos2=R
 
@@ -229,15 +284,15 @@ LName=アンケートの回答
 Comment=
 TableOption=
 Page=MAIN
-Left=1900
+Left=1950
 Top=1600
 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",1900,1600
+Position="MAIN",1950,1600
 
 [Relation]
 Entity1=SURVEY_ITEMS
@@ -248,7 +303,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=
@@ -672,8 +727,8 @@ LName=メールから投稿
 Comment=
 TableOption=
 Page=MAIN
-Left=1800
-Top=50
+Left=2950
+Top=350
 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,""
@@ -682,7 +737,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20160611082117
-Position="MAIN",1800,50
+Position="MAIN",2950,350
 
 [Relation]
 Entity1=MAIL_HOOKS

gulpfile.js

@@ -10,6 +10,10 @@ gulp.task('min', function() {
     return gulp.src([
         'src/main/webapp/WEB-INF/views/**/*.jsp'
     ])
+    .pipe(replace('href="<%= request.getContextPath() %>/bower', 'href="/bower'))
+    .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(usemin({
         css: [rev],
         htmlmin: [ function () {return minifyHtml({ empty: true });} ],
@@ -19,6 +23,14 @@ gulp.task('min', function() {
         outputRelativePath: '../../'
     }))
     .pipe(replace('var _LOGGING_NOTIFY_DESKTOP = true;', 'var _LOGGING_NOTIFY_DESKTOP = false;'))
+    .pipe(replace('href="/bower', 'href="<%= request.getContextPath() %>/bower'))
+    .pipe(replace('href="/css', 'href="<%= request.getContextPath() %>/css'))
+    .pipe(replace('src="/bower', 'src="<%= request.getContextPath() %>/bower'))
+    .pipe(replace('src="/js', 'src="<%= request.getContextPath() %>/js'))
+    .pipe(replace('href="bower', 'href="<%= request.getContextPath() %>/bower'))
+    .pipe(replace('href="css', 'href="<%= request.getContextPath() %>/css'))
+    .pipe(replace('src="bower', 'src="<%= request.getContextPath() %>/bower'))
+    .pipe(replace('src="js', 'src="<%= request.getContextPath() %>/js'))
     .pipe(gulp.dest('target/knowledge/WEB-INF/views/'));
 });
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.support-project</groupId>
     <artifactId>knowledge</artifactId>
-    <version>1.9.0</version>
+    <version>1.10.0</version>
     <packaging>war</packaging>
 
     <name>knowledge</name>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.support-project</groupId>
             <artifactId>web</artifactId>
-            <version>1.9.0</version>
+            <version>1.10.0</version>
         </dependency>
 
         <dependency>
@@ -137,8 +137,13 @@
 
         <dependency>
             <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4.7</version>
+            <artifactId>javax.mail-api</artifactId>
+            <version>1.5.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>1.5.6</version>
         </dependency>
 
         <dependency>

src/main/java/org/support/project/knowledge/bat/AbstractBat.java

@@ -8,7 +8,6 @@
 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.config.SystemConfig;
 import org.support.project.web.logic.DBConnenctionLogic;
 
 public abstract class AbstractBat {
@@ -27,11 +26,11 @@ protected static void configInit(String batName) {
         TimeZone zone = TimeZone.getTimeZone("GMT");
         TimeZone.setDefault(zone);
 
-        AppConfig.initEnvKey(SystemConfig.KNOWLEDGE_ENV_KEY);
-        String envValue = System.getenv(SystemConfig.KNOWLEDGE_ENV_KEY);
+        AppConfig.get();
+        String envValue = System.getenv(AppConfig.getEnvKey());
         LOG.info(batName + " is start.");
         if (LOG.isDebugEnabled()) {
-            LOG.debug("Env [" + SystemConfig.KNOWLEDGE_ENV_KEY + "] is [" + envValue + "].");
+            LOG.debug("Env [" + AppConfig.getEnvKey() + "] is [" + envValue + "].");
             LOG.debug("Config :" + PropertyUtil.reflectionToString(AppConfig.get()));
         }
     }

src/main/java/org/support/project/knowledge/bat/FileParseBat.java

@@ -20,11 +20,13 @@
 import org.support.project.common.util.StringUtils;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.IndexType;
+import org.support.project.knowledge.dao.DraftKnowledgesDao;
 import org.support.project.knowledge.dao.KnowledgeFilesDao;
 import org.support.project.knowledge.dao.KnowledgeItemValuesDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
 import org.support.project.knowledge.dao.TagsDao;
 import org.support.project.knowledge.dao.TemplateItemsDao;
+import org.support.project.knowledge.entity.DraftKnowledgesEntity;
 import org.support.project.knowledge.entity.KnowledgeFilesEntity;
 import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
@@ -243,8 +245,16 @@ private void fileParse() throws FileNotFoundException, IOException, MimeTypeExce
                 if (knowledgesEntity == null) {
                     // 紐づくナレッジが存在していないのであれば解析はしない（例えば、一度添付ファイル付きのナレッジを登録後、ナレッジを削除した場合）
                     // 理由：ナレッジに紐付いていないため、アクセス権が不定
-                    // ナレッジに紐づいていないファイルで、かつ更新日が24時間前のものは削除される
-                    filesDao.changeStatus(knowledgeFilesEntity.getFileNo(), PARSE_STATUS_NO_TARGET, UPDATE_USER_ID);
+                    // ナレッジに紐づいていないファイルで、かつ更新日が24時間前のものはステータスを更新する
+                    if (knowledgeFilesEntity.getDraftId() == null) {
+                        filesDao.changeStatus(knowledgeFilesEntity.getFileNo(), PARSE_STATUS_NO_TARGET, UPDATE_USER_ID);
+                    } else {
+                        DraftKnowledgesEntity draft = DraftKnowledgesDao.get().selectOnKey(knowledgeFilesEntity.getDraftId());
+                        if (draft == null) {
+                            // 下書きが存在する場合は、削除対象にしないが、下書きも消えている場合はステータスを更新する
+                            filesDao.changeStatus(knowledgeFilesEntity.getFileNo(), PARSE_STATUS_NO_TARGET, UPDATE_USER_ID);
+                        }
+                    }
                     continue;
                 }
                 // タグを取得

src/main/java/org/support/project/knowledge/config/SystemConfig.java

@@ -15,7 +15,7 @@ public class SystemConfig {
     /** ログ */
     private static final Log LOG = LogFactory.getLog(SystemConfig.class);
 
-    public static final String KNOWLEDGE_ENV_KEY = "KNOWLEDGE_HOME";
+    //public static final String KNOWLEDGE_ENV_KEY = "KNOWLEDGE_HOME";
 
     /** システム設定情報 */
     private static ServiceConfigsEntity serviceConfigsEntity = null;