修改credit

common/src/config.json

@@ -0,0 +1,35 @@
+{
+    "webServerPort": "80",
+    "redisServers": "enterprise=192.168.3.14:1379,service=192.168.3.14:2379,other=192.168.3.14:3379,sso=192.168.3.14:1379,credit=192.168.3.14:3379",
+    "useRedis": false,
+    "mongodbServers": "192.168.3.18:27080",
+    "elasticsearch": "http://192.168.3.18:9800",
+    "elasticPoolSize": 30,
+    "mongodbPoolSize": 5,
+    "mongodbName": "qfw",
+    "smtp": {
+        "addr": "smtp.exmail.qq.com",
+        "port": 465,
+        "user": "qyfw@topnet.net.cn",
+        "pwd": "qy123456",
+        "fromuser": "企明星"
+    },
+    "sms": {
+        "company": "企明星"
+    },
+    "entrelation": {
+        "level": 2,
+        "limit": 10
+    },
+    "allownfiletype": "gif,jpg,jpeg,png,doc,docx,xls,xlsx,zip,rar,pdf,txt",
+    "filesize": 15120,
+    "templateCache": false,
+    "httpCache": false,
+    "mailFailureTime": 3,
+    "chatServer": "127.0.0.1:83",
+    "chatRpc": "127.0.0.1:88",
+	"creditRpc":"127.0.0.1:8765",
+	"pushRpc":"127.0.0.1:8766",
+	"domainName":"http://www.qimingxing.info"
+
+}

core/src/qfw/manage/auditing.go

