Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/config.json

@@ -28,8 +28,10 @@
     "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"
-
+    "creditRpc": "127.0.0.1:8765",
+    "pushRpc": "127.0.0.1:8766",
+    "domainName": "http://www.qimingxing.info",
+    "ocr_uid": "120.25.216.197",
+    "ocr_servicekey": "91e77f8a-cb28-4fc2-96d7-5b08e7dfb6c5",
+    "ocr_servicecode": "cf22e3bb-d41c-47e0-aa44-a92984f5829d"
 }

core/src/message.json

@@ -2,7 +2,7 @@
 	"weixinrpc":"127.0.0.1:82",
 	"swordfishaction":"/swordfish/page",
 	"signature":"/member/credit/myCredit",
-	"entsearchaction":"/wx/search/enterprise/ent.html",
+	"entsearchaction":"/wx/search/enterprise/index.html",
 	"lawsearchaction":"/law/qfw/index",
 	"msiteaction":"/ent/wsite/edit",
 	"wxpushlist":"/wxpush/bidinfo/%s",

core/src/qfw/coreconfig/SysConfig.go

@@ -25,6 +25,9 @@ type config struct {
 	PushRpc         string      `json:"pushRpc"`
 	ElasticPoolSize int         `json:"elasticPoolSize"`
 	DomainName      string      `json:"domainName"`
+	Ocr_uid         string      `json:"orc_uid"`
+	Ocr_servicekey  string      `json:"ocr_servicekey"`
+	Ocr_servicecode string      `json:"ocr_servicecode"`
 }
 type smtp struct {
 	Addr     string `json:"addr"`

core/src/qfw/coreutil/imagemsghandler.go

@@ -0,0 +1,42 @@
+package coreutil
+
+import (
+	"bytes"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+	cf "qfw/coreconfig"
+)
+
+//名片识别
+func CardRecognition(picpath string) []interface{} {
+	comps := []interface{}{}
+	//识别
+	fi, _ := os.Open(picpath)
+	bs, _ := ioutil.ReadAll(fi)
+	fi.Close()
+	hurl := fmt.Sprintf("http://api.hanvon.com/rt/ws/v1/ocr/bcard/recg?key=%s&code=%s",
+		cf.SysConfig.Ocr_servicekey, cf.SysConfig.Ocr_servicecode)
+	body := map[string]interface{}{
+		"uid":   cf.SysConfig.Ocr_uid,
+		"color": "original",
+		"lang":  "auto",
+		"image": base64.StdEncoding.EncodeToString(bs),
+	}
+	bs, _ = json.Marshal(body)
+	client := &http.Client{}
+	req, _ := http.NewRequest("POST", hurl, bytes.NewReader(bs))
+	req.Header.Set("Content-Type", "application/octet-stream")
+	resp, _ := client.Do(req) //发送
+	ret, _ := ioutil.ReadAll(resp.Body)
+	resp.Body.Close()
+	ocr_ret := map[string]interface{}{}
+	json.Unmarshal(ret, &ocr_ret)
+	if v, ok := ocr_ret["comp"]; ok {
+		comps, _ = v.([]interface{})
+	}
+	return comps
+}

core/src/qfw/coreutil/weixinrpc.go

@@ -110,3 +110,21 @@ func GetShareQR(url uint32) string {
 	}, func(e interface{}) {})
 	return ret
 }
+
+//根据mediaid下载图片
+func WxDownloadImg(mediaid string) string {
+	var ret string
+	util.Try(func() {
+		client, err := rpc.DialHTTP("tcp", rpcserver)
+		defer client.Close()
+		if err != nil {
+			log.Println(err.Error())
+			return
+		}
+		err = client.Call("WeiXinRpc.DownloadMingpian", mediaid, &ret)
+		if err != nil {
+			log.Println(err.Error())
+		}
+	}, func(e interface{}) {})
+	return ret
+}

core/src/qfw/filemanage/uploadfile.go

