Merge branch 'master' of http://gitlab.coralcodes.com:30000/shil0009/cihai

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

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