Skip to content

石磊 / cihai

Go to a project
Commit a7a252c4 by 侯昆
Options

页面整合完成

1 parent 3f8f3d18
Expand all
Inline Side-by-side
Showing 25 changed files with 309 additions and 98 deletions
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/WordHtmlController.java
...@@ -112,7 +112,7 @@ public class WordHtmlController extends BaseController { ...@@ -112,7 +112,7 @@ public class WordHtmlController extends BaseController {
@RequestMapping(value = "/relate/{id}", method = RequestMethod.GET) @RequestMapping(value = "/relate/{id}", method = RequestMethod.GET)
public ModelAndView relate(@PathVariable("id") Long id) { public ModelAndView relate(@PathVariable("id") Long id) {
WordDomain wordDomain = wordService.get(id); WordDomain wordDomain = wordService.get(id);
List<WordDomain> relateWords = wordRelationService.getRelateWord(id); List<WordDomain> relateWords = wordRelationService.getRelateWords(id);
List<WordDTO> vos = relateWords.stream().filter(r -> !r.getId().equals(id)).map(word -> WordDTO.fromDomain(word, wordRelationService)).collect(Collectors.toList()); List<WordDTO> vos = relateWords.stream().filter(r -> !r.getId().equals(id)).map(word -> WordDTO.fromDomain(word, wordRelationService)).collect(Collectors.toList());
ModelAndView mv = new ModelAndView("/word/relate"); ModelAndView mv = new ModelAndView("/word/relate");
mv.addObject("word", wordDomain); mv.addObject("word", wordDomain);
......
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/vo/RelateWordsVO.java deleted 100644 → 0
package com.dookay.cihai.app.controller.vo;
/*****************************************
* *
* @dookay.com Internet make it happen *
* ----------- ----------------------- *
* dddd ddddd Internet make it happen *
* o o o Internet make it happen *
* k k k Internet make it happen *
* a a a Internet make it happen *
* yyyy yyyyy Internet make it happen *
* ----------- ----------------------- *
* @dookay.com Internet make it happen *
* *
****************************************/
import com.dookay.cihai.core.word.dto.WordDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author houkun
* @date 2018/1/14
*/
@Data
public class RelateWordsVO {
@ApiModelProperty("相关词列表")
public List<WordDTO> words;
}
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/dto/OneCharacterDTO.java
...@@ -36,6 +36,9 @@ public class OneCharacterDTO { ...@@ -36,6 +36,9 @@ public class OneCharacterDTO {
private String description; private String description;
public static OneCharacterDTO fromDomain(WordDomain word) { public static OneCharacterDTO fromDomain(WordDomain word) {
if (word == null) {
return null;
}
String description = ""; String description = "";
String baikeBrief = word.getBaikeBrief(); String baikeBrief = word.getBaikeBrief();
int i = StringUtils.indexOf(baikeBrief, '。'); int i = StringUtils.indexOf(baikeBrief, '。');
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/dto/RecommendStatementDTO.java
...@@ -40,10 +40,10 @@ public class RecommendStatementDTO { ...@@ -40,10 +40,10 @@ public class RecommendStatementDTO {
public static RecommendStatementDTO fromDomain(WordDomain word, List<WordDomain> related) { public static RecommendStatementDTO fromDomain(WordDomain word, List<WordDomain> related) {
String description = ""; String description = "";
String baikeBrief = word.getBaikeBrief(); String baikeParaph = word.getBaikeParaphrase();
int i = StringUtils.indexOf(baikeBrief, '。'); int i = StringUtils.indexOf(baikeParaph, '。');
if (i != -1) { if (i != -1) {
description = StringUtils.substring(baikeBrief, 0,i + 1); description = StringUtils.substring(baikeParaph, 0,i + 1);
} }
RecommendStatementDTO dto = new RecommendStatementDTO(); RecommendStatementDTO dto = new RecommendStatementDTO();
dto.setWord(word.getWord()); dto.setWord(word.getWord());
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/dto/WordDTO.java
...@@ -61,7 +61,7 @@ public class WordDTO { ...@@ -61,7 +61,7 @@ public class WordDTO {
wordDTO.setType(type); wordDTO.setType(type);
wordDTO.setHasParaph(!StringUtils.isAllBlank(word.getBody(), word.getWordBrief())); wordDTO.setHasParaph(!StringUtils.isAllBlank(word.getBody(), word.getWordBrief()));
wordDTO.setHasBaike(!StringUtils.isAllBlank(word.getBaikeBrief(), word.getBaikeParaphrase())); wordDTO.setHasBaike(!StringUtils.isAllBlank(word.getBaikeBrief(), word.getBaikeParaphrase()));
List<WordDomain> relateWord = wordRelationService.getRelateWord(word.getId()); List<WordDomain> relateWord = wordRelationService.getRelateWords(word.getId());
wordDTO.setHasRelated(CollectionUtils.isNotEmpty(relateWord)); wordDTO.setHasRelated(CollectionUtils.isNotEmpty(relateWord));
if (StringUtils.isNotEmpty(word.getBaikePhotos())) { if (StringUtils.isNotEmpty(word.getBaikePhotos())) {
ImageModel thumb = ImageModel thumb =
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/service/IWordRelationService.java
...@@ -27,5 +27,5 @@ public interface IWordRelationService extends IBaseService<WordRelationDomain> { ...@@ -27,5 +27,5 @@ public interface IWordRelationService extends IBaseService<WordRelationDomain> {
* @author houkun * @author houkun
* @date 2018/1/11 * @date 2018/1/11
*/ */
List<WordDomain> getRelateWord(Long wordId); List<WordDomain> getRelateWords(Long wordId);
} }
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/service/impl/WordRelationServiceImpl.java
...@@ -58,7 +58,7 @@ public class WordRelationServiceImpl extends BaseServiceImpl<WordRelationDomain> ...@@ -58,7 +58,7 @@ public class WordRelationServiceImpl extends BaseServiceImpl<WordRelationDomain>
} }
@Override @Override
public List<WordDomain> getRelateWord(Long wordId) { public List<WordDomain> getRelateWords(Long wordId) {
WordRelationQuery q = new WordRelationQuery(); WordRelationQuery q = new WordRelationQuery();
q.setWordId(wordId); q.setWordId(wordId);
WordRelationDomain wordRelate = super.getFirst(q); WordRelationDomain wordRelate = super.getFirst(q);
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/service/impl/WordServiceImpl.java
...@@ -2,6 +2,7 @@ package com.dookay.cihai.core.word.service.impl; ...@@ -2,6 +2,7 @@ package com.dookay.cihai.core.word.service.impl;
import com.dookay.cihai.core.word.dto.OneCharacterDTO; import com.dookay.cihai.core.word.dto.OneCharacterDTO;
import com.dookay.cihai.core.word.dto.RecommendStatementDTO; import com.dookay.cihai.core.word.dto.RecommendStatementDTO;
import com.dookay.cihai.core.word.query.WordQuery;
import com.dookay.cihai.core.word.service.IWordRelationService; import com.dookay.cihai.core.word.service.IWordRelationService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
...@@ -32,14 +33,18 @@ public class WordServiceImpl extends BaseServiceImpl<WordDomain> implements IWor ...@@ -32,14 +33,18 @@ public class WordServiceImpl extends BaseServiceImpl<WordDomain> implements IWor
@Override @Override
public OneCharacterDTO oneDayOnCharacter() { public OneCharacterDTO oneDayOnCharacter() {
WordDomain wordDomain = wordMapper.selectWordLengthLessOrEquealThan(3); WordQuery query = new WordQuery();
query.setWord("象");
WordDomain wordDomain = super.getFirst(query);
return OneCharacterDTO.fromDomain(wordDomain); return OneCharacterDTO.fromDomain(wordDomain);
} }
@Override @Override
public RecommendStatementDTO recomendStatement() { public RecommendStatementDTO recomendStatement() {
WordDomain wordDomain = wordMapper.selectWordLengthMoreThan(3); WordQuery query = new WordQuery();
List<WordDomain> relateWord = wordRelationService.getRelateWord(wordDomain.getId()); query.setWord("鲁迅");
WordDomain wordDomain = super.getFirst(query);
List<WordDomain> relateWord = wordRelationService.getRelateWords(wordDomain.getId());
return RecommendStatementDTO.fromDomain(wordDomain, relateWord); return RecommendStatementDTO.fromDomain(wordDomain, relateWord);
} }
} }
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/HomeController.java
...@@ -164,4 +164,15 @@ public class HomeController extends BaseController { ...@@ -164,4 +164,15 @@ public class HomeController extends BaseController {
} }
} }
/**
* 历史上的今天
* @author houkun
* @date 2018/1/16
*/
@RequestMapping(value = "/today", method = RequestMethod.GET)
public ModelAndView today() {
ModelAndView mv = new ModelAndView("/home/today");
return mv;
}
} }
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/WordController.java
...@@ -19,10 +19,7 @@ import com.dookay.cihai.core.word.dto.WordDTO; ...@@ -19,10 +19,7 @@ import com.dookay.cihai.core.word.dto.WordDTO;
import com.dookay.cihai.core.word.enums.WordType; import com.dookay.cihai.core.word.enums.WordType;
import com.dookay.cihai.core.word.service.IWordRelationService; import com.dookay.cihai.core.word.service.IWordRelationService;
import com.dookay.cihai.core.word.service.IWordService; import com.dookay.cihai.core.word.service.IWordService;
import com.dookay.cihai.pc.controller.vo.CharacterBaikeVO; import com.dookay.cihai.pc.controller.vo.*;
import com.dookay.cihai.pc.controller.vo.CharacterParaphVO;
import com.dookay.cihai.pc.controller.vo.StatementBaikeVO;
import com.dookay.cihai.pc.controller.vo.StatementParaphVO;
import com.dookay.coral.common.core.exception.ServiceException; import com.dookay.coral.common.core.exception.ServiceException;
import com.dookay.coral.common.core.utils.lang.StringUtils; import com.dookay.coral.common.core.utils.lang.StringUtils;
import com.dookay.coral.common.web.controller.BaseController; import com.dookay.coral.common.web.controller.BaseController;
...@@ -34,7 +31,6 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -34,7 +31,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* 词控制器 * 词控制器
...@@ -50,6 +46,7 @@ public class WordController extends BaseController { ...@@ -50,6 +46,7 @@ public class WordController extends BaseController {
@Autowired @Autowired
private IWordRelationService wordRelationService; private IWordRelationService wordRelationService;
/** /**
* 词详情跳转页 * 词详情跳转页
* *
...@@ -94,7 +91,13 @@ public class WordController extends BaseController { ...@@ -94,7 +91,13 @@ public class WordController extends BaseController {
public ModelAndView characterParaph(@PathVariable("id") Long id) { public ModelAndView characterParaph(@PathVariable("id") Long id) {
WordDomain character = wordService.get(id); WordDomain character = wordService.get(id);
ModelAndView mv = new ModelAndView("/word/character_paraph"); ModelAndView mv = new ModelAndView("/word/character_paraph");
boolean hasBaike = StringUtils.isNotBlank(character.getBaikeBrief()) ||
StringUtils.isNotBlank(character.getBaikeParaphrase());
mv.addObject("hasBaike", hasBaike);
mv.addObject("vo", CharacterParaphVO.fromDomain(character)); mv.addObject("vo", CharacterParaphVO.fromDomain(character));
mv.addObject("edition", EditionVO.fromDomain(character));
List<WordDomain> relateWords = wordRelationService.getRelateWords(character.getId());
mv.addObject("relateWords", relateWords);
return mv; return mv;
} }
...@@ -107,8 +110,14 @@ public class WordController extends BaseController { ...@@ -107,8 +110,14 @@ public class WordController extends BaseController {
@RequestMapping(value = "/character/baike/{id}", method = RequestMethod.GET) @RequestMapping(value = "/character/baike/{id}", method = RequestMethod.GET)
public ModelAndView characterBaike(@PathVariable("id") Long id) { public ModelAndView characterBaike(@PathVariable("id") Long id) {
WordDomain character = wordService.get(id); WordDomain character = wordService.get(id);
boolean hasParaph = StringUtils.isNotBlank(character.getWordBrief()) ||
StringUtils.isNotBlank(character.getBody());
ModelAndView mv = new ModelAndView("/word/character_baike"); ModelAndView mv = new ModelAndView("/word/character_baike");
mv.addObject("vo", CharacterBaikeVO.fromDomain(character)); mv.addObject("vo", CharacterBaikeVO.fromDomain(character));
mv.addObject("hasParaph", hasParaph);
mv.addObject("edition", EditionVO.fromDomain(character));
List<WordDomain> relateWords = wordRelationService.getRelateWords(character.getId());
mv.addObject("relateWords", relateWords);
return mv; return mv;
} }
...@@ -121,8 +130,14 @@ public class WordController extends BaseController { ...@@ -121,8 +130,14 @@ public class WordController extends BaseController {
@RequestMapping(value = "/statement/paraph/{id}", method = RequestMethod.GET) @RequestMapping(value = "/statement/paraph/{id}", method = RequestMethod.GET)
public ModelAndView statementParaph(@PathVariable("id") Long id) { public ModelAndView statementParaph(@PathVariable("id") Long id) {
WordDomain statement = wordService.get(id); WordDomain statement = wordService.get(id);
boolean hasBaike = StringUtils.isNotBlank(statement.getBaikeBrief()) ||
StringUtils.isNotBlank(statement.getBaikeParaphrase());
ModelAndView mv = new ModelAndView("/word/statement_paraph"); ModelAndView mv = new ModelAndView("/word/statement_paraph");
mv.addObject("hasBaike", hasBaike);
mv.addObject("vo", StatementParaphVO.fromDomain(statement)); mv.addObject("vo", StatementParaphVO.fromDomain(statement));
mv.addObject("edition", EditionVO.fromDomain(statement));
List<WordDomain> relateWords = wordRelationService.getRelateWords(statement.getId());
mv.addObject("relateWords", relateWords);
return mv; return mv;
} }
...@@ -135,26 +150,16 @@ public class WordController extends BaseController { ...@@ -135,26 +150,16 @@ public class WordController extends BaseController {
@RequestMapping(value = "/statement/baike/{id}", method = RequestMethod.GET) @RequestMapping(value = "/statement/baike/{id}", method = RequestMethod.GET)
public ModelAndView statementBaike(@PathVariable("id") Long id) { public ModelAndView statementBaike(@PathVariable("id") Long id) {
WordDomain statement = wordService.get(id); WordDomain statement = wordService.get(id);
boolean hasParaph = StringUtils.isNotBlank(statement.getWordBrief()) ||
StringUtils.isNotBlank(statement.getBody());
ModelAndView mv = new ModelAndView("/word/statement_baike"); ModelAndView mv = new ModelAndView("/word/statement_baike");
mv.addObject("vo", StatementBaikeVO.fromDomain(statement)); mv.addObject("vo", StatementBaikeVO.fromDomain(statement));
mv.addObject("hasParaph", hasParaph);
mv.addObject("edition", EditionVO.fromDomain(statement));
List<WordDomain> relateWords = wordRelationService.getRelateWords(statement.getId());
mv.addObject("relateWords", relateWords);
return mv; return mv;
} }
/**
* 相关词
*
* @param id
* @return
*/
@RequestMapping(value = "/relate/{id}", method = RequestMethod.GET)
public ModelAndView relate(@PathVariable("id") Long id) {
WordDomain wordDomain = wordService.get(id);
List<WordDomain> relateWords = wordRelationService.getRelateWord(id);
List<WordDTO> vos = relateWords.stream().filter(r -> !r.getId().equals(id)).map(word -> WordDTO.fromDomain(word, wordRelationService)).collect(Collectors.toList());
ModelAndView mv = new ModelAndView("/word/relate");
mv.addObject("word", wordDomain);
mv.addObject("vos", vos);
return mv;
}
} }
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/vo/CharacterParaphVO.java
...@@ -14,10 +14,9 @@ package com.dookay.cihai.pc.controller.vo; ...@@ -14,10 +14,9 @@ package com.dookay.cihai.pc.controller.vo;
* * * *
****************************************/ ****************************************/
import com.dookay.cihai.app.controller.dto.ParaphBodyDTO;
import com.dookay.cihai.core.word.domain.WordDomain; import com.dookay.cihai.core.word.domain.WordDomain;
import com.dookay.cihai.pc.controller.dto.ParaphBodyDTO;
import com.dookay.coral.common.core.utils.lang.StringUtils; import com.dookay.coral.common.core.utils.lang.StringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Arrays; import java.util.Arrays;
......
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/helper/HtmlHelper.java 0 → 100644
package com.dookay.cihai.pc.helper;
/*****************************************
* *
* @dookay.com Internet make it happen *
* ----------- ----------------------- *
* dddd ddddd Internet make it happen *
* o o o Internet make it happen *
* k k k Internet make it happen *
* a a a Internet make it happen *
* yyyy yyyyy Internet make it happen *
* ----------- ----------------------- *
* @dookay.com Internet make it happen *
* *
****************************************/
import com.dookay.coral.common.core.utils.lang.StringUtils;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author houkun
* @date 2018/1/14
*/
public class HtmlHelper {
private HtmlHelper() {
}
/**
* 语词简介
*
* @author houkun
* @date 2018/1/16
*/
public static List<String> paraphBriefToHtml(List<String> brief) {
List<String> collect = brief.stream().map(
b -> {
String[] split = StringUtils.split(b, ":");
if (split.length != 2) {
split = StringUtils.split(b, "：");
}
if (split.length != 2) {
return null;
}
if (brief.indexOf(b) % 3 == 0) {
return String.format(
"<div class=\"character-info-cell\">\n" +
" <span class=\"character-info-label\">%s： </span>\n" +
" <span class=\"character-info-num\">%s</span>\n" +
"</div>",
split[0], split[1]);
} else {
return String.format(
"<div class=\"character-info-cell\">\n" +
" <span class=\"character-info-label\">%s： </span>\n" +
" <span class=\"character-info-value\">%s</span>\n" +
"</div>",
split[0], split[1]);
}
})
.filter(StringUtils::isNoneBlank)
.collect(Collectors.toList());
return collect;
}
/**
* 简介转html
*
* @param brief
* @return
* @author houkun
* @date 2018/1/14
*/
public static List<String> baikeBreifToHtml(List<String> brief) {
List<String> collect = brief.stream()
.map(b -> {
String[] split = StringUtils.split(b, ":");
if (split.length != 2) {
split = StringUtils.split(b, "：");
}
if (split.length != 2) {
return null;
}
if (brief.indexOf(b) % 2 == 0){
return String.format(
"<div class=\"intro-item col-xs-8 clearfix\">\n" +
" <div class=\"name pull-left\">%s：</div>\n" +
" <div class=\"txt pull-left\">%s</div>\n" +
"</div>",
split[0], split[1]);
} else{
return String.format(
"<div class=\"intro-item col-xs-16 clearfix\">\n" +
" <div class=\"name pull-left\">%s：</div>\n" +
" <div class=\"txt pull-left\">%s</div>\n" +
"</div>",
split[0], split[1]);
}
})
.filter(StringUtils::isNoneBlank)
.collect(Collectors.toList());
return collect;
}
}
serverside/cihai-pc/src/main/resources/application-dev.properties
debug=false
# 数据库连接 # 数据库连接
spring.datasource.url=jdbc:mysql://192.168.2.24:3306/cihai spring.datasource.url=jdbc:mysql://192.168.2.28:3306/cihai
spring.datasource.username=root spring.datasource.username=root
# 加密后的密码 # 加密后的密码
spring.datasource.password=AmwpshLB35Fgazrs4rCfGlwNBZOTD34ezY/zS751V+7iSJHjr3tDNkpOfnW/y0fjFcMTNX0ycMt3KIUnDi8JYg== spring.datasource.password=AmwpshLB35Fgazrs4rCfGlwNBZOTD34ezY/zS751V+7iSJHjr3tDNkpOfnW/y0fjFcMTNX0ycMt3KIUnDi8JYg==
......
serverside/cihai-pc/src/main/resources/application-production.properties
# 数据库连接 # 数据库连接
spring.datasource.url=jdbc:mysql://localhost:3306/cihai spring.datasource.url=jdbc:mysql://192.168.2.28:3306/cihai
spring.datasource.username=root spring.datasource.username=root
# 加密后的密码 # 加密后的密码
spring.datasource.password=oeIOLg5LNEaK9BSQiwmjwdfkVksUrrt6kgBdEoONs3X4gZQN1TmweFerGfm8Jt+Cj94RxFumQ3N733MRlF4uoA== spring.datasource.password=AmwpshLB35Fgazrs4rCfGlwNBZOTD34ezY/zS751V+7iSJHjr3tDNkpOfnW/y0fjFcMTNX0ycMt3KIUnDi8JYg==
# 加密时的公钥 # 加密时的公钥
public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKk6Fd6Bnc5NWXx5PSkdRwVxhG9WPGnvhQZJYtjy1+ug2ivEvwGValq0z3BDmA0uy3NBx9iOkPEWdGS24M6g3cMCAwEAAQ== public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKgof5ExfKmEZEjq+GuqEoHA8tkIftarLRzUDAxdQzJQtF57DF63gPJJkIZLcKa2t8jt5JC2SRdxERg1A/kx0BMCAwEAAQ==
# 日志 # 日志
logging.level.root=error logging.level.root=error
logging.level.com.dookay.coral.common.core=info logging.level.com.dookay.coral.common.core=info
......
serverside/cihai-pc/src/main/resources/application-test.properties
# 数据库连接 # 数据库连接
spring.datasource.url=jdbc:mysql://localhost:3306/cihai spring.datasource.url=jdbc:mysql://192.168.2.28:3306/cihai
spring.datasource.username=root spring.datasource.username=root
# 加密后的密码 # 加密后的密码
spring.datasource.password=oeIOLg5LNEaK9BSQiwmjwdfkVksUrrt6kgBdEoONs3X4gZQN1TmweFerGfm8Jt+Cj94RxFumQ3N733MRlF4uoA== spring.datasource.password=AmwpshLB35Fgazrs4rCfGlwNBZOTD34ezY/zS751V+7iSJHjr3tDNkpOfnW/y0fjFcMTNX0ycMt3KIUnDi8JYg==
# 加密时的公钥 # 加密时的公钥
public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKk6Fd6Bnc5NWXx5PSkdRwVxhG9WPGnvhQZJYtjy1+ug2ivEvwGValq0z3BDmA0uy3NBx9iOkPEWdGS24M6g3cMCAwEAAQ== public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKgof5ExfKmEZEjq+GuqEoHA8tkIftarLRzUDAxdQzJQtF57DF63gPJJkIZLcKa2t8jt5JC2SRdxERg1A/kx0BMCAwEAAQ==
# 日志 # 日志
logging.level.root=warn logging.level.root=warn
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/index.jsp
<%@ page import="org.apache.commons.lang3.time.DateFormatUtils" %> <%@ page import="org.apache.commons.lang3.time.DateFormatUtils" %>
<%@ page import="java.util.Date" %> <%@ page import="java.util.Date" %>
<%@ page import="org.apache.commons.lang3.StringUtils" %>
<%@ page import="java.util.stream.Collectors" %>
<jsp:useBean id="oneDayCharacter" scope="request" type="com.dookay.cihai.core.word.dto.OneCharacterDTO"/> <jsp:useBean id="oneDayCharacter" scope="request" type="com.dookay.cihai.core.word.dto.OneCharacterDTO"/>
<jsp:useBean id="recommendStatement" scope="request" type="com.dookay.cihai.core.word.dto.RecommendStatementDTO"/>
<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> <%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
...@@ -11,7 +14,7 @@ ...@@ -11,7 +14,7 @@
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="index.html"> <a class="navbar-brand" href="/">
<img src="images/logo.png"> <img src="images/logo.png">
</a> </a>
</div> </div>
...@@ -48,7 +51,7 @@ ...@@ -48,7 +51,7 @@
<form class="navbar-form clearfix j_search_form" action="/home/search" method="GET"> <form class="navbar-form clearfix j_search_form" action="/home/search" method="GET">
<div class="logo-search"> <div class="logo-search">
<a> <a>
<img class="img-responsive" src="images/logo-search.png"> <img class="img-responsive" src="/images/logo-search.png">
</a> </a>
</div> </div>
<div class="search-main-input-wrapper"> <div class="search-main-input-wrapper">
...@@ -80,7 +83,7 @@ ...@@ -80,7 +83,7 @@
<div class="card-main"> <div class="card-main">
<div class="card-col card-character"> <div class="card-col card-character">
<div class="card-character-main"> <div class="card-character-main">
<a href="/word/${oneDayCharacter.word}">${oneDayCharacter.word}</a> <a href="/word/${oneDayCharacter.wordId}">${oneDayCharacter.word}</a>
<div class="card-character-voice"> <div class="card-character-voice">
<div class="icon icon-horn"></div> <div class="icon icon-horn"></div>
</div> </div>
...@@ -89,12 +92,14 @@ ...@@ -89,12 +92,14 @@
</div> </div>
</div> </div>
<div class="card-col card-word"> <div class="card-col card-word">
<div class="card-word-value">春节</div> <div class="card-word-value">${recommendStatement.word}</div>
<div class="card-word-content"> <div class="card-word-content">
<div class="card-word-desc">中国民间最隆重的传统节日。 <div class="card-word-desc">
<br>时间在每年夏历元旦，即正月初一。 <%=StringUtils.replace(recommendStatement.getDescription(), "\n", "<br>")%>
</div>
<div class="card-word-metas">
<%=StringUtils.join(recommendStatement.getRelatedStatement().stream().limit(4).collect(Collectors.toList()), " / ")%>
</div> </div>
<div class="card-word-metas">对联 / 福 / 中秋节 / 团圆节</div>
</div> </div>
<div class="card-word-share"> <div class="card-word-share">
<div class="icon icon-share"></div> <div class="icon icon-share"></div>
...@@ -130,11 +135,13 @@ ...@@ -130,11 +135,13 @@
<img src="images/calendar.png"> <img src="images/calendar.png">
<span class="next">后</span> <span class="next">后</span>
</div> </div>
<div class="card-history-list"> <a href="/today">
<div class="card-history-item">2004年<%=DateFormatUtils.format(new Date(), "M月d日")%>人类第一次进行从彗星核中取样</div> <div class="card-history-list">
<div class="card-history-item">2001年<%=DateFormatUtils.format(new Date(), "M月d日")%>金门与厦门之间 两岸“小三通”首航</div> <div class="card-history-item">2004年<%=DateFormatUtils.format(new Date(), "M月d日")%>人类第一次进行从彗星核中取样</div>
<div class="card-history-item">1997年<%=DateFormatUtils.format(new Date(), "M月d日")%>科菲·安南正式就任联合国秘书长</div> <div class="card-history-item">2001年<%=DateFormatUtils.format(new Date(), "M月d日")%>金门与厦门之间 两岸“小三通”首航</div>
</div> <div class="card-history-item">1997年<%=DateFormatUtils.format(new Date(), "M月d日")%>科菲·安南正式就任联合国秘书长</div>
</div>
</a>
</div> </div>
</div> </div>
</div> </div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/today.jsp 0 → 100644
<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="/WEB-INF/jsp/include/header_search.jsp">
<jsp:param name="pageTitle" value="历史上的今天"/>
</jsp:include>
<div class="history-content text-center">
<img src="/images/history-01.jpg">
</div>
<footer class="footer-main">
<div class="container">
<p class="copyright">Copyright © 2006-2016 上海辞书出版社有限公司
<a class="beian" href="#" target="_blank">沪ICP备12009386号-3</a>
</p>
</div>
</footer>
<jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/include/footer.jsp
...@@ -2,15 +2,5 @@ ...@@ -2,15 +2,5 @@
<%--添加此行消除额外空格--%> <%--添加此行消除额外空格--%>
<%@ page trimDirectiveWhitespaces="true" %> <%@ page trimDirectiveWhitespaces="true" %>
<%--添加此行消除额外空格--%> <%--添加此行消除额外空格--%>
<script src="js/plugins/jquery.min.js"></script>
<script src="js/vendor.js" merge="true"></script>
<script src="js/backend.js"></script>
<script src="js/layer/layer.js"></script>
<script src="js/plugins/validator/jquery.validator.js"></script>
<script>
$(function () {
backEndApp.init();
})
</script>
</body> </body>
</html> </html>
\ No newline at end of file \ No newline at end of file
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/include/header.jsp
...@@ -10,7 +10,18 @@ ...@@ -10,7 +10,18 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<title>辞海-${param.pageTitle}</title> <title>辞海-${param.pageTitle}</title>
<link rel="stylesheet" href="css/vendor.css"> <link rel="stylesheet" href="/css/vendor.css">
<link rel="stylesheet" href="css/index.css"> <link rel="stylesheet" href="/css/index.css">
<script src="/js/plugins/jquery.min.js"></script>
<script src="/js/plugins/validator/jquery.validator.js"></script>
<script src="/js/common.js"></script>
<script src="/js/vendor.js" merge="true"></script>
<script src="/js/backend.js"></script>
<script src="/js/layer/layer.js"></script>
<script>
$(function () {
backEndApp.init();
})
</script>
</head> </head>
<body> <body>
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/include/header_search.jsp 0 → 100644
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
<%--添加此行消除额外空格--%>
<%@ page trimDirectiveWhitespaces="true" %>
<%--添加此行消除额外空格--%>
<!DOCTYPE html>
<html lang="zh-CN">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="renderer" content="webkit">
<title>辞海-${param.pageTitle}</title>
<link rel="stylesheet" href="/css/vendor.css">
<link rel="stylesheet" href="/css/index.css">
<script src="/js/plugins/jquery.min.js"></script>
<script src="/js/plugins/validator/jquery.validator.js"></script>
<script src="/js/common.js"></script>
<script src="/js/vendor.js" merge="true"></script>
<script src="/js/backend.js"></script>
<script src="/js/layer/layer.js"></script>
<script>
$(function () {
backEndApp.init();
$('.j_search_form').ajaxSubmitForm({
success: function ($form, data) {
if(data.code ==="OK"){
location.href = '/word/' + data.data.wordId;
}
else{
$.tip(data.message);
}
},
});
})
</script>
</head>
<body>
<nav class="navbar navbar-default">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="/">
<img src="/images/logo.png">
</a>
</div>
<div class="navbar-collapse">
<form class="navbar-form clearfix j_search_form" method="GET" action="/home/search">
<div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云" name="keyword">
<%--<button class="btn navbar-search-camera" type="button">--%>
<%--<div class="icon icon-camera"></div>--%>
<%--</button>--%>
<%--<button class="btn navbar-search-microphone" type="button">--%>
<%--<div class="icon icon-microphone"></div>--%>
<%--</button>--%>
</div>
<button class="btn btn-inverse btn-lg" type="submit">进入词条</button>
<button class="btn btn-default btn-lg" type="submit">搜索词条</button>
<a class="btn btn-link btn-lg" type="button">搜索助手
<span class="icon icon-help"></span>
</a>
<div class="navbar-main-list">
<span class="icon icon-search-tag"></span>
<a href="#">语词</a>
<a href="#">哲学</a>
<a href="#">社会</a>
<a href="#">民族</a>
<a href="#">历史</a>
<a href="#">地理</a>
<a href="#">文学</a>
<a href="#">艺术</a>
<a href="#">生命</a>
<a href="#">农业</a>
<a href="#">医学</a>
<a href="#">科技</a>
</div>
</form>
<ul class="nav navbar-nav navbar-right">
<li>
<a class="btn btn-primary" href="#">登录</a>
</li>
<li>
<a class="btn btn-default" href="#">注册</a>
</li>
</ul>
</div>
</div>
</nav>
serverside/cihai-pc/src/main/webapp/static/2-3字-百科义.html
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
</div> </div>
</div> </div>
</nav> </nav>
<div class="encyclopedia" style="background-image:url(images/word-bg-01.jpg)"> <div class="encyclopedia" style="background-image:url(images/word-bg-01.jpg)">
<div class="container"> <div class="container">
<div class="content"> <div class="content">
...@@ -440,5 +441,6 @@ ...@@ -440,5 +441,6 @@
commonApp.photoSwipeFromDom('.list-gallery'); commonApp.photoSwipeFromDom('.list-gallery');
}); });
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file \ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!