Skip to content

石磊 / cihai

Go to a project
Commit 80c7cab3 by 石头
Options

Merge remote-tracking branch 'origin/master'

2 parents 62e26bb7 f441d09d
Inline Side-by-side
Showing 3 changed files with 48 additions and 20 deletions
serverside/cihai-wechat/src/main/resources/application-production.properties
# 数据库连接 # 数据库连接
spring.datasource.url=jdbc:mysql://localhost:3306/test spring.datasource.url=jdbc:mysql://localhost:3306/cihai
spring.datasource.username=root spring.datasource.username=root
# 加密后的密码 # 加密后的密码
spring.datasource.password=UvoEsj8TZ9a11DQRR42EGuoIRjeuqSagmUzCdUeDnw9PJ9hum0Lx/MTPrpIR7isrPdA8lMpaY77eW4g3f1tCQQ== spring.datasource.password=oeIOLg5LNEaK9BSQiwmjwdfkVksUrrt6kgBdEoONs3X4gZQN1TmweFerGfm8Jt+Cj94RxFumQ3N733MRlF4uoA==
# 加密时的公钥 # 加密时的公钥
public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJFbtR5GoNcW9j8b4RhZQ1CC1xNBx8Sqphxc8/6vNWYdd7d84AUfSAzFXCzGvuvJ0URNAg9IykPDexY/mHP8dA0CAwEAAQ== public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKk6Fd6Bnc5NWXx5PSkdRwVxhG9WPGnvhQZJYtjy1+ug2ivEvwGValq0z3BDmA0uy3NBx9iOkPEWdGS24M6g3cMCAwEAAQ==
# 日志 # 日志
logging.level.root=error logging.level.root=error
logging.level.com.dookay.coral.common.core=info logging.level.com.dookay.coral.common.core=info
logging.level.com.dookay.coral.common.web=info logging.level.com.dookay.coral.common.web=info
logging.level.com.dookay.front=info logging.level.com.dookay.cihai=info
logging.level.com.dookay.core=info
logging.file=/data/www/log/cihai.log logging.file=/data/www/log/cihai.log
# redis # redis
spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.password=sZ17ZaA9
# 上传文件路径映射 # 文件存储
coral.web.resource.mapping.uploads-inner=/uploads/** coral.web.resource.mapping.uploads-inner=/uploads/*
coral.web.resource.mapping.uploads-mapping=file:/data/www/uploads/demo/ coral.web.resource.mapping.uploads-mapping=/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 # 打开 gzip
server.compression.enabled=true server.compression.enabled=true
serverside/cihai-wechat/src/main/resources/application-test.properties
# 数据库连接 # 数据库连接
spring.datasource.url=jdbc:mysql://localhost:3306/test spring.datasource.url=jdbc:mysql://localhost:3306/cihai
spring.datasource.username=root spring.datasource.username=root
# 加密后的密码 # 加密后的密码
spring.datasource.password=UvoEsj8TZ9a11DQRR42EGuoIRjeuqSagmUzCdUeDnw9PJ9hum0Lx/MTPrpIR7isrPdA8lMpaY77eW4g3f1tCQQ== spring.datasource.password=oeIOLg5LNEaK9BSQiwmjwdfkVksUrrt6kgBdEoONs3X4gZQN1TmweFerGfm8Jt+Cj94RxFumQ3N733MRlF4uoA==
# 加密时的公钥 # 加密时的公钥
public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJFbtR5GoNcW9j8b4RhZQ1CC1xNBx8Sqphxc8/6vNWYdd7d84AUfSAzFXCzGvuvJ0URNAg9IykPDexY/mHP8dA0CAwEAAQ== public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKk6Fd6Bnc5NWXx5PSkdRwVxhG9WPGnvhQZJYtjy1+ug2ivEvwGValq0z3BDmA0uy3NBx9iOkPEWdGS24M6g3cMCAwEAAQ==
# 日志 # 日志
logging.level.root=warn logging.level.root=warn
...@@ -16,10 +16,24 @@ logging.file=/data/www/log/cihai.log ...@@ -16,10 +16,24 @@ logging.file=/data/www/log/cihai.log
# redis # redis
spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.password=sZ17ZaA9
# 上传文件路径映射 # 文件存储
coral.web.resource.mapping.uploads-inner=/uploads/** coral.web.resource.mapping.uploads-inner=/uploads/*
coral.web.resource.mapping.uploads-mapping=file:/data/www/uploads/demo/ coral.web.resource.mapping.uploads-mapping=/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 # 打开 gzip
server.compression.enabled=true server.compression.enabled=true
serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/theme/detail.jsp
...@@ -321,14 +321,16 @@ ...@@ -321,14 +321,16 @@
var mapData = {}; var mapData = {};
var relateData = {}; var relateData = {};
var map = loadMap(); var map = null;
var wordAnalysis = loadRelated(); var related = null;
loadMap();
loadRelated();
function loadMap() { function loadMap() {
jQuery.get(location.href + "/map", {}, function (data) { jQuery.get(location.href + "/map", {}, function (data) {
if (data.code == "OK") { if (data.code == "OK") {
mapData = data.data; mapData = data.data;
return newNetwork('relation-pic', mapData); map = newNetwork('relation-pic', mapData);
} else { } else {
console.log("请求数据失败"); console.log("请求数据失败");
} }
...@@ -339,7 +341,7 @@ ...@@ -339,7 +341,7 @@
jQuery.get(location.href + "/related", {}, function (data) { jQuery.get(location.href + "/related", {}, function (data) {
if (data.code == "OK") { if (data.code == "OK") {
relateData = data.data; relateData = data.data;
return newNetwork('word-analysis', relateData); related= newNetwork('word-analysis', relateData);
} else { } else {
console.log("请求数据失败"); console.log("请求数据失败");
} }
...@@ -366,7 +368,6 @@ ...@@ -366,7 +368,6 @@
}, },
}); });
netWork.on("doubleClick", function (e) { netWork.on("doubleClick", function (e) {
console.log(e);
var i = e.nodes[0]; var i = e.nodes[0];
var node = _.filter(data.nodes, function (n) { var node = _.filter(data.nodes, function (n) {
return n.id == i; return n.id == i;
...@@ -384,7 +385,7 @@ ...@@ -384,7 +385,7 @@
$('.js-refresh').click(function () { $('.js-refresh').click(function () {
wordAnalysis.destroy(); related.destroy();
loadRelated(); loadRelated();
}); });
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!