Home Explore Help
Sign In
qmx
/
qfw
7
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

提交修改

renzheng 9 years ago
parent
ec052ddf70
commit
295aeecee7
4 changed files with 16 additions and 8 deletions
Split View Show Diff Stats
  1. 1 0
      common/src/qfw/util/elastic/elasticutil.go
  2. 4 2
      common/src/qfw/util/encrypt_test.go
  3. 7 2
      core/src/web/templates/swordfish/wxinfocontent.html
  4. 4 4
      weixin/src/config.json

+ 1 - 0
common/src/qfw/util/elastic/elasticutil.go
View File 

@@ -582,6 +582,7 @@ func ConverData(ent *map[string]interface{}) map[string]interface{} {
 
 	tmp2["s_submitid"] = tmp["s_submitid"]
 
 	tmp2["l_submittime"] = tmp["l_submittime"]
 
 	tmp2["s_submitname"] = tmp["s_submitname"]
 
+	tmp2["RegCapCurName"] = tmp["RegCapCurName"]
 
 	//增加营业状态排序
 
 	if tmp2["OpState"] == "06" {
 
 		tmp2["OpSint"] = true

+ 4 - 2
common/src/qfw/util/encrypt_test.go
View File 

@@ -62,8 +62,10 @@ func Test_filterxss(t *testing.T) {
 
 }
 
 
 func Test_int(t *testing.T) {
 
-	var s int64 = 3
 
-	log.Println(IntAllDef(s, -2))
 
+	arr := make([]map[string]interface{}, 100)
 
+	for k, v := range arr {
 
+		log.Println(k, v)
 
+	}
 
 }
 
 
 func TestActivity(t *testing.T) {

+ 7 - 2
core/src/web/templates/swordfish/wxinfocontent.html
View File 

@@ -60,9 +60,14 @@ pre {
 
 <body>
 
 <div class="info">
 
 	<div class="title">{{.T.obj.title}}</div>
 
-	<div class="abs">文章原始连接：<a href="{{.T.obj.url}}">{{.T.obj.url}}</a></div>
 
-	<div class="content" style=""><pre>{{.T.obj.detail}}</pre></div>
 
+	<div class="abs">文章原始链接：<a href="{{.T.obj.url}}">{{.T.obj.url}}</a></div>
 
+	<div class="content" style=""><pre id="h_content" style="display:none">{{.T.obj.detail}}</pre></div>
 
 </div>
 
+<script>
 
+$(function(){
 
+	$("#h_content").html($("#h_content").text()).show();
 
+})
 
+</script>
 
 {{include "/swordfish/wxtoolbar.html"}}
 
 </body>
 
 </html>

+ 4 - 4
weixin/src/config.json
View File 

@@ -4,7 +4,7 @@
 
 	"imgpath":"/opt/qfw_dev/web/staticres",
 
 	"mongodbServers": "10.116.86.154:27080",
 
 	"elasticsearch":"http://10.116.86.154:9800",
 
-        "elasticPoolSize": 30,
 
+    "elasticPoolSize": 30,
 
 	"mongodbPoolSize":5,
 
 	"mongodbName":"qfw",	"redisServers":"enterprise=10.116.86.154:1379,service=10.116.86.154:2379,other=10.116.86.154:3379,sso=10.116.86.154:1379,credit=10.116.86.154:4379",
 
 	"rpcport":"83",
 
@@ -13,8 +13,8 @@
 
 	"appid":"wx9852f95aa927e646",
 
 	"token":"topnet2015",
 
 	"appsecret":"d4624c36b6795d1d99dcf0547af5443d",
 
-        "aboutmeurl":"http://www.qimingxing.info/article/aboutme",
 
-        "conactusurl":"http://www.qimingxing.info/article/contactus",
 
+    "aboutmeurl":"http://www.qimingxing.info/article/aboutme",
 
+    "conactusurl":"http://www.qimingxing.info/article/contactus",
 
 	"wsqurl": "http://s.p.qq.com/pub/jump?d=AAAXeGLZ",
 
 	"entAuthTip":"，请按向导进行操作。第1步(共2步)：请输入完整的企业名称。\n（认证过程只涉及您所在企业的公开信息。除非事先获得您的授权，企明星不会将您的个人隐私信息公开或透露给第三方机构。输入q或Q,退出认证操作。）",
 
 	"perAuthTip":"，请按向导进行操作。第1步(共2步)：请输入商家名称。\n（除非事先获得您的授权，企明星不会将您的个人隐私信息公开或透露给第三方机构。输入q或Q,退出认证操作。）",
 
@@ -30,7 +30,7 @@
 
 		"managernotifytplid":"DIwMrPQToOhGfa6ZAQCCrqquzbLKajiXsKY0K_lQtWQ"
 
 	},
 
 	"activity":{
 
-		"activitycode":"topcj",
 
+	"activitycode":"topcj",
 
 		"title":"企明星新年抽奖活动进行中",
 
 		"picurl":"http://www.qimingxing.info/images/choujiang2.png",
 
 		"tuenCards":"小主，来抢新年福牌了~~\n/:handclap/:handclap/:handclap\n剑鱼君派送神秘福牌！\n/:gift<a href='%s'>小主快快点这里翻福牌!</a>/:gift"