Skip to content

石磊 / cihai

Go to a project
Commit 70c7201d by 侯昆
Options

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

                                                          # Conflicts:
                                                          #	serverside/cihai-wechat/src/main/webapp/static/2-1字语词义.html
                                                          #	serverside/cihai-wechat/src/main/webapp/static/2-2字百科义.html
                                                          #	serverside/cihai-wechat/src/main/webapp/static/css/vendor.css
                                                          #	serverside/cihai-wechat/src/main/webapp/static/index.html
                                                          #	serverside/cihai-wechat/src/main/webapp/static/专题.html
2 parents c259fef8 65911c19
Inline Side-by-side
Showing 6 changed files with 9 additions and 633 deletions
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/WordController.java
......@@ -43,8 +43,9 @@ public class WordController extends BaseController {
@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");
ModelAndView mv = new ModelAndView(wordDomain.getWord().length() >= 2 ? "/portal/word/detail" : "/portal/word/baike");
mv.addObject("word", wordDomain);
return mv;
}
}
serverside/cihai-wechat/src/main/webapp/static/2-1字语词义.html
<!DOCTYPE html>
<html lang="zh-CN">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<title>2-1字语词义</title>
<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">
<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">
<div class="page">
<div class="navbar">
<div class="navbar-inner">
<div class="left">
......@@ -556,10 +254,4 @@
<img src="images/cihai-tip.png">
</div>
</div>
</div>
</div>
</div>
<script src="js/vendor.js"></script>
<script src="js/main.js"></script>
</body>
</html>
\ No newline at end of file
</div>
\ No newline at end of file
serverside/cihai-wechat/src/main/webapp/static/2-2字百科义.html
<!DOCTYPE html>
<html lang="zh-CN">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<title>2-2字百科义</title>
<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">
<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 page-word-wiki">
<div class="page page-word-wiki">
<div class="navbar">
<div class="navbar-inner navbar-word-wiki">
<div class="left">
......@@ -773,10 +471,4 @@
<img src="images/cihai-tip.png">
</div>
</div>
</div>
</div>
</div>
<script src="js/vendor.js"></script>
<script src="js/main.js"></script>
</body>
</html>
\ No newline at end of file
</div>
\ No newline at end of file
serverside/cihai-wechat/src/main/webapp/static/css/vendor.css
This diff could not be displayed because it is too large.
serverside/cihai-wechat/src/main/webapp/static/index.html
......@@ -335,6 +335,7 @@
</div>
</div>
<script src="js/vendor.js"></script>
<script src="js/main.js"></script>
<script src="js/vis.js"></script>
<script src="js/index.js"></script>
</body>
</html>
\ No newline at end of file
serverside/cihai-wechat/src/main/webapp/static/专题.html
......@@ -9,16 +9,6 @@
<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="/">
......@@ -345,7 +335,7 @@
</div>
</div>
<script src="js/vendor.js"></script>
<script src="js/main.js"></script>
<script src="js/vis.js"></script>
<script src="js/special.js"></script>
<script>
function relationPic(id, data) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!