Skip to content

石磊 / cihai

Go to a project
Commit 5b8a10a9 by 侯昆
Options

提交

1 parent 9f9c81bf
Inline Side-by-side
Showing 14 changed files with 101 additions and 102 deletions
serverside/cihai-app/src/main/resources/application-dev.properties
debug=false
# 数据库连接
spring.datasource.url=jdbc:mysql://192.168.2.28:3306/cihai
spring.datasource.username=root
......
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/config/BeanConfig.java 0 → 100644
package com.dookay.cihai.pc.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 org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.boot.web.support.ErrorPageFilter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author houkun
* @date 2018/1/16
*/
@Configuration
public class BeanConfig {
@Bean
public ErrorPageFilter errorPageFilter() {
return new ErrorPageFilter();
}
@Bean
public FilterRegistrationBean disableSpringBootErrorFilter(ErrorPageFilter filter) {
FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
filterRegistrationBean.setFilter(filter);
filterRegistrationBean.setEnabled(false);
return filterRegistrationBean;
}
}
serverside/cihai-pc/src/main/resources/application-dev.properties
......@@ -13,17 +13,5 @@ spring.redis.host=192.168.2.27
spring.redis.password=100001
# 文件存储
coral.web.resource.mapping.uploads-inner=/uploads/*
coral.web.resource.mapping.uploads-mapping=/data/www/uploads/cihai
coral.web.resource.mapping.uploads-mapping=file:/data/www/uploads/cihai
#wechat config
#AppID
coral.wechat.WechatConfig.appId=wx319ed3575ffe9ff8
#AppSecret
coral.wechat.WechatConfig.appSecret=eed9c0728fb20521bb61be4ac6e4e67d
#Token(令牌)
coral.wechat.WechatConfig.token=eGgg3CoOihZQwCf1sr8jU8zmBfx4u5WT
#EncodingAESKey(消息加解密密钥)
coral.wechat.WechatConfig.encodingAESKey=agkC7tsPUoOtbbUyxxcCLVJZVqVOCTeJgxUCXAx87op
# 是否加密
coral.wechat.WechatConfig.messageEncrypt=false
# 微信授权回调地址
serverside/cihai-pc/src/main/resources/application-production.properties
......@@ -13,25 +13,10 @@ logging.level.com.dookay.cihai=info
logging.file=/data/www/log/cihai.log
# redis
spring.redis.host=127.0.0.1
spring.redis.password=sZ17ZaA9
spring.redis.host=192.168.2.27
spring.redis.password=lyd123456
# 文件存储
coral.web.resource.mapping.uploads-inner=/uploads/*
coral.web.resource.mapping.uploads-mapping=/data/www/uploads/cihai
coral.web.resource.mapping.uploads-mapping=file:/data/www/uploads/cihai
#wechat config
#AppID
coral.wechat.WechatConfig.appId=wx319ed3575ffe9ff8
#AppSecret
coral.wechat.WechatConfig.appSecret=eed9c0728fb20521bb61be4ac6e4e67d
#Token(令牌)
coral.wechat.WechatConfig.token=eGgg3CoOihZQwCf1sr8jU8zmBfx4u5WT
#EncodingAESKey(消息加解密密钥)
coral.wechat.WechatConfig.encodingAESKey=agkC7tsPUoOtbbUyxxcCLVJZVqVOCTeJgxUCXAx87op
# 是否加密
coral.wechat.WechatConfig.messageEncrypt=false
# 微信授权回调地址
# 打开 gzip
server.compression.enabled=true
serverside/cihai-pc/src/main/resources/application-test.properties
......@@ -15,25 +15,10 @@ logging.level.com.dookay.core=debug
logging.file=/data/www/log/cihai.log
# redis
spring.redis.host=127.0.0.1
spring.redis.password=sZ17ZaA9
spring.redis.host=192.168.2.27
spring.redis.password=lyd123456
# 文件存储
coral.web.resource.mapping.uploads-inner=/uploads/*
coral.web.resource.mapping.uploads-mapping=/data/www/uploads/cihai
coral.web.resource.mapping.uploads-mapping=file:/data/www/uploads/cihai
#wechat config
#AppID
coral.wechat.WechatConfig.appId=wx319ed3575ffe9ff8
#AppSecret
coral.wechat.WechatConfig.appSecret=eed9c0728fb20521bb61be4ac6e4e67d
#Token(令牌)
coral.wechat.WechatConfig.token=eGgg3CoOihZQwCf1sr8jU8zmBfx4u5WT
#EncodingAESKey(消息加解密密钥)
coral.wechat.WechatConfig.encodingAESKey=agkC7tsPUoOtbbUyxxcCLVJZVqVOCTeJgxUCXAx87op
# 是否加密
coral.wechat.WechatConfig.messageEncrypt=false
# 微信授权回调地址
# 打开 gzip
server.compression.enabled=true
serverside/cihai-pc/src/main/resources/application.properties
......@@ -21,7 +21,7 @@ spring.datasource.druid.filter.stat.enabled=false
mapper.mappers=com.dookay.coral.common.core.persistence.Mapper
mybatis.mapper-locations=classpath*:mapper/*.xml
# jsp页面配置
spring.mvc.view.prefix=/WEB-INF/jsp/
spring.mvc.view.prefix=/WEB-INF/jsp
spring.mvc.view.suffix=.jsp
# 错误页面
coral.web.view.error.not-found=404
......@@ -29,8 +29,9 @@ coral.web.view.error.bad-request=400
coral.web.view.error.internal-error=500
coral.web.view.error.service=service
coral.web.view.error.other=other
security.basic.enabled=false
security.enable-csrf=false
server.jetty.max-http-post-size=20971520
# 映射
spring.resources.static-locations=/static/
coral.web.view.form.enable-prevent-duplicate=false
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/index.jsp
......@@ -15,7 +15,7 @@
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href="/">
<img src="images/logo.png">
<img src="/static/images/logo.png">
</a>
</div>
<div class="navbar-collapse">
......@@ -51,7 +51,7 @@
<form class="navbar-form clearfix j_search_form" action="/home/search" method="GET">
<div class="logo-search">
<a>
<img class="img-responsive" src="/images/logo-search.png">
<img class="img-responsive" src="/static/images/logo-search.png">
</a>
</div>
<div class="search-main-input-wrapper">
......@@ -135,7 +135,7 @@
<div class="card-calendar">
<span class="prev">前</span>
<span class="current"><%=DateFormatUtils.format(new Date(), "yyyy年M月d日")%></span>
<img src="images/calendar.png">
<img src="/static/images/calendar.png">
<span class="next">后</span>
</div>
<a href="/today">
......@@ -166,10 +166,10 @@
<jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
<script>
$(function () {
var index;
$('.j_search_form').ajaxSubmitForm({
before: function () {
var index = layer.load(2, 10000);
index = layer.load(2, 5000);
},
success: function ($form, data) {
if (data.code === "OK") {
......@@ -177,8 +177,8 @@
}
else {
$.tip(data.message);
layer.close(index);
}
layer.close(index);
},
});
......@@ -217,8 +217,8 @@
}
else {
$.tip(data.message);
layer.close(index);
}
layer.close(index);
},
error: function () {
layer.close(index);
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/today.jsp
......@@ -6,7 +6,7 @@
</jsp:include>
<div class="history-content text-center">
<img src="/images/history-01.jpg">
<img src="/static/images/history-01.jpg">
</div>
<footer class="footer-main">
<div class="container">
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/include/header.jsp
......@@ -10,14 +10,14 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="renderer" content="webkit">
<title>辞海-${param.pageTitle}</title>
<link rel="stylesheet" href="/css/vendor.css">
<link rel="stylesheet" href="/css/index.css">
<script src="/js/plugins/jquery.min.js"></script>
<script src="/js/plugins/validator/jquery.validator.js"></script>
<script src="/js/common.js"></script>
<script src="/js/vendor.js" merge="true"></script>
<script src="/js/backend.js"></script>
<script src="/js/layer/layer.js"></script>
<link rel="stylesheet" href="/static/css/vendor.css">
<link rel="stylesheet" href="/static/css/index.css">
<script src="/static/js/plugins/jquery.min.js"></script>
<script src="/static/js/plugins/validator/jquery.validator.js"></script>
<script src="/static/js/common.js"></script>
<script src="/static/js/vendor.js" merge="true"></script>
<script src="/static/js/backend.js"></script>
<script src="/static/js/layer/layer.js"></script>
<script>
$(function () {
backEndApp.init();
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/include/header_search.jsp
......@@ -10,21 +10,22 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="renderer" content="webkit">
<title>辞海-${param.pageTitle}</title>
<link rel="stylesheet" href="/css/vendor.css">
<link rel="stylesheet" href="/css/index.css">
<script src="/js/plugins/jquery.min.js"></script>
<script src="/js/plugins/validator/jquery.validator.js"></script>
<script src="/js/common.js"></script>
<script src="/js/vendor.js" merge="true"></script>
<script src="/js/backend.js"></script>
<script src="/js/layer/layer.js"></script>
<link rel="stylesheet" href="/static/css/vendor.css">
<link rel="stylesheet" href="/static/css/index.css">
<script src="/static/js/plugins/jquery.min.js"></script>
<script src="/static/js/plugins/validator/jquery.validator.js"></script>
<script src="/static/js/common.js"></script>
<script src="/static/js/vendor.js" merge="true"></script>
<script src="/static/js/backend.js"></script>
<script src="/static/js/layer/layer.js"></script>
<script>
$(function () {
backEndApp.init();
var index;
$('.j_search_form').ajaxSubmitForm({
before: function () {
var index = layer.load(2,10000);
index = layer.load(2, 5000);
},
success: function ($form, data) {
if (data.code === "OK") {
......@@ -32,8 +33,8 @@
}
else {
$.tip(data.message);
layer.close(index);
}
layer.close(index);
},
});
......@@ -43,7 +44,7 @@
if ($this.val() == null) {
return;
}
var index = layer.load(2, 10000);
index = layer.load(2, 10000);
$.ajax({
url: '/image/search',
type: 'POST',
......@@ -72,8 +73,8 @@
}
else {
$.tip(data.message);
layer.close(index);
}
layer.close(index);
},
error: function () {
layer.close(index);
......@@ -88,7 +89,7 @@
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="/">
<img src="/images/logo.png">
<img src="/static/images/logo.png">
</a>
</div>
<div class="navbar-collapse">
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_baike.jsp
......@@ -18,7 +18,7 @@
style="background-image:url(${vo.images.get(0).file})"
</c:when>
<c:otherwise>
style="background-image:url(/images/word-bg-01.jpg)">
style="background-image:url(/static/images/word-bg-01.jpg)">
</c:otherwise>
</c:choose>
<div class="container">
......@@ -50,7 +50,7 @@
【${item}】
</c:forEach>
</div>
<div class="icon" style="background-image:url(/icons/voice.png)"></div>
<div class="icon" style="background-image:url(/static/icons/voice.png)"></div>
</div>
<%--<div class="sub-name">长鼻目象科哺乳动物</div>--%>
</div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_paraph.jsp
......@@ -25,7 +25,7 @@
<div class="title-base title-primary">【六体书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="/temp/calligraphy1.png">
<img src="/static/temp/calligraphy1.png">
</div>
</section>
<section class="calligraphy-section">
......@@ -33,7 +33,7 @@
<div class="title-base title-primary">【楷书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="/temp/calligraphy2.png">
<img src="/static/temp/calligraphy2.png">
</div>
</section>
<section class="calligraphy-section">
......@@ -41,7 +41,7 @@
<div class="title-base title-primary">【行书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="/temp/calligraphy3.png">
<img src="/static/temp/calligraphy3.png">
</div>
</section>
<section class="calligraphy-section">
......@@ -49,7 +49,7 @@
<div class="title-base title-primary">【篆书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="/temp/calligraphy4.png">
<img src="/static/temp/calligraphy4.png">
</div>
</section>
<section class="calligraphy-section">
......@@ -57,7 +57,7 @@
<div class="title-base title-primary">【隶书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="/temp/calligraphy5.png">
<img src="/static/temp/calligraphy5.png">
</div>
</section>
</div>
......@@ -110,31 +110,31 @@
<div class="character-origin clearfix">
<div class="character-origin-item">
<div class="character-origin-image">
<img src="/temp/origin1.png">
<img src="/static/temp/origin1.png">
</div>
<div class="character-origin-desc">甲骨文</div>
</div>
<div class="character-origin-item">
<div class="character-origin-image">
<img src="/temp/origin2.png">
<img src="/static/temp/origin2.png">
</div>
<div class="character-origin-desc">金文</div>
</div>
<div class="character-origin-item">
<div class="character-origin-image">
<img src="/temp/origin3.png">
<img src="/static/temp/origin3.png">
</div>
<div class="character-origin-desc">小篆</div>
</div>
<div class="character-origin-item">
<div class="character-origin-image">
<img src="/temp/origin4.png">
<img src="/static/temp/origin4.png">
</div>
<div class="character-origin-desc">康熙字</div>
</div>
<div class="character-origin-item">
<div class="character-origin-image">
<img src="/temp/origin5.png">
<img src="/static/temp/origin5.png">
</div>
<div class="character-origin-desc">楷体</div>
</div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
......@@ -17,7 +17,7 @@
style="background-image:url(${vo.images.get(0).file})"
</c:when>
<c:otherwise>
style="background-image:url(/images/word-bg-01.jpg)">
style="background-image:url(/static/images/word-bg-01.jpg)">
</c:otherwise>
</c:choose>
<div class="container">
......@@ -51,7 +51,7 @@
</c:forEach>
】
</div>
<div class="icon" style="background-image:url(/icons/voice.png)"></div>
<div class="icon" style="background-image:url(/static/icons/voice.png)"></div>
</div>
<%--<div class="sub-name">长鼻目象科哺乳动物</div>--%>
</div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/statement_paraph.jsp
......@@ -42,7 +42,7 @@
</c:forEach>
】
</div>
<div class="icon" style="background-image:url(/icons/voice.png)"></div>
<div class="icon" style="background-image:url(/static/icons/voice.png)"></div>
</div>
<%--<div class="sub-name">长鼻目象科哺乳动物</div>--%>
</div>
......@@ -92,31 +92,31 @@
<%--<div class="character-origin clearfix">--%>
<%--<div class="character-origin-item">--%>
<%--<div class="character-origin-image">--%>
<%--<img src="/temp/origin1.png">--%>
<%--<img src="/static/temp/origin1.png">--%>
<%--</div>--%>
<%--<div class="character-origin-desc">甲骨文</div>--%>
<%--</div>--%>
<%--<div class="character-origin-item">--%>
<%--<div class="character-origin-image">--%>
<%--<img src="/temp/origin2.png">--%>
<%--<img src="/static/temp/origin2.png">--%>
<%--</div>--%>
<%--<div class="character-origin-desc">金文</div>--%>
<%--</div>--%>
<%--<div class="character-origin-item">--%>
<%--<div class="character-origin-image">--%>
<%--<img src="/temp/origin3.png">--%>
<%--<img src="/static/temp/origin3.png">--%>
<%--</div>--%>
<%--<div class="character-origin-desc">小篆</div>--%>
<%--</div>--%>
<%--<div class="character-origin-item">--%>
<%--<div class="character-origin-image">--%>
<%--<img src="/temp/origin4.png">--%>
<%--<img src="/static/temp/origin4.png">--%>
<%--</div>--%>
<%--<div class="character-origin-desc">康熙字</div>--%>
<%--</div>--%>
<%--<div class="character-origin-item">--%>
<%--<div class="character-origin-image">--%>
<%--<img src="/temp/origin5.png">--%>
<%--<img src="/static/temp/origin5.png">--%>
<%--</div>--%>
<%--<div class="character-origin-desc">楷体</div>--%>
<%--</div>--%>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!