@@ -21,6 +21,7 @@ import (
 	. "qfw/util/msg"
 	"qfw/util/redis"
 	qrpc "qfw/util/rpc"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -419,6 +420,17 @@ func (s *SystemManage) Auditcontent(_id string) error {
 
 //审核用户认证信息
 func (s *SystemManage) Updateaudit() error {
+	defer func() {
+		if err := recover(); err != nil {
+			for skip := 1; ; skip++ {
+				_, file, line, ok := runtime.Caller(skip)
+				if !ok {
+					break
+				}
+				go log.Printf("%v,%v\n", file, line)
+			}
+		}
+	}()
 	s.DisableHttpCache()
 	if s.Is("GET") {
 		return s.Render("/manage/systemsetting.html")
@@ -744,20 +756,22 @@ func (s *SystemManage) Updateaudit() error {
 			if (*f)["s_m_openid"] != nil {
 				openid = (*f)["s_m_openid"].(string)
 				go func() {
-					if i_freeze == 2 || i_freeze == 1 { //管理员通知
-						if i_freeze == 2 {
-							s_remark = fmt.Sprintf(util.GetPropertie("freeze.freezeRemark", coreconfig.MessageConfig).(string), freezeremark)
-							s_result = util.GetPropertie("freeze.freezeTitle", coreconfig.MessageConfig).(string)
-							s.Session().UpdateByCustomField("id", s_submitid, "i_freeze", 2)
-						} else {
-							s_remark = util.GetPropertie("freeze.unFreezeRemark", coreconfig.MessageConfig).(string)
-							s_result = util.GetPropertie("freeze.unFreezeTitle", coreconfig.MessageConfig).(string)
+					util.Try(func() {
+						if i_freeze == 2 || i_freeze == 1 { //管理员通知
+							if i_freeze == 2 {
+								s_remark = fmt.Sprintf(util.GetPropertie("freeze.freezeRemark", coreconfig.MessageConfig).(string), freezeremark)
+								s_result = util.GetPropertie("freeze.freezeTitle", coreconfig.MessageConfig).(string)
+								s.Session().UpdateByCustomField("id", s_submitid, "i_freeze", 2)
+							} else {
+								s_remark = util.GetPropertie("freeze.unFreezeRemark", coreconfig.MessageConfig).(string)
+								s_result = util.GetPropertie("freeze.unFreezeTitle", coreconfig.MessageConfig).(string)
+							}
+							coreutil.SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: openid, Title: s_result, Detail: util.GetPropertie("freeze.manager", coreconfig.MessageConfig).(string), Remark: s_remark})
+						} else { //认证通知
+							s_detail = util.GetPropertie("indentify.success.wxdetail", coreconfig.MessageConfig).(string)
+							coreutil.SendIdentifyTplMsg(&qrpc.NotifyMsg{Openid: openid, Remark: s_remark, Detail: s_detail, Result: s_result})
 						}
-						coreutil.SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: openid, Title: s_result, Detail: util.GetPropertie("freeze.manager", coreconfig.MessageConfig).(string), Remark: s_remark})
-					} else { //认证通知
-						s_detail = util.GetPropertie("ptcindentify.success.wxdetail", coreconfig.MessageConfig).(string)
-						coreutil.SendIdentifyTplMsg(&qrpc.NotifyMsg{Openid: openid, Remark: s_remark, Detail: s_detail, Result: s_result})
-					}
+					}, func(e interface{}) {})
 				}()
 			}
 			go func() {

core/src/qfw/swordfish/swordfishmanage.go

@@ -49,10 +49,7 @@ func (s *SwordFish) RssSet() error {
 			}
 		}
 	}
-	_, list := getSwordFish(time.Now().Unix(), userId, nil, 10)
-	if len(*list) < 1 {
-		list = mongodb.Find("bidding", nil, `{"comeintime":-1}`, `{"title":1,"href":1,"publishtime":1}`, false, 0, 10)
-	}
+	list := mongodb.Find("bidding", nil, `{"comeintime":-1}`, `{"title":1,"href":1,"publishtime":1}`, false, 0, 10)
 	s.T["msgset"] = msgset
 	s.T["list"] = *list
 	return s.Render("/swordfish/rssset.html", &s.T)

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -126,7 +126,7 @@ func GetEntInfo(id string) interface{} {
 //企业黄查询结果
 func (yp *Yellowpage) EnterpriseInfo(id string) error {
 	id = strings.Split(id, "#")[0]
-	if ret, err := redis.GetBytes("enterprise", id); err == nil {
+	if ret, err := redis.GetBytes("enterprise", "enterpriseInfo_"+id); err == nil {
 		return yp.SetBody(*ret)
 	} else {
 		if info := GetEntInfo(id); info != nil {
@@ -277,7 +277,7 @@ func (yp *Yellowpage) GetRelation() error {
 		r := relation.(map[string]interface{})
 		var links *[]map[string]interface{}
 		if d, err := json.Marshal(r["links"]); err == nil && json.Unmarshal(d, &links) == nil && len(*links) > 0 {
-			if credit.AIsHasDo(credit.A_CKGXW, util.IntAll(yp.GetSession("credit_a"))) {
+			if !credit.AIsHasDo(credit.A_CKGXW, util.IntAll(yp.GetSession("credit_a"))) {
 				credit.UpuserCreditSession(yp.GetSession("userId").(string), credit.A_CKGXW, "A", nil, yp.Action)
 			}
 		}

core/src/timetask.json

@@ -1 +1,2 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 15:44:25"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 15:44:25"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 15:44:25"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 15:44:25"}},"marketisstart":true,"marketrate":300}
+

core/src/web/staticres/js/entportrait.js

@@ -69,12 +69,13 @@ function b_afterLogin(flag){
 //加载关系网
 function initRelation(){
 	if(isLogined){
-		$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 		$.post("/member/getRelation",{regNo:regNo,entName:entName},function(r){
 			if(r.flag == false){
+				$("#entrelation-nologin").addClass("hide");
 				$("#entrelation-limit,#entrelation-noauthe").removeClass("hide");
 				$("#entrelation-infovis").hide();
 			}else if(r.flag == true && (r == null || typeof(r) == "undefined" || typeof(r.relation.links) == "undefined" || r.relation.links.length == 0 || typeof(r.relation.nodes) == "undefined" || r.relation.nodes.length <= 1)){
+				$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 				relation = "";
 				$("#entrelation-infovis").hide();
 				$("#entrelation-findnull").removeClass("hide");
@@ -82,7 +83,7 @@ function initRelation(){
 				loadJS("/js/d3.v3.min.js",function(){
 					loadJS("/js/geometry.js",function(){
 						loadJS("/js/relation.js",function(){
-							$("#entrelation-limit").addClass("hide");
+							$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 							$(".entrelation").height(500);
 							relation = new Relation(legcerNo,regNo,r.relation);
 							relation.init();

core/src/web/templates/member/credit/mycredit.html

@@ -87,7 +87,7 @@
 								<td width="30%" align="center"><b>操作</b></td>
 							</tr>
 							<tr class="rowone">
-								<td width="60%" style="text-indent: 7em;">* 新用户注册，得50积分</td>
+								<td width="60%" style="text-indent: 7em;">* 新用户注册，得2000积分</td>
 								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
 								<td width="30%" style="padding:110px"></td>
 							</tr>

core/src/web/templates/swordfish/infolist.html

@@ -5,9 +5,7 @@
 </head>
 <body>
 <script type="text/javascript">
-	var lasttime=1,s_words,a_visitedindex,a_publishtime,le,f_id,a_interest;
-$(function(){
-	$(".b-nav>ul>li:eq(3)").addClass("b-nav-active");
+	var lasttime=1,a_visitedindex,a_publishtime,le,f_id;
 	var s_words = [];
 	var a_interest = [];
 	if({{.T.msgset.o_msgset.bid.a_key}}){
@@ -16,6 +14,8 @@ $(function(){
 	if({{.T.msgset.o_msgset.tender.a_key}}){
 		a_interest={{.T.msgset.o_msgset.tender.a_key}};
 	}
+$(function(){
+	$(".b-nav>ul>li:eq(3)").addClass("b-nav-active");
 	if(s_words.length!=0){
 		$("#okeywords").append(s_words.join(" ; ").replace(/\+/gm," "));
 	}else{
@@ -57,6 +57,16 @@ $(function(){
 			var str="";
 			for(var i=0;i<res.length;i++){
 				var temp=res[i];
+				var s_type = temp["s_type"];
+				s_type = "bid";
+				if(s_type == "bid"){
+					s_type = "中标";
+				}else if(s_type == "tender"){
+					s_type = "招标";
+				}
+				if(s_type != ""){
+					str+="<span style='display: none;' class='dataType'>【"+s_type+"】</span>";
+				}
 				str+=temp["s_content"];
 				a_visitedindex=temp["a_visitedindex"];
 				a_publishtime=temp["a_publishtime"];
@@ -177,17 +187,21 @@ function loadMore(){
 			var str="";
 			for(var i=0;i<res.length;i++){
 				var temp=res[i];
+				var s_type = temp["s_type"];
+				s_type = "bid";
+				if(s_type == "bid"){
+					s_type = "中标";
+				}else if(s_type == "tender"){
+					s_type = "招标";
+				}
+				if(s_type != ""){
+					str+="<span style='display: none;' class='dataType'>【"+s_type+"】</span>";
+				}
 				str+=temp["s_content"];
 				a_visitedindex=temp["a_visitedindex"];
 				a_publishtime=temp["a_publishtime"];
 				f_id=temp["_id"];
 			}
-			if({{.T.msgset.o_msgset.bid.a_key}}){
-				s_words={{.T.msgset.o_msgset.bid.a_key}};
-			}
-			if({{.T.msgset.o_msgset.tender.a_key}}){
-				a_interest={{.T.msgset.o_msgset.tender.a_key}};
-			}
 			
 			$("#conlist").append('<div id="ycwords">'+str+'</div>');
 			//
@@ -302,7 +316,7 @@ function loadMore(){
 }
 .tim{padding:21px 0px;}
 .row{margin-left:10px;margin-right:10px;}
-#ycwords>div:first-child{display:none;}
+#ycwords>div:first-of-type{display:none;}
 #forkw{margin-top: 15px;padding:10px 0px 10px 50px;background-color: #F7F8FA;color: #a0a0a0;}
 .xh{width: 10%;color:#35C5DA;font-size:15px;font-weight:bold;margin:0px 20px;float:left;display: inline-block; width:18px;text-align:right;}
 .tslist{border-bottom:1px solid #ccc;width:100%; padding:15px 0px;}

weixin/src/qfw/weixin/msgtxtchandler.go

@@ -74,15 +74,6 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 		//查改用户是否已经抽过奖
 		if dao.FindWinningRecord(r.FromUserName, wf.SysConfig.Activity["activitycode"]) {
 			w.ReplyText("小主莫贪心，每人只有一次抽奖机会呦")
-<<<<<<< HEAD
-=======
-		}*/
-		//TODO 改为查我的抽奖卷
-		if dao.GetMyCouponAmount(r.FromUserName) <= 0 {
-			w.ReplyText("对不起，你的奖劵不足。您可以查看<a href='http://www.qimingxing.info/p/'>企明星的最新活动</a>赚取积分。")
-		} else if dao.GetMyTodayDrawTimes(openid) > 0 { //检查今日抽奖次数
-			w.ReplyText("对不起，你今天的抽奖次数已经用完，请您明天再来。")
->>>>>>> 456c5e620092155af63ebe9691a745396ed266d2
 		} else {
 			targeturl := fmt.Sprintf("http://%s/activity/%s/%s", wf.SysConfig.Domain, wf.SysConfig.Activity["activitycode"], se.EncodeString(r.FromUserName))
 			log.Println("choujiang url:", targeturl)