fix dss-guide bug

Author: suyc

conf/dss-guide-server.properties

@@ -19,6 +19,10 @@
 # Spring configurations
 spring.server.port=9210
 spring.spring.application.name=dss-guide-server
+
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+
 wds.linkis.server.version=v1
 
 wds.linkis.log.clear=true
@@ -38,4 +42,5 @@ wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.guide.server.d
 #wds.linkis.gateway.url=http://127.0.0.1:9001/
 
 ## guide_images_path
-guide.content.images.path=/opt/dss/dss-guide-server/guide_images/
+guide.content.images.path=/opt/dss/dss-guide-server/guide_images/
+guide.chapter.images.path=/opt/dss/dss-guide-server/guide_images/

db/dss_ddl.sql

@@ -1291,6 +1291,7 @@ alter table dss_orchestrator_version_info  add  context_id varchar(200) DEFAULT
 
 ALTER TABLE dss_onestop_user_favorites  ADD COLUMN `type`  varchar(20) comment '类型,区分收藏和盯一盯';
 
+
 /**
  * 鲁班产品及文档 dss-guide
  */
@@ -1327,11 +1328,13 @@ CREATE TABLE IF NOT EXISTS `dss_guide_content` (
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='用户向导页面内容详情';
 
+
 DROP TABLE IF EXISTS `dss_guide_catalog`;
 CREATE TABLE IF NOT EXISTS `dss_guide_catalog` (
   `id` BIGINT(13) NOT NULL AUTO_INCREMENT,
-  `parent_id` BIGINT(13) NOT NULL COMMENT '父级目录ID',
+  `parent_id` BIGINT(13) NOT NULL COMMENT '父级目录ID，-1代表最顶级目录',
   `title` VARCHAR(50) DEFAULT NULL COMMENT '标题',
+  `description` VARCHAR(200) DEFAULT NULL COMMENT '描述',
   `create_by` VARCHAR(255) DEFAULT NULL COMMENT '创建者',
   `create_time` DATETIME DEFAULT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_by` VARCHAR(255) DEFAULT NULL COMMENT '更新者',
@@ -1345,7 +1348,7 @@ CREATE TABLE IF NOT EXISTS `dss_guide_chapter` (
   `id` BIGINT(13) NOT NULL AUTO_INCREMENT,
   `catalog_id` BIGINT(13) NOT NULL COMMENT '目录ID',
   `title` VARCHAR(50) DEFAULT NULL COMMENT '标题',
-  `titleAlias` VARCHAR(50) DEFAULT NULL COMMENT '标题简称',
+  `title_alias` VARCHAR(50) DEFAULT NULL COMMENT '标题简称',
   `content` TEXT DEFAULT NULL COMMENT 'Markdown格式的内容',
   `content_html` TEXT DEFAULT NULL COMMENT 'Markdown转换为html内容',
   `create_by` varchar(255) DEFAULT NULL COMMENT '创建者',

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/conf/GuideConf.java

@@ -12,5 +12,5 @@
 public interface GuideConf {
     CommonVars<String> GUIDE_CONTENT_IMAGES_PATH = CommonVars.apply("guide.content.images.path", "/usr/local/anlexander/all_bak/dss_linkis/dss-linkis-1.0.2/images");
 
-    CommonVars<String> GUIDE_CHAPTER_IMAGES_PATH = CommonVars.apply("guide.content.images.path", "/usr/local/anlexander/all_bak/dss_linkis/dss-linkis-1.0.2/images");
+    CommonVars<String> GUIDE_CHAPTER_IMAGES_PATH = CommonVars.apply("guide.chapter.images.path", "/usr/local/anlexander/all_bak/dss_linkis/dss-linkis-1.0.2/images");
 }

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/entity/GuideCatalog.java

@@ -8,7 +8,6 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author suyc
@@ -30,11 +29,11 @@ public class GuideCatalog {
     private String createBy;
     private String updateBy;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
     //private Integer isDelete;

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/entity/GuideChapter.java

@@ -30,10 +30,10 @@ public class GuideChapter {
 
     private String createBy;
     private String updateBy;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
     //private Integer isDelete;

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/entity/GuideContent.java

@@ -34,10 +34,10 @@ public class GuideContent {
 
     private String createBy;
     private String updateBy;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
     private Integer isDelete;

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/entity/GuideGroup.java

@@ -31,11 +31,11 @@ public class GuideGroup implements Serializable {
     private String createBy;
     private String updateBy;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
     private Integer isDelete;