Merge remote-tracking branch 'origin/master'

cihai-core/src/main/java/com/dookay/cihai/core/theme/domain/ThemeDomain.java

+package com.dookay.cihai.core.theme.domain;
+
+import lombok.Data;
+import java.io.Serializable;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+import java.util.List;
+
+/**
+* 专题
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@Data
+@Table(name = "t_theme")
+public class ThemeDomain implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 
+	 */
+    @Id
+	private Long id;
+	
+	/**
+	 * 
+	 */
+	private String title;
+	
+	/**
+	 * 
+	 */
+	private String introduce;
+	
+	/**
+	 * 
+	 */
+	private String basicInfo;
+	
+	/**
+	 * 
+	 */
+	private Date createTime;
+	
+	/**
+	 * 
+	 */
+	private Date updateTime;
+	
+	/**
+	 * 
+	 */
+	private String subTitle;
+	
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/theme/domain/ThemeWordDomain.java

+package com.dookay.cihai.core.theme.domain;
+
+import lombok.Data;
+import java.io.Serializable;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+import java.util.List;
+
+/**
+* 专题词条关系
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@Data
+@Table(name = "t_theme_word")
+public class ThemeWordDomain implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 
+	 */
+    @Id
+	private Long id;
+	
+	/**
+	 * 
+	 */
+	private Long wordId;
+	
+	/**
+	 * 
+	 */
+	private Long themeId;
+	
+	/**
+	 * 
+	 */
+	private Date createTime;
+	
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/theme/mapper/ThemeMapper.java

+package com.dookay.cihai.core.theme.mapper;
+
+import com.dookay.coral.common.core.persistence.Mapper;
+import com.dookay.cihai.core.theme.domain.ThemeDomain;
+
+/**
+* 专题
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public interface ThemeMapper extends Mapper<ThemeDomain> {
+	
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/theme/mapper/ThemeWordMapper.java

+package com.dookay.cihai.core.theme.mapper;
+
+import com.dookay.coral.common.core.persistence.Mapper;
+import com.dookay.cihai.core.theme.domain.ThemeWordDomain;
+
+/**
+* 专题词条关系
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public interface ThemeWordMapper extends Mapper<ThemeWordDomain> {
+	
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/theme/query/ThemeQuery.java

+package com.dookay.cihai.core.theme.query;
+
+import com.dookay.coral.common.core.persistence.Query;
+import tk.mybatis.mapper.entity.Example;
+import com.dookay.coral.common.core.persistence.criteria.QueryCriteria;
+import com.dookay.cihai.core.theme.domain.ThemeDomain;
+
+/**
+* 专题
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public class ThemeQuery extends Query {
+
+	@Override
+	public QueryCriteria toCriteria() {
+		QueryCriteria queryCriteria = new QueryCriteria(ThemeDomain.class);
+		Example.Criteria criteria = queryCriteria.createCriteria();
+
+		//todo 写查询逻辑
+		return queryCriteria;
+	}
+	
+}

cihai-core/src/main/java/com/dookay/cihai/core/theme/query/ThemeWordQuery.java

+package com.dookay.cihai.core.theme.query;
+
+import com.dookay.coral.common.core.persistence.Query;
+import tk.mybatis.mapper.entity.Example;
+import com.dookay.coral.common.core.persistence.criteria.QueryCriteria;
+import com.dookay.cihai.core.theme.domain.ThemeWordDomain;
+
+/**
+* 专题词条关系
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public class ThemeWordQuery extends Query {
+
+	@Override
+	public QueryCriteria toCriteria() {
+		QueryCriteria queryCriteria = new QueryCriteria(ThemeWordDomain.class);
+		Example.Criteria criteria = queryCriteria.createCriteria();
+
+		//todo 写查询逻辑
+		return queryCriteria;
+	}
+	
+}

cihai-core/src/main/java/com/dookay/cihai/core/theme/service/IThemeService.java

+package com.dookay.cihai.core.theme.service;
+
+import com.dookay.coral.common.core.service.IBaseService;
+import com.dookay.cihai.core.theme.domain.ThemeDomain;
+
+/**
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public interface IThemeService extends IBaseService<ThemeDomain> {
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/theme/service/IThemeWordService.java

+package com.dookay.cihai.core.theme.service;
+
+import com.dookay.coral.common.core.service.IBaseService;
+import com.dookay.cihai.core.theme.domain.ThemeWordDomain;
+
+/**
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public interface IThemeWordService extends IBaseService<ThemeWordDomain> {
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/theme/service/impl/ThemeServiceImpl.java

+package com.dookay.cihai.core.theme.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.dookay.coral.common.core.service.impl.BaseServiceImpl;
+import com.dookay.cihai.core.theme.mapper.ThemeMapper;
+import com.dookay.cihai.core.theme.domain.ThemeDomain;
+import com.dookay.cihai.core.theme.service.IThemeService;
+
+/**
+*  专题
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@SuppressWarnings("ALL")
+@Service("themeService")
+public class ThemeServiceImpl extends BaseServiceImpl<ThemeDomain> implements IThemeService {
+
+    @Autowired
+	private ThemeMapper themeMapper;
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/theme/service/impl/ThemeWordServiceImpl.java

+package com.dookay.cihai.core.theme.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.dookay.coral.common.core.service.impl.BaseServiceImpl;
+import com.dookay.cihai.core.theme.mapper.ThemeWordMapper;
+import com.dookay.cihai.core.theme.domain.ThemeWordDomain;
+import com.dookay.cihai.core.theme.service.IThemeWordService;
+
+/**
+*  专题词条关系
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@SuppressWarnings("ALL")
+@Service("themeWordService")
+public class ThemeWordServiceImpl extends BaseServiceImpl<ThemeWordDomain> implements IThemeWordService {
+
+    @Autowired
+	private ThemeWordMapper themeWordMapper;
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/word/domain/CustomDictionaryDomain.java

+package com.dookay.cihai.core.word.domain;
+
+import lombok.Data;
+import java.io.Serializable;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+import java.util.List;
+
+/**
+* 自定义字典
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@Data
+@Table(name = "t_custom_dictionary")
+public class CustomDictionaryDomain implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 
+	 */
+    @Id
+	private Long id;
+	
+	/**
+	 * 
+	 */
+	private String word;
+	
+	/**
+	 * 
+	 */
+	private Date createTime;
+	
+	/**
+	 * 
+	 */
+	private Date updateTime;
+	
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/word/domain/WordDomain.java

+package com.dookay.cihai.core.word.domain;
+
+import lombok.Data;
+import java.io.Serializable;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+import java.util.List;
+
+/**
+* 词条
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@Data
+@Table(name = "t_word")
+public class WordDomain implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 
+	 */
+    @Id
+	private Long id;
+	
+	/**
+	 * 
+	 */
+	private String word;
+	
+	/**
+	 * 
+	 */
+	private String body;
+	
+	/**
+	 * 
+	 */
+	private String baikePoster;
+	
+	/**
+	 * 
+	 */
+	private String baikeVoice;
+	
+	/**
+	 * 
+	 */
+	private String baikeDescription;
+	
+	/**
+	 * 
+	 */
+	private String baikeParaphrase;
+	
+	/**
+	 * 
+	 */
+	private String baikePhotos;
+	
+	/**
+	 * 
+	 */
+	private String baikeVideo;
+	
+	/**
+	 * 
+	 */
+	private Date createTime;
+	
+	/**
+	 * 
+	 */
+	private Date updateTime;
+	
+	/**
+	 * 拼音
+	 */
+	private String wordSpell;
+	
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/word/mapper/CustomDictionaryMapper.java