@@ -44,7 +44,7 @@ func (m *Files) Upload() error {
 				if fileInfo.Size() > FileSize {
 					res["msg"] = "上传文件大小超出限制"
 				} else {
-					temp := getfilepath(str[len(str)-1])
+					temp := Getfilepath(str[len(str)-1])
 					err := m.SaveToFile(filetype, temp)
 					if err != nil {
 						log.Error(err.Error())
@@ -107,7 +107,7 @@ type Size interface {
 }
 
 //获取文件路径、名称
-func getfilepath(str string) (s string) {
+func Getfilepath(str string) (s string) {
 	var strs = time.Now().Format("20060102150405001")
 	var name = strs + util.GetRandom(5) + "." + str
 	var paht = "./web/staticres/upload/" + strs[:4] + "/" + strs[4:6] + "/" + strs[6:8] + "/"

core/src/qfw/search/wxsearch.go

@@ -5,14 +5,19 @@ package search
 
 import (
 	"github.com/go-xweb/xweb"
+	"regexp"
 )
 
 type Wxsearch struct {
 	*xweb.Action
+	wxEnterprise        xweb.Mapper `xweb:"/wx/search/enterprise/index.html"`             //查询首页
+	wxMingpian          xweb.Mapper `xweb:"/wx/search/enterprise/mingpian"`               //获取名片
 	wxgetEnterpriseList xweb.Mapper `xweb:"/wx/search/enterprise/([^.]*)ent([^.]*).html"` //查询企业列表
 	wxsearchEntSer      xweb.Mapper `xweb:"/wx/searchEntSer/(.*)"`                        //获取企业的服务列表
 }
 
+var mpian_reg *regexp.Regexp //名片
 func init() {
+	mpian_reg, _ = regexp.Compile("公司|集团|厂|企业|投资")
 	xweb.AddAction(&Wxsearch{})
 }

core/src/qfw/search/wxsearchservice.go

@@ -7,8 +7,10 @@ import (
 	"github.com/go-xweb/xweb"
 	"html/template"
 	"log"
+	"qfw/coreutil"
 	"qfw/front"
 	. "qfw/member"
+	"qfw/mobile"
 	. "qfw/util"
 	"qfw/util/consts"
 	"qfw/util/elastic"
@@ -17,9 +19,37 @@ import (
 	"qfw/util/redis"
 	"strconv"
 	"strings"
-	_ "strings"
 )
 
+//微信企业查询首页
+func (s *Wxsearch) WxEnterprise() error {
+	s.T["signature"] = mobile.GetSignature(s.Url())
+	return s.Render("/member/incombile/index.html", &s.T)
+}
+
+//获取名片名称
+func (s *Wxsearch) WxMingpian() error {
+	res := make(map[string]string)
+	if s.GetSession("s_m_openid") != nil {
+		serverId := s.GetString("serverId")
+		picpath := coreutil.WxDownloadImg(serverId)
+		log.Println("picpath", picpath)
+		names := coreutil.CardRecognition(picpath)
+		for k, v := range names {
+			name := fmt.Sprint(v)
+			if mpian_reg.MatchString(name) {
+				res["name"] = name
+				break
+			}
+			if k == len(names)-1 {
+				res["name"] = name
+			}
+		}
+	}
+	s.ServeJson(&res)
+	return nil
+}
+
 //获取某个企业服务列表数据
 func (search *Wxsearch) WxsearchEntSer(id string) error {
 	if search.Method() == "POST" {
@@ -83,7 +113,7 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 	//必须是登录之后的已认证用户才可以进入企业社区
 	//if ui, _ := (n.GetSession("userInfo")).(*map[string]interface{}); reqType == "m_" || (n.GetSession("userType") != nil && IntAll(n.GetSession("userType")) > 0) && ((n.GetSession("identWay") != nil && IntAll(n.GetSession("identWay")) == 1) || ((*ui)["s_pid"] != nil && (*ui)["s_pid"].(string) != "")) {
 	//n.T["uri"] = n.Uri()
-
+	i_mingpian := n.GetString("i_mingpian") //是否走名片查询
 	if len(param) == 0 {
 		//请求是表单提交，走的查询
 		//拼装查询对象
@@ -96,11 +126,20 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 			"c_zb":        n.GetString("c_zb"),
 			"all":         n.GetString("all"),
 			"c_author":    n.GetString("c_author"),
-			"cityNo":      n.GetString("cityNo"), // 是否是第一次查询并且没有选择地市，自动根据IP来设
+			"cityNo":      n.GetString("cityNo"), //是否是第一次查询并且没有选择地市，自动根据IP来设
 		}
 		//查询生成列表数据
-		data, pagination := wxsearhWebContentent(querymap, n, reqType)
-		n.Render("/search/wxentlist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+		if i_mingpian != "" {
+			data, pagination, has := wxsearhWebContententMp(querymap, n, reqType, false)
+			n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+			if !has {
+				data, pagination := wxsearhWebContentent(querymap, n, reqType)
+				n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+			}
+		} else {
+			data, pagination := wxsearhWebContentent(querymap, n, reqType)
+			n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+		}
 	} else {
 		//反转生成map
 		paramstr := param[1:]
@@ -110,12 +149,9 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 		json.Unmarshal(bs, &querymap)
 		log.Println(querymap)
 		data, pagination := wxsearhWebContentent(querymap, n, reqType)
-		n.Render("/search/wxentlist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+		n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
 	}
 	return nil
-	//} else {
-	//return n.Render("/search/entcommunity.html")
-	//}
 }
 
 //实际的查询企业社区业务逻辑
@@ -433,3 +469,123 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 	return &res, &pagination
 
 }
+
+//通过企业名片查询
+func wxsearhWebContententMp(querymap map[string]string, n *Wxsearch, reqType string, has bool) (*[]map[string]interface{}, *[]interface{}, bool) {
+	queryStr := querymap["query"]
+	fmt.Println("检索条件：", queryStr)
+	keyword := queryStr
+	var query = `{
+	    "query": {
+	        "bool": {
+	            "must": ["match": {"enterprise.EntName": {"query": "` + keyword + `","operator": "and"}}}],
+	            "must_not": {"terms": {"SourceType": ["03", "04"]}},
+	            "should": [],
+	            "minimum_should_match": 1
+	        }
+	    },
+	    "highlight": {
+	        "pre_tags": ["<span class='highlight'>"],
+	        "post_tags": ["</span>"],
+	        "fields": {
+	            "EntName": {"force_source": true},
+	            "LeRep": {"force_source": true},
+	            "s_servicenames": {"force_source": true},
+	            "RegNo": {"force_source": true},
+	            "OpScope": {"force_source": true},
+	            "s_synopsis": {"force_source": true},
+	            "stock": {"force_source": true}
+	        }
+	    },
+	    "_source": [
+	        "_id","EntName","RegOrgName","RegNo","EntType",
+	        "LeRep","EstDate","OpLocDistrictName","OpStateName",
+	        "s_servicenames","s_action","OpLocDistrict","s_submitid"
+	    ],
+	    "from": 0,"size": 10,
+	    "sort": [{"OpSint": "desc","RegCap": "desc"}]
+	}`
+	//查询列表数据
+	client := elastic.GetEsConn()
+	defer elastic.DestoryEsConn(client)
+	if client == nil {
+		return nil, nil, false
+	}
+	searchResult, err := client.Search().Index("enterprise").Type("enterprise").Source(query).Do()
+	if err != nil {
+		return nil, nil, false
+	}
+	var res []map[string]interface{}
+	if searchResult.Hits != nil {
+		resNum := len(searchResult.Hits.Hits)
+		res = make([]map[string]interface{}, resNum)
+		for i, hit := range searchResult.Hits.Hits {
+			json.Unmarshal(*hit.Source, &res[i])
+			//查询结果数据加工处理
+			for k, v := range hit.Highlight {
+				res[i][k] = v[0]
+			}
+			EntName, _ := res[i]["EntName"].(string)
+			if EntName != keyword {
+				continue
+			} else {
+				has = true
+			}
+			tmpNo := res[i]["EntType"]
+			if tmpNo != nil {
+				switch tmpNo.(string) {
+				case "4500", "6800", "6810", "6820", "7100", "7110", "7120", "7130", "7190", "9200", "6840", "2100", "2110", "2120", "2121", "2122", "2123", "2130", "2140", "2150", "2151", "2152", "2190", "2200", "2210", "2211", "2212", "2213", "2219", "2220", "2221", "2222", "2223", "2229", "4000", "4300", "4310", "4320", "4330", "4340", "4550", "4551", "4552", "4553", "4560", "5800", "5810", "5820":
+					res[i]["EntType"] = "5810"
+				}
+			}
+
+			entlerp, _ := res[i]["LeRep"].(string)
+			tmpentno, _ := res[i]["RegNo"].(string)
+			if len(keyword) < 1 {
+				tmpentno = strings.Replace(tmpentno, "highlight", "", -1)
+				EntName = strings.Replace(EntName, "highlight", "", -1)
+			}
+			res[i]["RegNo"] = template.HTML(tmpentno)
+			if tmpNo == "9600" && strings.Contains(EntName, tmpentno) {
+				res[i]["EntName"] = template.HTML(strings.Replace(EntName, tmpentno, entlerp, -1))
+			} else {
+				res[i]["EntName"] = template.HTML(EntName)
+			}
+
+			id := res[i]["s_submitid"]
+			if id != nil {
+				ud := FindById("user", id.(string), `{"i_comauthenttype":1}`)
+				res[i]["i_comauthenttype"] = (*ud)["i_comauthenttype"]
+			}
+			//
+
+			res[i]["tmpentno"] = template.HTML(tmpentno)
+			LeRep, _ := res[i]["LeRep"].(string)
+			res[i]["LeRep"] = template.HTML(LeRep)
+			s_servicenames, _ := res[i]["s_servicenames"].(string)
+			res[i]["s_servicenames"] = template.HTML(s_servicenames)
+
+			OpScope, _ := res[i]["OpScope"].(string)
+			if len(OpScope) > 0 {
+				res[i]["OpScope"] = template.HTML(OpScope)
+			}
+			s_synopsis, _ := res[i]["s_synopsis"].(string)
+			if len(s_synopsis) > 0 {
+				res[i]["s_synopsis"] = template.HTML(s_synopsis)
+			}
+			stock, _ := res[i]["stock"].(string)
+			if len(stock) > 0 {
+				res[i]["stock"] = template.HTML(stock)
+			}
+			tmpdate, _ := res[i]["EstDate"]
+			if tmpdate != nil {
+				res[i]["EstDate"] = FormatDateWithObj(&tmpdate, Date_Short_Layout)
+			} else {
+				res[i]["EstDate"] = ""
+			}
+		}
+	}
+	//生成分页
+	pagination := front.MakePagination(1, 1, 1, querymap, "/wx/search/enterprise/"+reqType+"ent_%s.html")
+	return &res, &pagination, has
+}

core/src/web/templates/member/incmobile/index.html

@@ -2,11 +2,13 @@
 <html>
 	<head>
 		<title> 企业社区-列表</title>
+		{{include "/common/inc.html"}}
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 		<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
 		<link href="/css/bootstrap.min.css" rel="stylesheet">
 		<link href="/css/mobile/incmobile.css" rel="stylesheet">
+		<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 		<style>
 			.index-bodybg{
 				color:#FFF;
@@ -71,6 +73,51 @@
 				font-size:10px;
 			}
 		</style>
+<script>
+var signature = {{.T.signature}};
+var shareTitle = "企业社区";
+var shareLink = "http://www.qimingxing.info/wx/search/enterprise/index.html";
+var shareIcon = "";
+if(typeof(signature) != "undefined" && signature != null && signature.length == 4){
+	wx.config({
+	    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+	    appId: signature[0], // 必填，公众号的唯一标识
+	    timestamp:signature[1], // 必填，生成签名的时间戳
+	    nonceStr: signature[2], // 必填，生成签名的随机串
+	    signature: signature[3],// 必填，签名，见附录1
+	    jsApiList: ['onMenuShareTimeline','onMenuShareAppMessage',
+					'chooseImage','uploadImage','downloadImage']
+	});
+	wx.ready(function () {
+        wx.onMenuShareTimeline({
+		    title: shareTitle, // 分享标题
+		    link: shareLink, // 分享链接
+		    imgUrl: shareIcon, // 分享图标
+		    success: function () { 
+		       //alert('分享成功');
+		    },
+		    cancel: function () { 
+		       //alert('分享失败，或用户取消了');
+		    }
+		});
+
+		wx.onMenuShareAppMessage({
+		    title: shareTitle, // 分享标题
+		    desc: '企明星企业', // 分享描述
+		    link:  shareLink,// 分享链接
+		    imgUrl: shareIcon, // 分享图标
+		    type: 'link', // 分享类型,music、video或link，不填默认为link'
+		    dataUrl: '', // 如果type是music或video，则要提供数据链接，默认为空
+		    success: function () { 
+		        //alert('分享成功');
+		    },
+		    cancel: function () { 
+				//alert('分享失败，或用户取消了');
+		    }
+		});
+    });
+}	
+</script>
 	</head>
 <body class="index-bodybg">
 		<div class="main">
@@ -99,5 +146,43 @@
 						</div>
 	      </div>
 		</footer>
+
+<script>
+$(".input-group-addon").click(function(){
+alert();
+	wx.chooseImage({
+	    count: 1, // 默认9
+	    sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
+	    sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+	    success: function (res) {
+	        var localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
+			uploadImage(localIds[0]);
+	 	}
+	});
+})
+
+function uploadImage(localId){
+	wx.uploadImage({
+	    localId: localId, // 需要上传的图片的本地ID，由chooseImage接口获得
+	    isShowProgressTips: 1, // 默认为1，显示进度提示
+	    success: function (res) {
+	        getmpname(res.serverId); // 返回图片的服务器端ID
+	 	}
+	});
+} 
+//获取企业名称
+function getmpname(serverId){
+	$.ajax({ 
+        type: 'post', 
+        url: '/wx/search/enterprise/mingpian', 
+		data:{serverId:serverId},
+        cache: false, 
+        error: function(){return false;}, 
+        success:function(obj){
+			alert(obj["name"]);
+        } 
+    }); 
+}
+</script>
 </body>
 </html>

core/src/web/templates/search/wxent.html

@@ -0,0 +1,107 @@
+<html>
+<head>
+<title>{{Msg "seo" "qfw.enterprise.title"}}</title>
+<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
+{{include "/common/inc.html"}}
+<link href="/css/entcommunity.css" rel="stylesheet">
+<meta name="Keywords" content="{{Msg "seo" "qfw.enterprise.key"}}"/>
+<meta name="Description" content="{{Msg "seo" "qfw.enterprise.description"}}"/>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script>
+var signature = {{.T.signature}};
+var shareTitle = "企业社区";
+var shareLink = "http://www.qimingxing.info/wx/search/enterprise/wxent.html";
+var shareIcon = "";
+if(typeof(signature) != "undefined" && signature != null && signature.length == 4){
+	wx.config({
+	    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+	    appId: signature[0], // 必填，公众号的唯一标识
+	    timestamp:signature[1], // 必填，生成签名的时间戳
+	    nonceStr: signature[2], // 必填，生成签名的随机串
+	    signature: signature[3],// 必填，签名，见附录1
+	    jsApiList: ['onMenuShareTimeline','onMenuShareAppMessage',
+					'chooseImage','uploadImage','downloadImage']
+	});
+	wx.ready(function () {
+        wx.onMenuShareTimeline({
+		    title: shareTitle, // 分享标题
+		    link: shareLink, // 分享链接
+		    imgUrl: shareIcon, // 分享图标
+		    success: function () { 
+		       //alert('分享成功');
+		    },
+		    cancel: function () { 
+		       //alert('分享失败，或用户取消了');
+		    }
+		});
+
+		wx.onMenuShareAppMessage({
+		    title: shareTitle, // 分享标题
+		    desc: '企明星企业', // 分享描述
+		    link:  shareLink,// 分享链接
+		    imgUrl: shareIcon, // 分享图标
+		    type: 'link', // 分享类型,music、video或link，不填默认为link'
+		    dataUrl: '', // 如果type是music或video，则要提供数据链接，默认为空
+		    success: function () { 
+		        //alert('分享成功');
+		    },
+		    cancel: function () { 
+				//alert('分享失败，或用户取消了');
+		    }
+		});
+		
+		
+    });
+}	
+</script>
+</head>
+<body>
+<div class="b-content container-fluid">
+	 <div class="b-com-third input-group">
+		<input type="text" class="form-control"　name="entIndexSearch" id="header-searchInput"　placeholder="找企业" 　aria-describedby="search-btn"　value="">　
+		<span class="input-group-addon" id="search-btn"><span class="glyphicon sousuo"></span>照相</span>
+	</div>
+ <img src="" id="testimg"/>
+
+</div>
+<script>
+$("#search-btn").click(function(){
+	wx.chooseImage({
+	    count: 1, // 默认9
+	    sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
+	    sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+	    success: function (res) {
+	        var localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
+			uploadImage(localIds[0]);
+	 	}
+	});
+})
+function uploadImage(localId){
+	wx.uploadImage({
+	    localId: localId, // 需要上传的图片的本地ID，由chooseImage接口获得
+	    isShowProgressTips: 1, // 默认为1，显示进度提示
+	    success: function (res) {
+	        var serverId = res.serverId; // 返回图片的服务器端ID
+			alert(serverId);
+			//document.write(serverId);
+			getmpname(serverId);
+	 	}
+	});
+} 
+ 
+//获取企业名称
+function getmpname(serverId){
+	$.ajax({ 
+        type: 'post', 
+        url: '/wx/search/enterprise/mingpian', 
+		data:{serverId:serverId},
+        cache: false, 
+        error: function(){return false;}, 
+        success:function(obj){
+			alert(obj["name"]);
+        } 
+    }); 
+}
+</script>
+</body>
+</html>

weixin/src/qfw/weixin/imagemsghandler.go

@@ -1,15 +1,6 @@
 package weixin
 
 import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"github.com/disintegration/imaging"
-	"io/ioutil"
-	"math"
-	"net/http"
-
 	"log"
 	"os"
 	"qfw/util"
@@ -18,14 +9,6 @@ import (
 	"time"
 )
 
-const (
-	OCR_SERVERKEY   = "1fb48799-5379-485c-9047-f886b535759b"
-	OCR_SERVICECODE = "cf22e3bb-d41c-47e0-aa44-a92984f5829d"
-)
-
-var upload_lock chan bool = make(chan bool, 500) //支持500并发
-var max_size float64 = 1200                      //最大1200像素
-
 //微信图像处理
 func ImageMsgHandler(w ResponseWriter, r *Request) {
 	//TODO 先验证是否存在用户，
@@ -36,13 +19,7 @@ func ImageMsgHandler(w ResponseWriter, r *Request) {
 			return
 		}
 		processIndenfyUpload(us, openid, w, r)
-	} else { //走的是名片识别
-		//TODO 需要加上调用次数限制
-		upload_lock <- true
-		go cardRecognition(r.MediaId, r.FromUserName)
-		w.ReplyOK()
 	}
-
 }
 
 func processIndenfyUpload(us *usersession, openid string, w ResponseWriter, r *Request) {
@@ -78,82 +55,3 @@ func getSavePath() string {
 
 	return path + name
 }
-
-//名片识别
-func cardRecognition(mediaid, openid string) {
-	defer func() {
-		<-upload_lock
-	}()
-	//下载
-	picpath := getSavePath()
-	err := Mux.DownloadMediaToFile(mediaid, wf.SysConfig.Imgpath+picpath)
-	if err != nil {
-		log.Println(err.Error())
-		return
-	}
-	//图像处理
-	fi, _ := os.Open(wf.SysConfig.Imgpath + picpath)
-	srcimg, err := imaging.Decode(fi)
-	fi.Close()
-	if err != nil {
-		log.Println("read image file:::", err.Error())
-	}
-	bound := srcimg.Bounds().Size()
-	log.Println(bound.X, bound.Y)
-	w, h := bound.X, bound.Y
-	if max := math.Max(float64(w), float64(h)); max > max_size {
-		bl := max / max_size
-		w = int(float64(w) / bl)
-		h = int(float64(h) / bl)
-	}
-	small_file := wf.SysConfig.Imgpath + getSavePath()
-	destimg := imaging.Resize(srcimg, w, h, imaging.Linear)
-	imaging.Save(destimg, small_file)
-	//识别
-	fi, _ = os.Open(small_file)
-	bs, _ := ioutil.ReadAll(fi)
-	fi.Close()
-	hurl := fmt.Sprintf("http://api.hanvon.com/rt/ws/v1/ocr/bcard/recg?key=%s&code=%s",
-		OCR_SERVERKEY, OCR_SERVICECODE)
-	body := map[string]interface{}{
-		"uid":   "123.160.231.13",
-		"color": "original",
-		"lang":  "auto",
-		"image": base64.StdEncoding.EncodeToString(bs),
-	}
-	bs, _ = json.Marshal(body)
-	//
-	client := &http.Client{}
-	req, _ := http.NewRequest("POST", hurl, bytes.NewReader(bs))
-	req.Header.Set("Content-Type", "application/octet-stream")
-	resp, _ := client.Do(req) //发送
-	ret, _ := ioutil.ReadAll(resp.Body)
-	resp.Body.Close()
-	log.Println(string(ret))
-	ocr_ret := map[string]interface{}{}
-	json.Unmarshal(ret, &ocr_ret)
-	if v, ok := ocr_ret["comp"]; ok {
-		comps, _ := v.([]interface{})
-		if len(comps) > 0 {
-			searchcomp := comps[0].(string)
-			//发送客服消息
-			var msg struct {
-				ToUser  string `json:"touser"`
-				MsgType string `json:"msgtype"`
-				Text    struct {
-					Content string `json:"content"`
-				} `json:"text"`
-			}
-			msg.ToUser = openid
-			msg.MsgType = "text"
-			msg.Text.Content = searchcomp
-			bs, err := Mux.PostCustomMsg("https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=", msg)
-			if err != nil {
-				log.Println(err.Error())
-			} else {
-				log.Println(string(bs))
-			}
-		}
-	}
-
-}

weixin/src/qfw/weixin/rpc/downimg.go

@@ -0,0 +1,34 @@
+// downloadimg
+package rpc
+
+import (
+	"log"
+	"os"
+	"qfw/util"
+	wf "qfw/weixinconfig"
+	"time"
+)
+
+func (wxrpc *WeiXinRpc) DownloadMingpian(mediaid string, picpath *string) error {
+	*picpath = getSavePath()
+	err := wxrpc.wx.DownloadMediaToFile(mediaid, *picpath)
+	if err != nil {
+		log.Println("DownloadMingpian err", err.Error())
+		*picpath = ""
+	} else {
+		log.Println("图片路径", *picpath)
+	}
+	return nil
+}
+
+func getSavePath() string {
+	strs := time.Now().Format("20060102150405001")
+	name := strs + util.GetRandom(5) + ".jpg"
+	path := "/upload/" + strs[:4] + "/" + strs[4:6] + "/" + strs[6:8] + "/"
+	fs, err := os.Open(wf.SysConfig.Imgpath + path)
+	if err != nil {
+		os.MkdirAll(wf.SysConfig.Imgpath+path, 0700)
+	}
+	defer fs.Close()
+	return wf.SysConfig.Imgpath + path + name
+}