Skip to content

Commit befedfa

Browse files
author
suyc
committed
fix dss-guide bug
1 parent f59f540 commit befedfa

File tree

7 files changed

+20
-13
lines changed

7 files changed

+20
-13
lines changed

conf/dss-guide-server.properties

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
# Spring configurations
2020
spring.server.port=9210
2121
spring.spring.application.name=dss-guide-server
22+
23+
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
24+
spring.jackson.time-zone=GMT+8
25+
2226
wds.linkis.server.version=v1
2327

2428
wds.linkis.log.clear=true
@@ -38,4 +42,5 @@ wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.guide.server.d
3842
#wds.linkis.gateway.url=http://127.0.0.1:9001/
3943

4044
## guide_images_path
41-
guide.content.images.path=/opt/dss/dss-guide-server/guide_images/
45+
guide.content.images.path=/opt/dss/dss-guide-server/guide_images/
46+
guide.chapter.images.path=/opt/dss/dss-guide-server/guide_images/

db/dss_ddl.sql

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,6 +1291,7 @@ alter table dss_orchestrator_version_info add context_id varchar(200) DEFAULT
12911291

12921292
ALTER TABLE dss_onestop_user_favorites ADD COLUMN `type` varchar(20) comment '类型,区分收藏和盯一盯';
12931293

1294+
12941295
/**
12951296
* 鲁班产品及文档 dss-guide
12961297
*/
@@ -1327,11 +1328,13 @@ CREATE TABLE IF NOT EXISTS `dss_guide_content` (
13271328
PRIMARY KEY (`id`)
13281329
) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='用户向导页面内容详情';
13291330

1331+
13301332
DROP TABLE IF EXISTS `dss_guide_catalog`;
13311333
CREATE TABLE IF NOT EXISTS `dss_guide_catalog` (
13321334
`id` BIGINT(13) NOT NULL AUTO_INCREMENT,
1333-
`parent_id` BIGINT(13) NOT NULL COMMENT '父级目录ID',
1335+
`parent_id` BIGINT(13) NOT NULL COMMENT '父级目录ID,-1代表最顶级目录',
13341336
`title` VARCHAR(50) DEFAULT NULL COMMENT '标题',
1337+
`description` VARCHAR(200) DEFAULT NULL COMMENT '描述',
13351338
`create_by` VARCHAR(255) DEFAULT NULL COMMENT '创建者',
13361339
`create_time` DATETIME DEFAULT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
13371340
`update_by` VARCHAR(255) DEFAULT NULL COMMENT '更新者',
@@ -1345,7 +1348,7 @@ CREATE TABLE IF NOT EXISTS `dss_guide_chapter` (
13451348
`id` BIGINT(13) NOT NULL AUTO_INCREMENT,
13461349
`catalog_id` BIGINT(13) NOT NULL COMMENT '目录ID',
13471350
`title` VARCHAR(50) DEFAULT NULL COMMENT '标题',
1348-
`titleAlias` VARCHAR(50) DEFAULT NULL COMMENT '标题简称',
1351+
`title_alias` VARCHAR(50) DEFAULT NULL COMMENT '标题简称',
13491352
`content` TEXT DEFAULT NULL COMMENT 'Markdown格式的内容',
13501353
`content_html` TEXT DEFAULT NULL COMMENT 'Markdown转换为html内容',
13511354
`create_by` varchar(255) DEFAULT NULL COMMENT '创建者',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
public interface GuideConf {
1313
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");
1414

15-
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");
15+
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");
1616
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.springframework.format.annotation.DateTimeFormat;
99

1010
import java.util.Date;
11-
import java.util.List;
1211

1312
/**
1413
* @author suyc
@@ -30,11 +29,11 @@ public class GuideCatalog {
3029
private String createBy;
3130
private String updateBy;
3231

33-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
32+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
3433
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
3534
private Date createTime;
3635

37-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
36+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
3837
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
3938
private Date updateTime;
4039
//private Integer isDelete;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ public class GuideChapter {
3030

3131
private String createBy;
3232
private String updateBy;
33-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
33+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
3434
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
3535
private Date createTime;
36-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
36+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
3737
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
3838
private Date updateTime;
3939
//private Integer isDelete;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public class GuideContent {
3434

3535
private String createBy;
3636
private String updateBy;
37-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
37+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
3838
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
3939
private Date createTime;
40-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
40+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
4141
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
4242
private Date updateTime;
4343
private Integer isDelete;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ public class GuideGroup implements Serializable {
3131
private String createBy;
3232
private String updateBy;
3333

34-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
34+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
3535
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
3636
private Date createTime;
3737

38-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
38+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
3939
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
4040
private Date updateTime;
4141
private Integer isDelete;

0 commit comments

Comments
 (0)