+package com.dookay.cihai.core.word.mapper;
+
+import com.dookay.coral.common.core.persistence.Mapper;
+import com.dookay.cihai.core.word.domain.CustomDictionaryDomain;
+
+/**
+* 自定义字典
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public interface CustomDictionaryMapper extends Mapper<CustomDictionaryDomain> {
+	
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/word/mapper/WordMapper.java

+package com.dookay.cihai.core.word.mapper;
+
+import com.dookay.coral.common.core.persistence.Mapper;
+import com.dookay.cihai.core.word.domain.WordDomain;
+
+/**
+* 词条
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public interface WordMapper extends Mapper<WordDomain> {
+	
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/word/query/CustomDictionaryQuery.java

+package com.dookay.cihai.core.word.query;
+
+import com.dookay.coral.common.core.persistence.Query;
+import tk.mybatis.mapper.entity.Example;
+import com.dookay.coral.common.core.persistence.criteria.QueryCriteria;
+import com.dookay.cihai.core.word.domain.CustomDictionaryDomain;
+
+/**
+* 自定义字典
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public class CustomDictionaryQuery extends Query {
+
+	@Override
+	public QueryCriteria toCriteria() {
+		QueryCriteria queryCriteria = new QueryCriteria(CustomDictionaryDomain.class);
+		Example.Criteria criteria = queryCriteria.createCriteria();
+
+		//todo 写查询逻辑
+		return queryCriteria;
+	}
+	
+}

cihai-core/src/main/java/com/dookay/cihai/core/word/query/WordQuery.java

+package com.dookay.cihai.core.word.query;
+
+import com.dookay.coral.common.core.persistence.Query;
+import tk.mybatis.mapper.entity.Example;
+import com.dookay.coral.common.core.persistence.criteria.QueryCriteria;
+import com.dookay.cihai.core.word.domain.WordDomain;
+
+/**
+* 词条
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public class WordQuery extends Query {
+
+	@Override
+	public QueryCriteria toCriteria() {
+		QueryCriteria queryCriteria = new QueryCriteria(WordDomain.class);
+		Example.Criteria criteria = queryCriteria.createCriteria();
+
+		//todo 写查询逻辑
+		return queryCriteria;
+	}
+	
+}

cihai-core/src/main/java/com/dookay/cihai/core/word/service/ICustomDictionaryService.java

+package com.dookay.cihai.core.word.service;
+
+import com.dookay.coral.common.core.service.IBaseService;
+import com.dookay.cihai.core.word.domain.CustomDictionaryDomain;
+
+/**
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public interface ICustomDictionaryService extends IBaseService<CustomDictionaryDomain> {
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/word/service/IWordService.java

+package com.dookay.cihai.core.word.service;
+
+import com.dookay.coral.common.core.service.IBaseService;
+import com.dookay.cihai.core.word.domain.WordDomain;
+
+/**
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public interface IWordService extends IBaseService<WordDomain> {
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/word/service/impl/CustomDictionaryServiceImpl.java

+package com.dookay.cihai.core.word.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.dookay.coral.common.core.service.impl.BaseServiceImpl;
+import com.dookay.cihai.core.word.mapper.CustomDictionaryMapper;
+import com.dookay.cihai.core.word.domain.CustomDictionaryDomain;
+import com.dookay.cihai.core.word.service.ICustomDictionaryService;
+
+/**
+*  自定义字典
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@SuppressWarnings("ALL")
+@Service("customDictionaryService")
+public class CustomDictionaryServiceImpl extends BaseServiceImpl<CustomDictionaryDomain> implements ICustomDictionaryService {
+
+    @Autowired
+	private CustomDictionaryMapper customDictionaryMapper;
+
+}

cihai-core/src/main/java/com/dookay/cihai/core/word/service/impl/WordServiceImpl.java

+package com.dookay.cihai.core.word.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.dookay.coral.common.core.service.impl.BaseServiceImpl;
+import com.dookay.cihai.core.word.mapper.WordMapper;
+import com.dookay.cihai.core.word.domain.WordDomain;
+import com.dookay.cihai.core.word.service.IWordService;
+
+/**
+*  词条
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@SuppressWarnings("ALL")
+@Service("wordService")
+public class WordServiceImpl extends BaseServiceImpl<WordDomain> implements IWordService {
+
+    @Autowired
+	private WordMapper wordMapper;
+
+}

cihai-core/src/main/resources/mapper/CustomDictionaryMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.dookay.cihai.core.word.mapper.CustomDictionaryMapper" >
+  
+   <!-- 公共查询语句 -->
+   <sql id="selectSql">
+		select 
+		    <trim suffixOverrides="," >
+		    	a.`id` as 'id',
+		    	a.`word` as 'word',
+		    	a.`create_time` as 'createTime',
+		    	a.`update_time` as 'updateTime',
+		    </trim>
+	   	from 
+	    	`t_custom_dictionary` as a
+	</sql>
+
+</mapper>
\ No newline at end of file

cihai-core/src/main/resources/mapper/ThemeMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.dookay.cihai.core.theme.mapper.ThemeMapper" >
+  
+   <!-- 公共查询语句 -->
+   <sql id="selectSql">
+		select 
+		    <trim suffixOverrides="," >
+		    	a.`id` as 'id',
+		    	a.`title` as 'title',
+		    	a.`introduce` as 'introduce',
+		    	a.`basic_info` as 'basicInfo',
+		    	a.`create_time` as 'createTime',
+		    	a.`update_time` as 'updateTime',
+		    	a.`sub_title` as 'subTitle',
+		    </trim>
+	   	from 
+	    	`t_theme` as a
+	</sql>
+
+</mapper>
\ No newline at end of file

cihai-core/src/main/resources/mapper/ThemeWordMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.dookay.cihai.core.theme.mapper.ThemeWordMapper" >
+  
+   <!-- 公共查询语句 -->
+   <sql id="selectSql">
+		select 
+		    <trim suffixOverrides="," >
+		    	a.`id` as 'id',
+		    	a.`word_id` as 'wordId',
+		    	a.`theme_id` as 'themeId',
+		    	a.`create_time` as 'createTime',
+		    </trim>
+	   	from 
+	    	`t_theme_word` as a
+	</sql>
+
+</mapper>
\ No newline at end of file

cihai-core/src/main/resources/mapper/WordMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.dookay.cihai.core.word.mapper.WordMapper" >
+  
+   <!-- 公共查询语句 -->
+   <sql id="selectSql">
+		select 
+		    <trim suffixOverrides="," >
+		    	a.`id` as 'id',
+		    	a.`word` as 'word',
+		    	a.`body` as 'body',
+		    	a.`baike_poster` as 'baikePoster',
+		    	a.`baike_voice` as 'baikeVoice',
+		    	a.`baike_description` as 'baikeDescription',
+		    	a.`baike_paraphrase` as 'baikeParaphrase',
+		    	a.`baike_photos` as 'baikePhotos',
+		    	a.`baike_video` as 'baikeVideo',
+		    	a.`create_time` as 'createTime',
+		    	a.`update_time` as 'updateTime',
+		    	a.`word_spell` as 'wordSpell',
+		    </trim>
+	   	from 
+	    	`t_word` as a
+	</sql>
+
+</mapper>
\ No newline at end of file

serverside/cihai-core/src/main/java/com/dookay/cihai/core/CihaiCoreApplication.java

+package com.dookay.cihai.core;
+
+import com.dookay.coral.common.core.CoralCommonCoreMarker;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author houkun
+ */
+@SpringBootApplication(scanBasePackageClasses = {
+        CoralCommonCoreMarker.class,
+        CiHaiCoreApplication.class
+})
+@MapperScan(basePackageClasses = CiHaiCoreApplication.class)
+public class CiHaiCoreApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(CiHaiCoreApplication.class, args);
+    }
+}

serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/AipWordUtilBean.java

@@ -38,7 +38,6 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -52,8 +51,10 @@ import java.util.stream.Collectors;
 @Slf4j
 public final class AipWordUtilBean {
 
+    private static final String APP_ID = "10486245";
+    private static final String API_KEY = "ws8qdxT51xm2qbWufxzRedI3";
+    private static final String SECRET_KEY = "8b6g9ZyR69dFl6aqYdIOGa4IbOGgkdjh";
 
-    private static final ConcurrentHashMap<String, Double> SCORE_MAP = new ConcurrentHashMap<>();
     private static final String SCORE_KEY_PREFIX = "WORD_SCORE:";
     private static final double CRITICAL_VALUE = 0.4D;
     private static final double RELATE_CRITICAL_VALUE = 0.6D;
@@ -64,14 +65,15 @@ public final class AipWordUtilBean {
     private static final String INTERNAL_ERROR = "282000";
 
     private final AipNlp aipNlp;
-    private final StringRedisTemplate template;
 
     @Autowired
-    public AipWordUtilBean(AipNlp aipNlp, StringRedisTemplate template) {
-        this.aipNlp = aipNlp;
-        this.template = template;
+    private StringRedisTemplate template;
+
+    public AipWordUtilBean() {
+        this.aipNlp = new AipNlp(APP_ID, API_KEY, SECRET_KEY);
     }
 
+
     /**
      * 抽取查询关键词
      *

serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/config/AipConfig.java

-package com.dookay.cihai.core.aip.config;
-
-/*****************************************
- *                                       *
- *  @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.baidu.aip.nlp.AipNlp;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 配置
- *
- * @author houkun
- * @date 2017/12/6
- */
-@Configuration
-public class AipConfig {
-
-    private final AipProperties aipProperties;
-
-    @Autowired
-    public AipConfig(AipProperties aipProperties) {
-        this.aipProperties = aipProperties;
-    }
-
-    @Bean
-    public AipNlp aipNlp() {
-        AipNlp aipNlp = new AipNlp(aipProperties.getAppId(), aipProperties.getApiKey(), aipProperties.getSecretKey());
-        aipNlp.setConnectionTimeoutInMillis(2000);
-        aipNlp.setSocketTimeoutInMillis(60000);
-        return aipNlp;
-    }
-}

serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/config/AipProperties.java

-package com.dookay.cihai.core.aip.config;
-
-/*****************************************
- *                                       *
- *  @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 lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 配置文件
- *
- * @author houkun
- * @date 2017/12/6
- */
-@ConfigurationProperties("aip")
-@Data
-@Component
-public class AipProperties {
-
-    private String appId;
-
-    private String apiKey;
-
-    private String secretKey;
-}

serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/domain/CustomDictionaryDomain.java

+package com.dookay.cihai.core.word.domain;
+
+import lombok.Data;
+import java.io.Serializable;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+import java.util.List;
+
+/**
+* 自定义词条
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@Data
+@Table(name = "t_custom_dictionary")
+public class CustomDictionaryDomain implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 
+	 */
+    @Id
+	private Long id;
+	
+	/**
+	 * 
+	 */
+	private String word;
+	
+	/**
+	 * 
+	 */
+	private Date createTime;
+	
+	/**
+	 * 
+	 */
+	private Date updateTime;
+	
+
+}

serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/domain/WordDomain.java

@@ -80,5 +80,7 @@ public class WordDomain implements Serializable {
 	 */
 	private String wordSpell;
 
+	private String category;
+	
 
 }

serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/mapper/CustomDictionaryMapper.java

+package com.dookay.cihai.core.word.mapper;
+
+import com.dookay.coral.common.core.persistence.Mapper;
+import com.dookay.cihai.core.word.domain.CustomDictionaryDomain;
+
+/**
+* 自定义词条
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public interface CustomDictionaryMapper extends Mapper<CustomDictionaryDomain> {
+	
+
+}

serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/query/CustomDictionaryQuery.java

+package com.dookay.cihai.core.word.query;
+
+import com.dookay.coral.common.core.persistence.Query;
+import lombok.Data;
+import tk.mybatis.mapper.entity.Example;
+import com.dookay.coral.common.core.persistence.criteria.QueryCriteria;
+import com.dookay.cihai.core.word.domain.CustomDictionaryDomain;
+
+/**
+* 自定义词条
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@Data
+public class CustomDictionaryQuery extends Query {
+
+	private String word;
+
+	@Override
+	public QueryCriteria toCriteria() {
+		QueryCriteria queryCriteria = new QueryCriteria(CustomDictionaryDomain.class);
+		Example.Criteria criteria = queryCriteria.createCriteria();
+		if (valid(word)) {
+			criteria.andEqualTo("word");
+		}
+
+		//todo 写查询逻辑
+		return queryCriteria;
+	}
+	
+}

serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/service/ICustomDictionaryService.java

+package com.dookay.cihai.core.word.service;
+
+import com.dookay.coral.common.core.service.IBaseService;
+import com.dookay.cihai.core.word.domain.CustomDictionaryDomain;
+
+/**
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+public interface ICustomDictionaryService extends IBaseService<CustomDictionaryDomain> {
+
+}

serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/service/impl/CustomDictionaryServiceImpl.java

+package com.dookay.cihai.core.word.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.dookay.coral.common.core.service.impl.BaseServiceImpl;
+import com.dookay.cihai.core.word.mapper.CustomDictionaryMapper;
+import com.dookay.cihai.core.word.domain.CustomDictionaryDomain;
+import com.dookay.cihai.core.word.service.ICustomDictionaryService;
+
+/**
+*  自定义词条
+* @author wangwei
+* @since 2017年12月07日
+* @version V1.0
+*/
+@SuppressWarnings("ALL")
+@Service("customDictionaryService")
+public class CustomDictionaryServiceImpl extends BaseServiceImpl<CustomDictionaryDomain> implements ICustomDictionaryService {
+
+    @Autowired
+	private CustomDictionaryMapper customDictionaryMapper;
+
+}

serverside/cihai-core/src/main/resources/generator.xml

@@ -24,6 +24,9 @@
         <property name="smallint" value="Boolean"/>
     </javaTypeResolver>
 
+    <table tableName="t_custom_dictionary" domainObjectName="CustomDictionary"
+           packageName="com.dookay.cihai.core.word" desc="自定义字典" author="wangwei">
+    </table>
     <table tableName="t_word" domainObjectName="Word"
            packageName="com.dookay.cihai.core.word" desc="词条" author="wangwei">
     </table>

serverside/cihai-core/src/main/resources/mapper/CustomDictionaryMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.dookay.cihai.core.word.mapper.CustomDictionaryMapper" >
+  
+   <!-- 公共查询语句 -->
+   <sql id="selectSql">
+		select 
+		    <trim suffixOverrides="," >
+		    	a.`id` as 'id',
+		    	a.`word` as 'word',
+		    	a.`create_time` as 'createTime',
+		    	a.`update_time` as 'updateTime',
+		    </trim>
+	   	from 
+	    	`t_custom_dictionary` as a
+	</sql>
+
+</mapper>
\ No newline at end of file

serverside/cihai-core/src/test/resources/application.properties

@@ -18,10 +18,6 @@ mybatis.mapper-locations=classpath*:mapper/*.xml
 
 spring.redis.host=192.168.2.27
 spring.redis.password=100001
-
-aip.app-id=10486245
-aip.api-key=ws8qdxT51xm2qbWufxzRedI3
-aip.secret-key=8b6g9ZyR69dFl6aqYdIOGa4IbOGgkdjh
 logging.level.com.dookay.cihai.core=debug
 
 

serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/config/WechatSecurityConfig.java

@@ -15,6 +15,7 @@
 package com.dookay.cihai.wechat.config;
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -25,7 +26,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
  * @date 2017/12/7
  */
 @EnableWebSecurity
-@Order
+@Order(Ordered.HIGHEST_PRECEDENCE)
 public class WechatSecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     protected void configure(HttpSecurity http) throws Exception {

serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/HomeController.java

@@ -18,8 +18,8 @@ import com.dookay.cihai.core.aip.AipWordUtilBean;
 import com.dookay.cihai.core.theme.domain.ThemeDomain;
 import com.dookay.cihai.core.theme.query.ThemeQuery;
 import com.dookay.cihai.core.theme.service.IThemeService;
-import com.dookay.cihai.core.word.domain.WordDomain;
-import com.dookay.cihai.core.word.query.WordQuery;
+import com.dookay.cihai.core.word.query.CustomDictionaryQuery;
+import com.dookay.cihai.core.word.service.ICustomDictionaryService;
 import com.dookay.cihai.core.word.service.IWordService;
 import com.dookay.coral.common.web.controller.BaseController;
 import com.dookay.coral.common.web.response.JsonResult;
@@ -43,6 +43,8 @@ public class HomeController extends BaseController {
 
     @Autowired
     private IThemeService themeService;
+    @Autowired
+    private ICustomDictionaryService customDictionaryService;
 
     @Autowired
     private AipWordUtilBean aipWordUtilBean;
@@ -67,16 +69,25 @@ public class HomeController extends BaseController {
     @ResponseBody
     public JsonResult search(String keyword) {
         System.out.println("进入搜索");
+        String result = null;
+        CustomDictionaryQuery query1 = new CustomDictionaryQuery();
+        query1.setWord(keyword);
         try {
-            String result = aipWordUtilBean.extractQueryKeyword(keyword);
+            int count = customDictionaryService.count(query1);
+            if (count > 0) {
+                result = keyword;
+            } else {
+                result = aipWordUtilBean.extractQueryKeyword(keyword);
+            }
             ThemeQuery query = new ThemeQuery();
-            query.setKeyword(keyword);
+            query.setKeyword(result);
             ThemeDomain themeDomain = themeService.getFirst(query);
-            if (themeDomain == null) return errorResult("暂无检索结果");
+            if (themeDomain == null) return errorResult(String.format("暂无\"%s\"检索结果",keyword));
             System.out.println(themeDomain);
             return successResult("success", "/theme/detail/" + themeDomain.getId());
         } catch (Exception ex) {
-            return errorResult("暂无检索结果");
+            return errorResult(String.format("暂无\"%s\"检索结果",keyword));
         }
     }
+
 }

serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/ThemeController.java

@@ -14,16 +14,26 @@
 
 package com.dookay.cihai.wechat.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.dookay.cihai.core.aip.AipWordUtilBean;
+import com.dookay.cihai.core.aip.model.WordRelation;
+import com.dookay.cihai.core.aip.model.WordSequence;
 import com.dookay.cihai.core.theme.domain.ThemeDomain;
 import com.dookay.cihai.core.theme.service.IThemeService;
 import com.dookay.coral.common.web.controller.BaseController;
+import com.dookay.coral.common.web.response.JsonResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * @author 石磊
  * @date 2017/12/6
@@ -34,6 +44,8 @@ public class ThemeController extends BaseController {
 
     @Autowired
     private IThemeService themeService;
+    @Autowired
+    private AipWordUtilBean aipWordUtilBean;
 
     /**
      * @author 石磊
@@ -47,4 +59,39 @@ public class ThemeController extends BaseController {
         mv.addObject("theme", themeDomain);
         return mv;
     }
+
+    /**
+     * 关联词出现次数
+     *
+     * @author houkun
+     * @date 2017/12/7
+     */
+    @RequestMapping(value = "/detail/{id}/related", method = RequestMethod.GET)
+    @ResponseBody
+    public JsonResult related(@PathVariable Long id) {
+        ThemeDomain themeDomain = themeService.get(id);
+        String document = themeDomain.getIntroduce();
+        Map<String, Long> wordCountMap = aipWordUtilBean.extractNounWordsWithCount(document);
+        return successResult("关联词出现次数", wordCountMap);
+    }
+
+    /**
+     * 图谱信息
+     *
+     * @author houkun
+     * @date 2017/12/7
+     */
+    @RequestMapping(value = "/detail/{id}/map", method = RequestMethod.GET)
+    @ResponseBody
+    public JsonResult map(@PathVariable Long id) {
+        ThemeDomain themeDomain = themeService.get(id);
+        String document = themeDomain.getIntroduce();
+        List<String> keywords = aipWordUtilBean.extractKeyWords(themeDomain.getTitle(), document, 15);
+        List<WordSequence> wordSequences = keywords.stream().map(l -> new WordSequence(keywords.indexOf(l), l)).collect(Collectors.toList());
+        List<WordRelation> wordRelations = aipWordUtilBean.generateWordsMap(keywords);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("nodes", wordSequences);
+        jsonObject.put("edges", wordRelations);
+        return successResult("success", jsonObject);
+    }
 }

serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/WordController.java

+/*****************************************
+ *                                       *
+ *  @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  *
+ *  ----------- -----------------------  *
+ *  NO BUG ENJOY LIFE                    *
+ *                                       *
+ ****************************************/
+
+package com.dookay.cihai.wechat.controller;
+
+import com.dookay.cihai.core.word.domain.WordDomain;
+import com.dookay.cihai.core.word.service.IWordService;
+import com.dookay.coral.common.web.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * @author 石磊
+ * @date 2017/12/7
+ */
+@Controller
+@RequestMapping("/word")
+public class WordController extends BaseController {
+
+    @Autowired
+    private IWordService wordService;
+
+    /**
+     * @author 石磊
+     * @date 2017/12/7
+     * @description 详情
+     */
+    @RequestMapping(value = "/detail/{id}", method = RequestMethod.GET)
+    public ModelAndView detail(@PathVariable Long id) {
+        WordDomain wordDomain = wordService.get(id);
+        ModelAndView mv = new ModelAndView("/portal/word/detail");
+        mv.addObject("word", wordDomain);
+        return mv;
+    }
+
+    /**
+     * @author 石磊
+     * @date 2017/12/7
+     * @description 百科页面
+     */
+    @RequestMapping(value = "/baike/{id}", method = RequestMethod.GET)
+    public ModelAndView baike(@PathVariable Long id) {
+        WordDomain wordDomain = wordService.get(id);
+        ModelAndView mv = new ModelAndView("/portal/word/baike");
+        mv.addObject("word", wordDomain);
+        return mv;
+    }
+
+}

serverside/cihai-wechat/src/main/resources/application-dev.properties

@@ -11,7 +11,7 @@ logging.level.root=info
 logging.level.com.dookay.core=trace
 # redis
 spring.redis.host=192.168.2.27
-spring.redis.password=lyd123456
+spring.redis.password=100001
 # 文件存储
 coral.web.resource.mapping.uploads-inner=/uploads/*
 coral.web.resource.mapping.uploads-mapping=/data/www/uploads/cihai
@@ -28,7 +28,3 @@ coral.wechat.WechatConfig.encodingAESKey=agkC7tsPUoOtbbUyxxcCLVJZVqVOCTeJgxUCXAx
 # 是否加密
 coral.wechat.WechatConfig.messageEncrypt=false
 # 微信授权回调地址
-
-aip.app-id=10486245
-aip.api-key=ws8qdxT51xm2qbWufxzRedI3
-aip.secret-key=8b6g9ZyR69dFl6aqYdIOGa4IbOGgkdjh
\ No newline at end of file

serverside/cihai-wechat/src/main/resources/application.properties

@@ -30,4 +30,3 @@ coral.web.view.error.internal-error=500
 coral.web.view.error.service=service
 coral.web.view.error.other=other
 
-

serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/include/footer.jsp

@@ -4,10 +4,10 @@
 <%--添加此行消除额外空格--%>
 <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
 <script src="${ctx}/static/js/vendor.js"></script>
-<script src="${ctx}/static/js/routes.js"></script>
-<script src="${ctx}/static/js/index.js"></script>
 <script src="${ctx}/static/js/backend.js"></script>
 <script src="${ctx}/static/js/layer/layer.js"></script>
+<script src="${ctx}/static/js/main.js"></script>
+
 <script>
     $(function () {
         backEndApp.init()

serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/include/header.jsp

@@ -15,3 +15,13 @@
     <link rel="stylesheet" href="${ctx}/static/css/vendor.css">
 </head>
 <body>
+<div class="loading" id="loading">
+    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="64px" height="64px" viewBox="0 0 128 128" xml:space="preserve">
+            <g>
+                <path d="M78.75 16.18V1.56a64.1 64.1 0 0 1 47.7 47.7H111.8a49.98 49.98 0 0 0-33.07-33.08zM16.43 49.25H1.8a64.1 64.1 0 0 1 47.7-47.7V16.2a49.98 49.98 0 0 0-33.07 33.07zm33.07 62.32v14.62A64.1 64.1 0 0 1 1.8 78.5h14.63a49.98 49.98 0 0 0 33.07 33.07zm62.32-33.07h14.62a64.1 64.1 0 0 1-47.7 47.7v-14.63a49.98 49.98 0 0 0 33.08-33.07z"
+                      fill="#494949" fill-opacity="1" />
+                <animateTransform attributeName="transform" type="rotate" from="0 64 64" to="-90 64 64" dur="400ms" repeatCount="indefinite"></animateTransform>
+            </g>
+        </svg>
+</div>
\ No newline at end of file

serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/home/index.jsp

@@ -4,16 +4,7 @@
 <jsp:include page="/WEB-INF/jsp/include/header.jsp">
     <jsp:param name="pageTitle" value="首页"/>
 </jsp:include>
-<div class="loading" id="loading">
-    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="64px" height="64px" viewBox="0 0 128 128" xml:space="preserve">
-            <g>
-                <path d="M78.75 16.18V1.56a64.1 64.1 0 0 1 47.7 47.7H111.8a49.98 49.98 0 0 0-33.07-33.08zM16.43 49.25H1.8a64.1 64.1 0 0 1 47.7-47.7V16.2a49.98 49.98 0 0 0-33.07 33.07zm33.07 62.32v14.62A64.1 64.1 0 0 1 1.8 78.5h14.63a49.98 49.98 0 0 0 33.07 33.07zm62.32-33.07h14.62a64.1 64.1 0 0 1-47.7 47.7v-14.63a49.98 49.98 0 0 0 33.08-33.07z"
-                      fill="#494949" fill-opacity="1" />
-                <animateTransform attributeName="transform" type="rotate" from="0 64 64" to="-90 64 64" dur="400ms" repeatCount="indefinite"></animateTransform>
-            </g>
-        </svg>
-</div>
+
 <div id="app">
     <div class="statusbar"></div>
     <div class="view view-main view-init ios-edges" data-url="/">
@@ -54,3 +45,75 @@
 <script src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
 <script src="/wechat/jsConfig"></script>
 <jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
+<script>
+    $('.search-area-voice').on('click', function () {
+        wx.startRecord();
+        myApp.dialog.create({
+            title: '正在录音...',
+            buttons: [
+                {
+                    text: '完成',
+                    onClick: function () {
+                        wx.stopRecord({
+                            success: function (res) {
+                                myApp.dialog.preloader();
+
+                                var localId = res.localId;
+                                wx.translateVoice({
+                                    localId: localId, // 需要识别的音频的本地Id，由录音相关接口获得
+                                    isShowProgressTips: 0, // 默认为1，显示进度提示
+                                    success: function (res) {
+                                        jQuery.get("/home/search", {keyword: res.translateResult}, function (data) {
+                                            myApp.dialog.close();
+                                            if (data.code == "OK") {
+                                                // myApp.view.main.router.load({
+                                                //     url:data.data
+                                                // });
+                                                location.href = data.data;
+                                            } else {
+                                                myApp.dialog.alert(data.message);
+                                                $('.j_search_input').val(res.translateResult);
+                                            }
+                                        })
+
+                                    }
+
+                                });
+                            }
+
+                        });
+
+                    }
+                }
+            ]
+        }).open();
+    });
+    $('.search-area-image').on('click', function () {
+        wx.chooseImage({
+
+            count: 1, // 默认9
+
+            sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
+
+            sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+
+            success: function (res) {
+
+                var localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
+                wx.getLocalImgData({
+
+                    localId: localIds[0], // 图片的localID
+
+                    success: function (res) {
+
+                        var localData = res.localData; // localData是图片的base64数据，可以用img标签显示
+                        alert(localData);
+                    }
+
+                });
+            }
+
+        });
+    })
+
+</script>
\ No newline at end of file

serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/theme/detail.jsp

@@ -4,10 +4,21 @@
 <jsp:include page="/WEB-INF/jsp/include/header.jsp">
     <jsp:param name="pageTitle" value="首页"/>
 </jsp:include>
+
 <div id="app">
     <div class="statusbar"></div>
     <div class="view view-main view-init ios-edges" data-url="/">
         <div class="page">
+            <div class="navbar">
+                <div class="navbar-inner">
+                    <div class="left">
+                        <a class="link back js-jump-page" href="/">
+                            <i class="iconfont icon-jiantou"></i>
+                            <span class="ios-only">返回</span>
+                        </a>
+                    </div>
+                </div>
+            </div>
             <div class="page-content special-content">
                 <!--专题简介-->
                 <div class="intro-box">
@@ -26,15 +37,20 @@
                         </div>
                         <h5 class="sub-title">基本信息</h5>
                         <div class="basic-msg">
-                            <b>中文名称：</b>中国共产党第十九次全国代表大会</div>
+                            <b>中文名称：</b>中国共产党第十九次全国代表大会
+                        </div>
                         <div class="basic-msg">
-                            <b>会议简称：</b>党的十九大</div>
+                            <b>会议简称：</b>党的十九大
+                        </div>
                         <div class="basic-msg">
-                            <b>会议时间：</b>2017年10月18日-24日</div>
+                            <b>会议时间：</b>2017年10月18日-24日
+                        </div>
                         <div class="basic-msg">
-                            <b>会议地点：</b>北京</div>
+                            <b>会议地点：</b>北京
+                        </div>
                         <div class="basic-msg">
-                            <b>代表人数：</b>2287（确认2280名代表资格有效）</div>
+                            <b>代表人数：</b>2287（确认2280名代表资格有效）
+                        </div>
                     </div>
                 </div>
                 <!--相关词条-->
@@ -211,8 +227,13 @@
                             <img src="${ctx}/static/images/special-tip.png">
                         </div>
                         <div class="title">十九大图谱</div>
+                        <div class="special-title-tools">
+                            <a class="js-enable-drag" href="#" data-target="#relation-pic">
+                                <span class="icon icon-drag"></span>
+                            </a>
                         </div>
-                    <div id="mynetwork"></div>
+                    </div>
+                    <div id="relation-pic"></div>
                 </div>
                 <!--词云解析-->
                 <div class="word-analysis">
@@ -221,10 +242,16 @@
                             <img src="${ctx}/static/images/special-tip.png">
                         </div>
                         <div class="title">词云解析</div>
+                        <div class="special-title-tools">
+                            <a class="js-refresh" href="#" data-target="#word-analysis">
+                                <i class="iconfont icon-huanyipi"></i>
+                            </a>
+                            <a class="js-enable-drag" href="#" data-target="#word-analysis">
+                                <span class="icon icon-drag"></span>
+                            </a>
                         </div>
-                    <div class="inner">
-                        <img src="${ctx}/static/images/special-pic-07.png">
                     </div>
+                    <div id="word-analysis"></div>
                 </div>
                 <!--相关新闻-->
                 <div class="about-news">
@@ -255,7 +282,6 @@
                         </div>
                         <div class="card-footer">中国共产党第十九次全国代表大会，中国特色社会主义进入新时代的关键时期召开的一次十分重要的大会。</div>
                     </div>
-                    <div class="more-btn">加载更多</div>
                 </div>
                 <!--图说十九大-->
                 <div class="pic-show">
@@ -310,12 +336,79 @@
     </div>
 </div>
 <jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
-<script src="${ctx}/static/js/swiper.min.js"></script>
-<script src="${ctx}/static/js/vis.js"></script>
+
 <script src="${ctx}/static/js/special.js"></script>
 <script>
-    $(function () {
-
+    function relationPic(id, data) {
+        return new vis.Network(document.getElementById(id), relationPicData, {
+            nodes: {
+                shape: 'dot',
+                borderWidth: 3,
+                color: {
+                    border: '#c6c6c6',
+                    background: '#adadad',
+                    highlight: {
+                        border: '#187bb2',
+                        background: '#187bb2'
+                    }
+                },
+                font: {
+                    color: '#333'
+                }
+            }
+        });
+    };
+    var relationPicData = {
+        nodes: [{
+            id: 1,
+            label: 'Node 1',
+            value: 15
+        },
+            {
+                id: 2,
+                label: 'Node 2',
+                value: 25
+            },
+            {
+                id: 3,
+                label: 'Node 3',
+                value: 50
+            },
+            {
+                id: 4,
+                label: 'Node 4',
+                value: 30
+            },
+            {
+                id: 5,
+                label: 'Node 5',
+                value: 8
+            }
+        ],
+        edges: [{
+            from: 1,
+            to: 3
+        },
+            {
+                from: 1,
+                to: 2
+            },
+            {
+                from: 2,
+                to: 4
+            },
+            {
+                from: 2,
+                to: 5
+            }
+        ]
+    };
+    relationPic('relation-pic', relationPicData);
+    relationPicData.edges = [];
+    var wordAnalysis = relationPic('word-analysis', relationPicData);
 
-    })
+    $('.js-refresh').click(function () {
+        wordAnalysis.destroy();
+        wordAnalysis = relationPic('word-analysis', relationPicData);
+    });
 </script>

serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/word/baike.jsp

+<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:useBean id="word" scope="request"
+             type="com.dookay.cihai.core.word.domain.WordDomain"/>
+<jsp:include page="/WEB-INF/jsp/include/header.jsp">
+    <jsp:param name="pageTitle" value="首页"/>
+</jsp:include>
+<div id="app">
+    <div class="statusbar"></div>
+    <div class="panel panel-right panel-cover panel-nav">
+        <div class="page navbar-fixed page-side-nav">
+            <div class="navbar">
+                <div class="navbar-inner">
+                    <div class="center" style="left:0">“${word.word}”在其他百科辞典的解释</div>
+                </div>
+            </div>
+            <div class="page-content">
+                <div class="page-side">
+                    <div class="list-block accordion-list">
+                        <ul>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">辞海</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">中国人名大词典（历史人物卷）</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">历代名人并称辞典</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">哲学大辞典（修订本）</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">中国哲学大辞典</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">中国历史大辞典（全六卷）</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">世界近代史词典</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">东南亚历史词典</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">中国文学大辞典（修订本）</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="view view-main view-init ios-edges" data-url="/">
+        <div class="page page-word-wiki">
+            <div class="navbar">
+                <div class="navbar-inner navbar-word-wiki">
+                    <div class="left">
+                        <a class="link back js-jump-page" href="/">
+                            <i class="iconfont icon-jiantou"></i>
+                            <span class="ios-only">返回</span>
+                        </a>
+                    </div>
+                    <div class="right word-navbar-btn">
+                        <a class="panel-open" href="#" data-panel="right">
+                            <span class="icon icon-book"></span>
+                        </a>
+                        <a href="/word-wiki/">
+                            <i class="iconfont icon-qiyeguanxitupu"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <div class="toolbar">
+                <div class="toolbar-cover">
+                    <a class="link-btn" href="#">
+                        <i class="iconfont icon-xin"></i>
+                        <span>116</span>
+                    </a>
+                    <a class="link-btn" href="#">
+                        <i class="iconfont icon-fenxiang"></i>
+                        <span>58</span>
+                    </a>
+                    <a class="link-btn" href="#">
+                        <i class="iconfont icon-pinglun" style="top:1px"></i>
+                        <span>79</span>
+                    </a>
+                    <div class="word-read">
+                        <h1>${word.word}</h1>
+                        <a class="link-voice" href="#">
+                            <i class="iconfont icon-shengyin"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <div class="page-content">
+                <div class="word-slide">
+                    <div class="swiper-container">
+                        <div class="swiper-wrapper">
+                            <div class="swiper-slide">
+                                <img src="${word.baikePoster}">
+                            </div>
+                        </div>
+                        <div class="swiper-pagination"></div>
+                    </div>
+                    <div class="single-word">
+                        <div class="word-body">
+                            <div class="word-title">
+                                <a class="word-title-pager prev js-jump-page" href="/word/detail/${word.id}">语词
+                                    <span class="icon icon-word-prev"></span>
+                                </a>
+                                <h1 class="word-title-inner">${word.word}</h1>
+                                <a class="word-title-pager next active">百科
+                                    <span class="icon icon-word-next"></span>
+                                </a>
+                            </div>
+                        </div>
+                        <div class="word-footer">
+                            <div class="words-main">
+                                    <span>【${word.wordSpell}】
+                                        <a class="link" href="#">
+                                            <i class="iconfont icon-shengyin"></i>
+                                        </a>
+                                    </span>
+                            </div>
+                            <div class="word-detail">${word.category}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="word-cover-page">
+                    <div class="word-card">
+                        ${word.baikeDescription}
+                    </div>
+                </div>
+                <div class="word-tab-cover">
+                    <div class="word-tab js-word-tab">
+                        <ul>
+                            <li class="active">
+                                <a href="#">基本释义</a>
+                            </li>
+                            <li>
+                                <a href="#">图册
+                                    <span>(125)</span>
+                                </a>
+                            </li>
+                            <li>
+                                <a href="#">视频
+                                    <span>(3)</span>
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="tab-con js-tab-con">
+                        <div class="tab-panel active" id="tab01">
+                            <%--<div class="tip-box">--%>
+                                <%--<span> 这段话可设置舒适的文字大小。</span>--%>
+                                <%--<div class="tip-operation">--%>
+                                    <%--<a class="large-btn" href="#">大</a>--%>
+                                    <%--<a class="normal-btn" href="#">选中</a>--%>
+                                    <%--<a class="small-btn" href="#">小</a>--%>
+                                <%--</div>--%>
+                            <%--</div>--%>
+                            <div class="article">${word.baikeParaphrase}</div>
+                        </div>
+
+                    </div>
+                </div>
+                <div class="word-tab-cover">
+                    <div class="word-tab">
+                        <ul>
+                            <li class="active">
+                                <a href="#">历版</a>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="list accordion-list inset">
+                        <ul>
+                            <li class="accordion-item">
+                                <a class="item-link item-content" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">辞海&nbsp;&nbsp;第五版-2002年版典藏本</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="list list-word-evolution">
+                                        <div class="block">
+                                            <ol class="list-paddingleft-2">
+                                                <li data-num="1.">
+                                                    <p>
+                                                        <strong>象牙的省称。</strong>
+                                                    </p>
+                                                    <p>《礼记·玉藻》:“笏,天子以球玉,诸侯以象。”</p>
+                                                </li>
+                                                <li data-num="2.">
+                                                    <p>
+                                                        <strong>形状。</strong>
+                                                    </p>
+                                                    <p>《书·说命上》:“乃审厥象。”孔传:“审所梦之人,刻其形象。”</p>
+                                                </li>
+                                                <li data-num="3.">
+                                                    <p>
+                                                        <strong>模拟。</strong>
+                                                    </p>
+                                                    <p>如:象声;象形。</p>
+                                                </li>
+                                                <li data-num="4.">
+                                                    <p>
+                                                        <strong>现象；表现。</strong>
+                                                    </p>
+                                                    <p>《管子·七法》:“论材审用,不知象不可。”意谓只有审察一个人的表现,才能恰当地使用人材。</p>
+                                                </li>
+                                                <li data-num="5.">
+                                                    <p>
+                                                        <strong>象征。</strong>
+                                                    </p>
+                                                    <p>《周易》用卦、爻等符号象征自然变化和人事休咎。《易·系辞下》:“是故《易》者象也,象也者像也。”孔颖达疏:“谓卦为万物象者,法像万物,犹若乾卦之象法像于天也。”</p>
+                                                </li>
+                                                <li data-num="6.">
+                                                    <p>
+                                                        <strong>想象。</strong>
+                                                    </p>
+                                                    <p>《韩非子·解老》:“故诸人之所以意想者,皆谓之象也。”</p>
+                                                </li>
+                                            </ol>
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="list accordion-list inset">
+                        <ul>
+                            <li class="accordion-item">
+                                <a class="item-link item-content" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">辞海&nbsp;&nbsp;第四版-1995年版典藏本</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="list list-word-evolution">
+                                        <div class="block">
+                                            <ol class="list-paddingleft-2">
+                                                <li data-num="1.">
+                                                    <p>
+                                                        <strong>象牙的省称。</strong>
+                                                    </p>
+                                                    <p>《礼记·玉藻》:“笏,天子以球玉,诸侯以象。”</p>
+                                                </li>
+                                                <li data-num="2.">
+                                                    <p>
+                                                        <strong>形状。</strong>
+                                                    </p>
+                                                    <p>《书·说命上》:“乃审厥象。”孔传:“审所梦之人,刻其形象。”</p>
+                                                </li>
+                                                <li data-num="3.">
+                                                    <p>
+                                                        <strong>模拟。</strong>
+                                                    </p>
+                                                    <p>如:象声;象形。</p>
+                                                </li>
+                                                <li data-num="4.">
+                                                    <p>
+                                                        <strong>现象；表现。</strong>
+                                                    </p>
+                                                    <p>《管子·七法》:“论材审用,不知象不可。”意谓只有审察一个人的表现,才能恰当地使用人材。</p>
+                                                </li>
+                                                <li data-num="5.">
+                                                    <p>
+                                                        <strong>象征。</strong>
+                                                    </p>
+                                                    <p>《周易》用卦、爻等符号象征自然变化和人事休咎。《易·系辞下》:“是故《易》者象也,象也者像也。”孔颖达疏:“谓卦为万物象者,法像万物,犹若乾卦之象法像于天也。”</p>
+                                                </li>
+                                                <li data-num="6.">
+                                                    <p>
+                                                        <strong>想象。</strong>
+                                                    </p>
+                                                    <p>《韩非子·解老》:“故诸人之所以意想者,皆谓之象也。”</p>
+                                                </li>
+                                            </ol>
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="list accordion-list inset">
+                        <ul>
+                            <li class="accordion-item">
+                                <a class="item-link item-content" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">辞海&nbsp;&nbsp;第三版-1987年版典藏本</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="list list-word-evolution">
+                                        <div class="block">
+                                            <ol class="list-paddingleft-2">
+                                                <li data-num="1.">
+                                                    <p>
+                                                        <strong>象牙的省称。</strong>
+                                                    </p>
+                                                    <p>《礼记·玉藻》:“笏,天子以球玉,诸侯以象。”</p>
+                                                </li>
+                                                <li data-num="2.">
+                                                    <p>
+                                                        <strong>形状。</strong>
+                                                    </p>
+                                                    <p>《书·说命上》:“乃审厥象。”孔传:“审所梦之人,刻其形象。”</p>
+                                                </li>
+                                                <li data-num="3.">
+                                                    <p>
+                                                        <strong>模拟。</strong>
+                                                    </p>
+                                                    <p>如:象声;象形。</p>
+                                                </li>
+                                                <li data-num="4.">
+                                                    <p>
+                                                        <strong>现象；表现。</strong>
+                                                    </p>
+                                                    <p>《管子·七法》:“论材审用,不知象不可。”意谓只有审察一个人的表现,才能恰当地使用人材。</p>
+                                                </li>
+                                                <li data-num="5.">
+                                                    <p>
+                                                        <strong>象征。</strong>
+                                                    </p>
+                                                    <p>《周易》用卦、爻等符号象征自然变化和人事休咎。《易·系辞下》:“是故《易》者象也,象也者像也。”孔颖达疏:“谓卦为万物象者,法像万物,犹若乾卦之象法像于天也。”</p>
+                                                </li>
+                                                <li data-num="6.">
+                                                    <p>
+                                                        <strong>想象。</strong>
+                                                    </p>
+                                                    <p>《韩非子·解老》:“故诸人之所以意想者,皆谓之象也。”</p>
+                                                </li>
+                                            </ol>
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="list accordion-list inset">
+                        <ul>
+                            <li class="accordion-item">
+                                <a class="item-link item-content" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">辞海&nbsp;&nbsp;第二版-1980年版典藏本</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="list list-word-evolution">
+                                        <div class="block">
+                                            <ol class="list-paddingleft-2">
+                                                <li data-num="1.">
+                                                    <p>
+                                                        <strong>象牙的省称。</strong>
+                                                    </p>
+                                                    <p>《礼记·玉藻》:“笏,天子以球玉,诸侯以象。”</p>
+                                                </li>
+                                                <li data-num="2.">
+                                                    <p>
+                                                        <strong>形状。</strong>
+                                                    </p>
+                                                    <p>《书·说命上》:“乃审厥象。”孔传:“审所梦之人,刻其形象。”</p>
+                                                </li>
+                                                <li data-num="3.">
+                                                    <p>
+                                                        <strong>模拟。</strong>
+                                                    </p>
+                                                    <p>如:象声;象形。</p>
+                                                </li>
+                                                <li data-num="4.">
+                                                    <p>
+                                                        <strong>现象；表现。</strong>
+                                                    </p>
+                                                    <p>《管子·七法》:“论材审用,不知象不可。”意谓只有审察一个人的表现,才能恰当地使用人材。</p>
+                                                </li>
+                                                <li data-num="5.">
+                                                    <p>
+                                                        <strong>象征。</strong>
+                                                    </p>
+                                                    <p>《周易》用卦、爻等符号象征自然变化和人事休咎。《易·系辞下》:“是故《易》者象也,象也者像也。”孔颖达疏:“谓卦为万物象者,法像万物,犹若乾卦之象法像于天也。”</p>
+                                                </li>
+                                                <li data-num="6.">
+                                                    <p>
+                                                        <strong>想象。</strong>
+                                                    </p>
+                                                    <p>《韩非子·解老》:“故诸人之所以意想者,皆谓之象也。”</p>
+                                                </li>
+                                            </ol>
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="list accordion-list inset">
+                        <ul>
+                            <li class="accordion-item">
+                                <a class="item-link item-content" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">辞海&nbsp;&nbsp;第一版-1976年版典藏本</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="list list-word-evolution">
+                                        <div class="block">
+                                            <ol class="list-paddingleft-2">
+                                                <li data-num="1.">
+                                                    <p>
+                                                        <strong>象牙的省称。</strong>
+                                                    </p>
+                                                    <p>《礼记·玉藻》:“笏,天子以球玉,诸侯以象。”</p>
+                                                </li>
+                                                <li data-num="2.">
+                                                    <p>
+                                                        <strong>形状。</strong>
+                                                    </p>
+                                                    <p>《书·说命上》:“乃审厥象。”孔传:“审所梦之人,刻其形象。”</p>
+                                                </li>
+                                                <li data-num="3.">
+                                                    <p>
+                                                        <strong>模拟。</strong>
+                                                    </p>
+                                                    <p>如:象声;象形。</p>
+                                                </li>
+                                                <li data-num="4.">
+                                                    <p>
+                                                        <strong>现象；表现。</strong>
+                                                    </p>
+                                                    <p>《管子·七法》:“论材审用,不知象不可。”意谓只有审察一个人的表现,才能恰当地使用人材。</p>
+                                                </li>
+                                                <li data-num="5.">
+                                                    <p>
+                                                        <strong>象征。</strong>
+                                                    </p>
+                                                    <p>《周易》用卦、爻等符号象征自然变化和人事休咎。《易·系辞下》:“是故《易》者象也,象也者像也。”孔颖达疏:“谓卦为万物象者,法像万物,犹若乾卦之象法像于天也。”</p>
+                                                </li>
+                                                <li data-num="6.">
+                                                    <p>
+                                                        <strong>想象。</strong>
+                                                    </p>
+                                                    <p>《韩非子·解老》:“故诸人之所以意想者,皆谓之象也。”</p>
+                                                </li>
+                                            </ol>
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="card card-accordion card-accordion-spe">
+                    <div class="card-content">
+                        <div class="card-content-inner">
+                            <span>标签：</span>
+                            <a href="">动物</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="tip-pic">
+                    <img src="${ctx}/static/images/cihai-tip.png">
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
+<script>
+    $(function () {
+
+
+    })
+</script>
\ No newline at end of file

serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/word/detail.jsp

+<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:useBean id="word" scope="request"
+             type="com.dookay.cihai.core.word.domain.WordDomain"/>
+<jsp:include page="/WEB-INF/jsp/include/header.jsp">
+    <jsp:param name="pageTitle" value="首页"/>
+</jsp:include>
+<div id="app">
+    <div class="statusbar"></div>
+    <div class="panel panel-right panel-cover panel-nav">
+        <div class="page navbar-fixed page-side-nav">
+            <div class="navbar">
+                <div class="navbar-inner">
+                    <div class="center" style="left:0">“${word.word}”在其他百科辞典的解释</div>
+                </div>
+            </div>
+            <div class="page-content">
+                <div class="page-side">
+                    <div class="list-block accordion-list">
+                        <ul>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">辞海</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">中国人名大词典（历史人物卷）</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">历代名人并称辞典</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">哲学大辞典（修订本）</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">中国哲学大辞典</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">中国历史大辞典（全六卷）</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">世界近代史词典</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">东南亚历史词典</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="accordion-item">
+                                <a class="item-content item-link" href="#">
+                                    <div class="item-inner">
+                                        <div class="item-title">中国文学大辞典（修订本）</div>
+                                    </div>
+                                </a>
+                                <div class="accordion-item-content">
+                                    <div class="content-block">
+                                        <p>
+                                            <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                        </p>
+                                        <p>
+                                            <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="view view-main view-init ios-edges" data-url="/">
+        <div class="page">
+            <div class="navbar">
+                <div class="navbar-inner">
+                    <div class="left">
+                        <a class="link back" href="/">
+                            <i class="iconfont icon-jiantou"></i>
+                            <span class="ios-only">返回</span>
+                        </a>
+                    </div>
+                    <div class="right word-navbar-btn">
+                        <a class="panel-open" href="#" data-panel="right">
+                            <span class="icon icon-book"></span>
+                        </a>
+                        <a href="/word/baike/${word.id}">
+                            <i class="iconfont icon-qiyeguanxitupu"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <div class="toolbar">
+                <div class="toolbar-cover">
+                    <a class="link-btn" href="#">
+                        <i class="iconfont icon-xin"></i>
+                        <span>116</span>
+                    </a>
+                    <a class="link-btn" href="#">
+                        <i class="iconfont icon-fenxiang"></i>
+                        <span>58</span>
+                    </a>
+                    <a class="link-btn" href="#">
+                        <i class="iconfont icon-pinglun" style="top:1px"></i>
+                        <span>79</span>
+                    </a>
+                    <div class="word-read">
+                        <h1>${word.word}</h1>
+                        <a class="link-voice" href="#">
+                            <i class="iconfont icon-shengyin"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <div class="page-content">
+                <div class="word-title">
+                    <a class="word-title-pager prev active">语词
+                        <span class="icon icon-word-prev"></span>
+                    </a>
+                    <h1 class="word-title-inner bg-farmland">${word.word}</h1>
+                    <a class="word-title-pager next js-jump-page" href="/word/baike/${word.id}">百科
+                        <span class="icon icon-word-next"></span>
+                    </a>
+                </div>
+                ${word.body}
+                <div class="list accordion-list inset">
+                    <ul>
+                        <li class="accordion-item">
+                            <a class="item-link item-content" href="#">
+                                <div class="item-inner">
+                                    <div class="item-title">相关组词</div>
+                                </div>
+                            </a>
+                            <div class="accordion-item-content">
+                                <div class="list list-word-evolution">
+                                    <div class="block">
+                                        <ol class="list-paddingleft-2 words-group">
+                                            <li>
+                                                <p>
+                                                    <strong>小象</strong>
+                                                </p>
+                                            </li>
+                                            <li>
+                                                <p>
+                                                    <strong>大象</strong>
+                                                </p>
+                                            </li>
+                                            <li>
+                                                <p>
+                                                    <strong>气象</strong>
+                                                </p>
+                                            </li>
+                                            <li>
+                                                <p>
+                                                    <strong>想象</strong>
+                                                </p>
+                                            </li>
+                                            <li>
+                                                <p>
+                                                    <strong>印象</strong>
+                                                </p>
+                                            </li>
+                                            <li>
+                                                <p>
+                                                    <strong>象棋</strong>
+                                                </p>
+                                            </li>
+                                            <li>
+                                                <p>
+                                                    <strong>迹象</strong>
+                                                </p>
+                                            </li>
+                                            <li>
+                                                <p>
+                                                    <strong>抽象</strong>
+                                                </p>
+                                            </li>
+                                            <li>
+                                                <p>
+                                                    <strong>星象</strong>
+                                                </p>
+                                            </li>
+                                        </ol>
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="card card-accordion card-accordion-spe">
+                    <div class="card-content">
+                        <div class="card-content-inner">
+                            <span>标签：</span>
+                            <a href="">语词</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="tip-pic">
+                    <img src="${ctx}/static/images/cihai-tip.png">
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
+<script>
+    $(function () {
+
+
+    })
+</script>
\ No newline at end of file

serverside/cihai-wechat/src/main/webapp/static/2-1字语词义.html

@@ -9,6 +9,16 @@
     <link rel="stylesheet" href="css/vendor.css">
 </head>
 <body>
+    <div class="loading" id="loading">
+        <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+        <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="64px" height="64px" viewBox="0 0 128 128" xml:space="preserve">
+            <g>
+                <path d="M78.75 16.18V1.56a64.1 64.1 0 0 1 47.7 47.7H111.8a49.98 49.98 0 0 0-33.07-33.08zM16.43 49.25H1.8a64.1 64.1 0 0 1 47.7-47.7V16.2a49.98 49.98 0 0 0-33.07 33.07zm33.07 62.32v14.62A64.1 64.1 0 0 1 1.8 78.5h14.63a49.98 49.98 0 0 0 33.07 33.07zm62.32-33.07h14.62a64.1 64.1 0 0 1-47.7 47.7v-14.63a49.98 49.98 0 0 0 33.08-33.07z"
+                    fill="#494949" fill-opacity="1" />
+                <animateTransform attributeName="transform" type="rotate" from="0 64 64" to="-90 64 64" dur="400ms" repeatCount="indefinite"></animateTransform>
+            </g>
+        </svg>
+    </div>
     <div id="app">
         <div class="statusbar"></div>
         <div class="panel panel-right panel-cover panel-nav">
@@ -550,7 +560,6 @@
         </div>
     </div>
     <script src="js/vendor.js"></script>
-    <script src="js/routes.js"></script>
-    <script src="js/word.js"></script>
+    <script src="js/main.js"></script>
 </body>
 </html>
\ No newline at end of file

serverside/cihai-wechat/src/main/webapp/static/2-2字百科义.html

@@ -9,6 +9,16 @@
     <link rel="stylesheet" href="css/vendor.css">
 </head>
 <body>
+    <div class="loading" id="loading">
+        <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+        <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="64px" height="64px" viewBox="0 0 128 128" xml:space="preserve">
+            <g>
+                <path d="M78.75 16.18V1.56a64.1 64.1 0 0 1 47.7 47.7H111.8a49.98 49.98 0 0 0-33.07-33.08zM16.43 49.25H1.8a64.1 64.1 0 0 1 47.7-47.7V16.2a49.98 49.98 0 0 0-33.07 33.07zm33.07 62.32v14.62A64.1 64.1 0 0 1 1.8 78.5h14.63a49.98 49.98 0 0 0 33.07 33.07zm62.32-33.07h14.62a64.1 64.1 0 0 1-47.7 47.7v-14.63a49.98 49.98 0 0 0 33.08-33.07z"
+                    fill="#494949" fill-opacity="1" />
+                <animateTransform attributeName="transform" type="rotate" from="0 64 64" to="-90 64 64" dur="400ms" repeatCount="indefinite"></animateTransform>
+            </g>
+        </svg>
+    </div>
     <div id="app">
         <div class="statusbar"></div>
         <div class="panel panel-right panel-cover panel-nav">
@@ -290,13 +300,25 @@
             </div>
         </div>
         <div class="view view-main view-init ios-edges" data-url="/">
-            <div class="page">
-                <!--.navbar-->
-                <!--    .navbar-inner-->
-                <!--        .left-->
-                <!--            a.link.back(href='/')-->
-                <!--                i.iconfont.icon-jiantou-->
-                <!--                span.ios-only 返回-->
+            <div class="page page-word-wiki">
+                <div class="navbar">
+                    <div class="navbar-inner navbar-word-wiki">
+                        <div class="left">
+                            <a class="link back" href="/">
+                                <i class="iconfont icon-jiantou"></i>
+                                <span class="ios-only">返回</span>
+                            </a>
+                        </div>
+                        <div class="right word-navbar-btn">
+                            <a class="panel-open" href="#" data-panel="right">
+                                <span class="icon icon-book"></span>
+                            </a>
+                            <a href="/word-wiki/">
+                                <i class="iconfont icon-qiyeguanxitupu"></i>
+                            </a>
+                        </div>
+                    </div>
+                </div>
                 <div class="toolbar">
                     <div class="toolbar-cover">
                         <a class="link-btn" href="#">
@@ -338,11 +360,11 @@
                         <div class="single-word">
                             <div class="word-body">
                                 <div class="word-title">
-                                    <a class="word-title-pager prev active">语词
+                                    <a class="word-title-pager prev active back">语词
                                         <span class="icon icon-word-prev"></span>
                                     </a>
                                     <h1 class="word-title-inner">象</h1>
-                                    <a class="word-title-pager next" href="/word-wiki/">百科
+                                    <a class="word-title-pager next" href="#">百科
                                         <span class="icon icon-word-next"></span>
                                     </a>
                                 </div>
@@ -755,7 +777,6 @@
         </div>
     </div>
     <script src="js/vendor.js"></script>
-    <script src="js/routes.js"></script>
-    <script src="js/word.js"></script>
+    <script src="js/main.js"></script>
 </body>
 </html>
\ No newline at end of file

serverside/cihai-wechat/src/main/webapp/static/index.html

@@ -21,6 +21,284 @@
     </div>
     <div id="app">
         <div class="statusbar"></div>
+        <div class="panel panel-right panel-cover panel-nav">
+            <div class="page navbar-fixed page-side-nav">
+                <div class="navbar">
+                    <div class="navbar-inner">
+                        <div class="center" style="left:0">“象”在其他百科辞典的解释</div>
+                    </div>
+                </div>
+                <div class="page-content">
+                    <div class="page-side">
+                        <div class="list-block accordion-list">
+                            <ul>
+                                <li class="accordion-item">
+                                    <a class="item-content item-link" href="#">
+                                        <div class="item-inner">
+                                            <div class="item-title">辞海</div>
+                                        </div>
+                                    </a>
+                                    <div class="accordion-item-content">
+                                        <div class="content-block">
+                                            <p>
+                                                <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="accordion-item">
+                                    <a class="item-content item-link" href="#">
+                                        <div class="item-inner">
+                                            <div class="item-title">中国人名大词典（历史人物卷）</div>
+                                        </div>
+                                    </a>
+                                    <div class="accordion-item-content">
+                                        <div class="content-block">
+                                            <p>
+                                                <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="accordion-item">
+                                    <a class="item-content item-link" href="#">
+                                        <div class="item-inner">
+                                            <div class="item-title">历代名人并称辞典</div>
+                                        </div>
+                                    </a>
+                                    <div class="accordion-item-content">
+                                        <div class="content-block">
+                                            <p>
+                                                <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="accordion-item">
+                                    <a class="item-content item-link" href="#">
+                                        <div class="item-inner">
+                                            <div class="item-title">哲学大辞典（修订本）</div>
+                                        </div>
+                                    </a>
+                                    <div class="accordion-item-content">
+                                        <div class="content-block">
+                                            <p>
+                                                <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="accordion-item">
+                                    <a class="item-content item-link" href="#">
+                                        <div class="item-inner">
+                                            <div class="item-title">中国哲学大辞典</div>
+                                        </div>
+                                    </a>
+                                    <div class="accordion-item-content">
+                                        <div class="content-block">
+                                            <p>
+                                                <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="accordion-item">
+                                    <a class="item-content item-link" href="#">
+                                        <div class="item-inner">
+                                            <div class="item-title">中国历史大辞典（全六卷）</div>
+                                        </div>
+                                    </a>
+                                    <div class="accordion-item-content">
+                                        <div class="content-block">
+                                            <p>
+                                                <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="accordion-item">
+                                    <a class="item-content item-link" href="#">
+                                        <div class="item-inner">
+                                            <div class="item-title">世界近代史词典</div>
+                                        </div>
+                                    </a>
+                                    <div class="accordion-item-content">
+                                        <div class="content-block">
+                                            <p>
+                                                <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="accordion-item">
+                                    <a class="item-content item-link" href="#">
+                                        <div class="item-inner">
+                                            <div class="item-title">东南亚历史词典</div>
+                                        </div>
+                                    </a>
+                                    <div class="accordion-item-content">
+                                        <div class="content-block">
+                                            <p>
+                                                <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="accordion-item">
+                                    <a class="item-content item-link" href="#">
+                                        <div class="item-inner">
+                                            <div class="item-title">中国文学大辞典（修订本）</div>
+                                        </div>
+                                    </a>
+                                    <div class="accordion-item-content">
+                                        <div class="content-block">
+                                            <p>
+                                                <a class="nav-list" href="#">第六版-2009年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第五版-2002年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第四版-1995年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第三版-1987年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第二版-1980年版典藏本</a>
+                                            </p>
+                                            <p>
+                                                <a class="nav-list" href="#">第一版-1976年版典藏本</a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
         <div class="view view-main view-init ios-edges" data-url="/">
             <div class="page bg-blank">
                 <div class="toolbar tabbar tabbar-labels toolbar-index">
@@ -57,7 +335,6 @@
         </div>
     </div>
     <script src="js/vendor.js"></script>
-    <script src="js/routes.js"></script>
-    <script src="js/index.js"></script>
+    <script src="js/main.js"></script>
 </body>
 </html>
\ No newline at end of file

serverside/cihai-wechat/src/main/webapp/static/js/index.js

@@ -3,79 +3,28 @@ var myApp = new Framework7({
   root: '#app',
   theme: 'ios',
   routes: routes,
+  modalButtonOk:'去顶'
 });
 
 var $loading = $('#loading');
 $loading.addClass('fade-out');
 setTimeout(function () {
   $loading.remove();
-}, 300);
+},300);
+
 $('.search-area-inner').on('click', function () {
-    wx.startRecord();
   myApp.dialog.create({
     title: '正在录音...',
     buttons: [
       {
         text: '完成',
-                onClick: function () {
-                    wx.stopRecord({
-                        success: function (res) {
-                            myApp.dialog.preloader();
-
-                            var localId = res.localId;
-                            wx.translateVoice({
-                                localId: localId, // 需要识别的音频的本地Id，由录音相关接口获得
-                                isShowProgressTips: 0, // 默认为1，显示进度提示
-                                success: function (res) {
-                                    jQuery.get("/home/search", {keyword: res.translateResult}, function (data) {
-                                        myApp.dialog.close();
-                                        if (data.code == "OK") {
-                                            // myApp.view.main.router.load({
-                                            //     url:data.data
-                                            // });
-                                            location.href = data.data;
-                                        } else {
-                                            myApp.dialog.alert(data.message);
-                                            $('.j_search_input').val(res.translateResult);
-                                        }
-                                    })
-
-                                }
-
-                            });
-                        }
+        onClick:function () {
 
+          myApp.view.main.router.load({
+            url:'/2-1字语词义.html'
           });
-
         }
       }
     ]
   }).open();
 });
-$('.brand-index').on('click', function () {
-    wx.chooseImage({
-
-        count: 1, // 默认9
-
-        sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
-
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-
-        success: function (res) {
-
-            var localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
-            wx.getLocalImgData({
-
-                localId: localIds[0], // 图片的localID
-
-                success: function (res) {
-
-                    var localData = res.localData; // localData是图片的base64数据，可以用img标签显示
-                    alert(localData);
-                }
-
-            });
-        }
-
-    });
-})

serverside/cihai-wechat/src/main/webapp/static/js/main.js

+var $ = Dom7;
+var myApp = new Framework7({
+  root: '#app',
+  theme: 'ios',
+  modalButtonOk:'去顶'
+});
+
+var $loading = $('#loading');
+$loading.addClass('fade-out');
+setTimeout(function () {
+  $loading.hide();
+},300);
+
+/**
+ * 页面切换
+ * @param url
+ */
+function jumpPage(url) {
+  $loading.show();
+  setTimeout(function () {
+    $loading.removeClass('fade-in');
+    setTimeout(function () {
+      window.location.href = url;
+    },300);
+  },10);
+}
+
+$('.js-jump-page').click(function () {
+  jumpPage($(this).attr('href'));
+  return false;
+});

serverside/cihai-wechat/src/main/webapp/static/js/special.js

-var $ = Dom7;
-var app = new Framework7({
-  root: '#app',
-  theme: 'ios',
-  routes: routes
-});
-
 var numSwiper = new Swiper('.num-swiper', {
     loop: false,
     slidesPerView: 4,
     slidesPerGroup: 1,
     navigation: {
         nextEl: '.swiper-button-next',
-        prevEl: '.swiper-button-prev',
+        prevEl: '.swiper-button-prev'
     }
 });
 
@@ -43,93 +36,6 @@ var topicSwiper = new Swiper('.topic-swiper', {
     }
 });
 
-
-//关系图
-var DIR = 'img/soft-scraps-icons/';
-var nodes = null;
-var edges = null;
-var network = null;
-
-// Called when the Visualization API is loaded.
-function draw() {
-    // create people.
-    // value corresponds with the age of the person
-    var DIR = 'images/special-pic-0';
-    nodes = [
-        {id: 1, shape: 'circularImage', image: DIR + '1.png'},
-        {id: 2, shape: 'circularImage', image: DIR + '2.png'},
-        {id: 3, shape: 'circularImage', image: DIR + '1.png'},
-        {id: 4, shape: 'circularImage', image: DIR + '2.png', label: "pictures by this guy!"},
-        {id: 5, shape: 'circularImage', image: DIR + '1.png'},
-        {id: 6, shape: 'circularImage', image: DIR + '2.png'},
-        {id: 7, shape: 'circularImage', image: DIR + '1.png'},
-        {id: 8, shape: 'circularImage', image: DIR + '2.png'},
-        {id: 9, shape: 'circularImage', image: DIR + '1.png'},
-        {id: 10, shape: 'circularImage', image: DIR + '2.png'},
-        {id: 11, shape: 'circularImage', image: DIR + '1.png'},
-        {id: 12, shape: 'circularImage', image: DIR + '2.png'},
-        {id: 13, shape: 'circularImage', image: DIR + '1.png'},
-        {id: 14, shape: 'circularImage', image: DIR + '2.png'},
-        {
-            id: 15,
-            shape: 'circularImage',
-            image: DIR + 'missing.png',
-            brokenImage: DIR + 'missingBrokenImage.png',
-            label: "when images\nfail\nto load"
-        },
-        {
-            id: 16,
-            shape: 'circularImage',
-            image: DIR + 'anotherMissing.png',
-            brokenImage: DIR + '9.png',
-            label: "fallback image in action"
-        }
-    ];
-
-    // create connections between people
-    // value corresponds with the amount of contact between two people
-    edges = [
-        {from: 1, to: 2},
-        {from: 2, to: 3},
-        {from: 2, to: 4},
-        {from: 4, to: 5},
-        {from: 4, to: 10},
-        {from: 4, to: 6},
-        {from: 6, to: 7},
-        {from: 7, to: 8},
-        {from: 8, to: 9},
-        {from: 8, to: 10},
-        {from: 10, to: 11},
-        {from: 11, to: 12},
-        {from: 12, to: 13},
-        {from: 13, to: 14},
-        {from: 9, to: 16}
-    ];
-
-    // create a network
-    var container = document.getElementById('mynetwork');
-    var data = {
-        nodes: nodes,
-        edges: edges
-    };
-    var options = {
-        nodes: {
-            borderWidth: 4,
-            size: 30,
-            color: {
-                border: '#222222',
-                background: '#666666'
-            },
-            font: {color: '#eeeeee'}
-        },
-        edges: {
-            color: 'lightgray'
-        }
-    };
-    network = new vis.Network(container, data, options);
-}
-        draw();
-
 $('.js-read-more').click(function () {
     if($(this).hasClass('active')){
         $('.special-content .txt-content').css('height','190px');
@@ -139,3 +45,10 @@ $('.js-read-more').click(function () {
         $(this).addClass('active')
     }
 });
+
+$('.js-enable-drag').click(function () {
+  var $this = $(this);
+  $this.hasClass('active')?$this.removeClass('active'):$this.addClass('active');
+  var $target = $($this.data('target'));
+  $target.hasClass('enable')?$target.removeClass('enable'):$target.addClass('enable');
+});
\ No newline at end of file

serverside/cihai-wechat/src/main/webapp/static/专题.html

@@ -9,10 +9,30 @@
     <link rel="stylesheet" href="css/vendor.css">
 </head>
 <body>
+    <div class="loading" id="loading">
+        <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+        <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="64px" height="64px" viewBox="0 0 128 128" xml:space="preserve">
+            <g>
+                <path d="M78.75 16.18V1.56a64.1 64.1 0 0 1 47.7 47.7H111.8a49.98 49.98 0 0 0-33.07-33.08zM16.43 49.25H1.8a64.1 64.1 0 0 1 47.7-47.7V16.2a49.98 49.98 0 0 0-33.07 33.07zm33.07 62.32v14.62A64.1 64.1 0 0 1 1.8 78.5h14.63a49.98 49.98 0 0 0 33.07 33.07zm62.32-33.07h14.62a64.1 64.1 0 0 1-47.7 47.7v-14.63a49.98 49.98 0 0 0 33.08-33.07z"
+                    fill="#494949" fill-opacity="1" />
+                <animateTransform attributeName="transform" type="rotate" from="0 64 64" to="-90 64 64" dur="400ms" repeatCount="indefinite"></animateTransform>
+            </g>
+        </svg>
+    </div>
     <div id="app">
         <div class="statusbar"></div>
         <div class="view view-main view-init ios-edges" data-url="/">
             <div class="page">
+                <div class="navbar">
+                    <div class="navbar-inner">
+                        <div class="left">
+                            <a class="link back" href="/">
+                                <i class="iconfont icon-jiantou"></i>
+                                <span class="ios-only">返回</span>
+                            </a>
+                        </div>
+                    </div>
+                </div>
                 <div class="page-content special-content">
                     <!--专题简介-->
                     <div class="intro-box">
@@ -216,8 +236,13 @@
                                 <img src="images/special-tip.png">
                             </div>
                             <div class="title">十九大图谱</div>
+                            <div class="special-title-tools">
+                                <a class="js-enable-drag" href="#" data-target="#relation-pic">
+                                    <span class="icon icon-drag"></span>
+                                </a>
+                            </div>
                         </div>
-                        <div id="mynetwork"></div>
+                        <div id="relation-pic"></div>
                     </div>
                     <!--词云解析-->
                     <div class="word-analysis">
@@ -226,10 +251,16 @@
                                 <img src="images/special-tip.png">
                             </div>
                             <div class="title">词云解析</div>
+                            <div class="special-title-tools">
+                                <a class="js-refresh" href="#" data-target="#word-analysis">
+                                    <i class="iconfont icon-huanyipi"></i>
+                                </a>
+                                <a class="js-enable-drag" href="#" data-target="#word-analysis">
+                                    <span class="icon icon-drag"></span>
+                                </a>
                             </div>
-                        <div class="inner">
-                            <img src="images/special-pic-07.png">
                         </div>
+                        <div id="word-analysis"></div>
                     </div>
                     <!--相关新闻-->
                     <div class="about-news">
@@ -260,7 +291,6 @@
                             </div>
                             <div class="card-footer">中国共产党第十九次全国代表大会，中国特色社会主义进入新时代的关键时期召开的一次十分重要的大会。</div>
                         </div>
-                        <div class="more-btn">加载更多</div>
                     </div>
                     <!--图说十九大-->
                     <div class="pic-show">
@@ -315,9 +345,81 @@
         </div>
     </div>
     <script src="js/vendor.js"></script>
-    <script src="js/routes.js"></script>
-    <script src="js/swiper.min.js"></script>
-    <script src="js/vis.js"></script>
+    <script src="js/main.js"></script>
     <script src="js/special.js"></script>
+    <script>
+        function relationPic(id, data) {
+            return new vis.Network(document.getElementById(id), relationPicData, {
+                nodes: {
+                    shape: 'dot',
+                    borderWidth: 3,
+                    color: {
+                        border: '#c6c6c6',
+                        background: '#adadad',
+                        highlight: {
+                            border: '#187bb2',
+                            background: '#187bb2'
+                        }
+                    },
+                    font: {
+                        color: '#333'
+                    }
+                }
+            });
+        };
+        var relationPicData = {
+            nodes: [{
+                    id: 1,
+                    label: 'Node 1',
+                    value: 15
+                },
+                {
+                    id: 2,
+                    label: 'Node 2',
+                    value: 25
+                },
+                {
+                    id: 3,
+                    label: 'Node 3',
+                    value: 50
+                },
+                {
+                    id: 4,
+                    label: 'Node 4',
+                    value: 30
+                },
+                {
+                    id: 5,
+                    label: 'Node 5',
+                    value: 8
+                }
+            ],
+            edges: [{
+                    from: 1,
+                    to: 3
+                },
+                {
+                    from: 1,
+                    to: 2
+                },
+                {
+                    from: 2,
+                    to: 4
+                },
+                {
+                    from: 2,
+                    to: 5
+                }
+            ]
+        };
+        relationPic('relation-pic', relationPicData);
+        relationPicData.edges = [];
+        var wordAnalysis = relationPic('word-analysis', relationPicData);
+
+        $('.js-refresh').click(function() {
+            wordAnalysis.destroy();
+            wordAnalysis = relationPic('word-analysis', relationPicData);
+        });
+    </script>
 </body>
 </html>
\ No newline at end of file