Merge branch 'master' of https://git.oa00.com/mengfucius/wkcrm

# Conflicts:
#	.idea/php.xml
#	application/crm/controller/Message.php
#	config/database.php

.gitignore

@@ -1 +1,4 @@
 /runtime/
+.env
+.idea
+.Ds_Store

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/crm_php.iml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-installer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-sae" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/pclzip/pclzip" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-worker" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpexcel/PHPExcel" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-image" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-mongo" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpspec/prophecy" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/zendframework/zend-escaper" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/global-state" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/environment" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/exporter" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-docblock" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/type-resolver" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-common" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/instantiator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpspreadsheet" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpword" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/yaml" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/common" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/dom-crawler" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpexcel" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/workerman/workerman" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/simple-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-timer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-file-iterator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-text-template" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-testing" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/matrix" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit-mock-objects" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-helper" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/complex" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-queue" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-token-stream" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-migration" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/crm_php.iml" filepath="$PROJECT_DIR$/.idea/crm_php.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.user.ini

@@ -1 +0,0 @@
-open_basedir=/www/wwwroot/72crm/:/tmp/

application/common/wework/api/Api.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace app\common\wework\api;
+
+use think\Cache;
+
+class Api {
+    /**
+     * @var object 对象实例
+     */
+    protected static $instance;
+    protected static $baseUrl = 'https://qyapi.weixin.qq.com/cgi-bin/';
+
+    protected static $getAccessToken = 'gettoken';
+    protected static $contactInfo = 'externalcontact/get';
+
+    protected $corpId = '';
+    protected $corpSecret = '';
+
+    protected $accessToken = '';
+
+    function __construct($corpId, $corpSecret)
+    {
+        $this->corpId = $corpId;
+        $this->corpSecret = $corpSecret;
+    }
+
+    /**
+     * 获取客户详情
+     * @param $externalUserId
+     * @return mixed
+     */
+    function contactInfo($externalUserId) {
+        return $this->get(self::$contactInfo, [
+            'access_token' => $this->getAccessToken(),
+            'external_userid' => $externalUserId
+        ]);
+    }
+
+    /**
+     * 获取accessToken
+     * @return false|mixed
+     */
+    protected function getAccessToken() {
+        if ($this->accessToken == '') {
+            $this->accessToken = Cache::get('accessToken:' . $this->corpId);
+            if ($this->accessToken == '') {
+                $result = $this->get(self::$getAccessToken, [
+                    'corpid' => $this->corpId,
+                    'corpsecret' => $this->corpSecret
+                ]);
+                if (isset($result['access_token']) && $result['access_token']) {
+                    Cache::set('accessToken:' . $this->corpId, $result['access_token'],$result['expires_in']-60);
+                    $this->accessToken = $result['access_token'];
+                }
+            }
+        }
+        return $this->accessToken;
+    }
+
+
+
+    protected function get($action, $data) {
+        return json_decode(Curl::get(self::$baseUrl . $action,null,$data), true);
+    }
+}

application/common/wework/api/Curl.php

@@ -0,0 +1,110 @@
+<?php
+namespace app\common\wework\api;
+class Curl
+{
+    /**
+     *curl post请求
+     * @param $url
+     * @param null $header
+     * @param null $data
+     * @param bool $isHeader
+     * @return mixed
+     */
+    public static function post($url, $header = null, $data = null, $isHeader = false)
+    {
+        return self::curl('post', $url, $header, $data, $isHeader);
+    }
+
+    /**
+     *curl put请求
+     * @param $url
+     * @param null $header
+     * @param null $data
+     * @param bool $isHeader
+     * @return mixed
+     * @return bool|string
+     */
+    public static function put($url, $header = null, $data = null, $isHeader = false)
+    {
+        return self::curl('put', $url, $header, $data, $isHeader);
+    }
+
+    /**
+     *curl get请求
+     * @param $url
+     * @param null $header
+     * @param null $data
+     * @param bool $isHeader
+     * @return mixed
+     */
+    public static function get($url, $header = null, $data = null, $isHeader = false)
+    {
+        if ($data) {
+            if (is_array($data)) {
+                $data = http_build_query($data);
+            }
+            if (strpos($url, '?') === false) {
+                $url = $url . '?' . $data;
+            } else {
+                $url = $url . '&' . $data;
+            }
+        }
+        return self::curl('get', $url, $header, null, $isHeader);
+    }
+
+    /**
+     *curl请求
+     * @param $method
+     * @param $url
+     * @param null $header
+     * @param null $data
+     * @param bool $isHeader
+     * @return mixed
+     */
+    public static function curl($method, $url, $header = null, $data = null, $isHeader = false)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        if ($header) {
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+        }
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        //curl_setopt($ch,CURLOPT_FOLLOWLOCATION,1);
+        if (stripos($url, "https://") !== FALSE) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
+        }
+
+        if ($data) {
+            if (is_array($data)) {
+                $sets = array();
+                foreach ($data as $key => $val) {
+                    $sets[] = $key . '=' . urlencode($val);
+                }
+                $data = implode('&', $sets);
+            }
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        }
+
+        $method = strtolower($method);
+        if ('post' == $method) {
+            curl_setopt($ch, CURLOPT_POST, true);
+        } elseif ('put' == $method) {
+            //curl_setopt($ch,CURLOPT_PUT,true);
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
+        }
+//        curl_setopt($ch, CURLOPT_PROXY, "socks5://127.0.0.1:18080");
+
+        //获取头部信息
+        if ($isHeader) {
+            curl_setopt($ch, CURLOPT_HEADER, 1);
+        }
+
+        $output = curl_exec($ch);
+        if ($output === false) {
+            var_dump(curl_error($ch));
+        }
+        curl_close($ch);
+        return $output;
+    }
+}

application/common/wework/callback/ErrorCode.php

@@ -0,0 +1,35 @@
+<?php
+namespace app\common\wework\callback;
+/**
+ * error code 说明.
+ * <ul>
+ *    <li>-40001: 签名验证错误</li>
+ *    <li>-40002: xml解析失败</li>
+ *    <li>-40003: sha加密生成签名失败</li>
+ *    <li>-40004: encodingAesKey 非法</li>
+ *    <li>-40005: corpid 校验错误</li>
+ *    <li>-40006: aes 加密失败</li>
+ *    <li>-40007: aes 解密失败</li>
+ *    <li>-40008: 解密后得到的buffer非法</li>
+ *    <li>-40009: base64加密失败</li>
+ *    <li>-40010: base64解密失败</li>
+ *    <li>-40011: 生成xml失败</li>
+ * </ul>
+ */
+class ErrorCode
+{
+	public static $OK = 0;
+	public static $ValidateSignatureError = -40001;
+	public static $ParseXmlError = -40002;
+	public static $ComputeSignatureError = -40003;
+	public static $IllegalAesKey = -40004;
+	public static $ValidateCorpidError = -40005;
+	public static $EncryptAESError = -40006;
+	public static $DecryptAESError = -40007;
+	public static $IllegalBuffer = -40008;
+	public static $EncodeBase64Error = -40009;
+	public static $DecodeBase64Error = -40010;
+	public static $GenReturnXmlError = -40011;
+}
+
+?>

application/common/wework/callback/PKCS7Encoder.php

@@ -0,0 +1,51 @@
+<?php
+namespace app\common\wework\callback;
+
+/**
+ * PKCS7Encoder class
+ *
+ * 提供基于PKCS7算法的加解密接口.
+ */
+class PKCS7Encoder
+{
+    public static $block_size = 32;
+
+    /**
+     * 对需要加密的明文进行填充补位
+     * @param $text 需要进行填充补位操作的明文
+     * @return 补齐明文字符串
+     */
+    function encode($text)
+    {
+        $block_size = PKCS7Encoder::$block_size;
+        $text_length = strlen($text);
+        //计算需要填充的位数
+        $amount_to_pad = PKCS7Encoder::$block_size - ($text_length % PKCS7Encoder::$block_size);
+        if ($amount_to_pad == 0) {
+            $amount_to_pad = PKCS7Encoder::block_size;
+        }
+        //获得补位所用的字符
+        $pad_chr = chr($amount_to_pad);
+        $tmp = "";
+        for ($index = 0; $index < $amount_to_pad; $index++) {
+            $tmp .= $pad_chr;
+        }
+        return $text . $tmp;
+    }
+
+    /**
+     * 对解密后的明文进行补位删除
+     * @param decrypted 解密后的明文
+     * @return 删除填充补位后的明文
+     */
+    function decode($text)
+    {
+
+        $pad = ord(substr($text, -1));
+        if ($pad < 1 || $pad > PKCS7Encoder::$block_size) {
+            $pad = 0;
+        }
+        return substr($text, 0, (strlen($text) - $pad));
+    }
+
+}

application/common/wework/callback/Prpcrypt.php

@@ -0,0 +1,110 @@
+<?php
+namespace app\common\wework\callback;
+
+/**
+ * Prpcrypt class
+ *
+ * 提供接收和推送给公众平台消息的加解密接口.
+ */
+class Prpcrypt
+{
+    public $key = null;
+    public $iv = null;
+
+    /**
+     * Prpcrypt constructor.
+     * @param $k
+     */
+    public function __construct($k)
+    {
+        $this->key = base64_decode($k . '=');
+        $this->iv = substr($this->key, 0, 16);
+
+    }
+
+    /**
+     * 加密
+     *
+     * @param $text
+     * @param $receiveId
+     * @return array
+     */
+    public function encrypt($text, $receiveId)
+    {
+        try {
+            //拼接
+            $text = $this->getRandomStr() . pack('N', strlen($text)) . $text . $receiveId;
+            //添加PKCS#7填充
+            $pkc_encoder = new PKCS7Encoder;
+            $text = $pkc_encoder->encode($text);
+            //加密
+            if (function_exists('openssl_encrypt')) {
+                $encrypted = openssl_encrypt($text, 'AES-256-CBC', $this->key, OPENSSL_ZERO_PADDING, $this->iv);
+            } else {
+                $encrypted = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $this->key, base64_decode($text), MCRYPT_MODE_CBC, $this->iv);
+            }
+            return array(ErrorCode::$OK, $encrypted);
+        } catch (Exception $e) {
+            print $e;
+            return array(MyErrorCode::$EncryptAESError, null);
+        }
+    }
+
+    /**
+     * 解密
+     *
+     * @param $encrypted
+     * @param $receiveId
+     * @return array
+     */
+    public function decrypt($encrypted, $receiveId)
+    {
+        try {
+            //解密
+            if (function_exists('openssl_decrypt')) {
+                $decrypted = openssl_decrypt($encrypted, 'AES-256-CBC', $this->key, OPENSSL_ZERO_PADDING, $this->iv);
+            } else {
+                $decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $this->key, base64_decode($encrypted), MCRYPT_MODE_CBC, $this->iv);
+            }
+        } catch (Exception $e) {
+            return array(ErrorCode::$DecryptAESError, null);
+        }
+        try {
+            //删除PKCS#7填充
+            $pkc_encoder = new PKCS7Encoder;
+            $result = $pkc_encoder->decode($decrypted);
+            if (strlen($result) < 16) {
+                return array();
+            }
+            //拆分
+            $content = substr($result, 16, strlen($result));
+            $len_list = unpack('N', substr($content, 0, 4));
+            $xml_len = $len_list[1];
+            $xml_content = substr($content, 4, $xml_len);
+            $from_receiveId = substr($content, $xml_len + 4);
+        } catch (Exception $e) {
+            print $e;
+            return array(ErrorCode::$IllegalBuffer, null);
+        }
+        if ($from_receiveId != $receiveId) {
+            return array(ErrorCode::$ValidateCorpidError, null);
+        }
+        return array(0, $xml_content);
+    }
+
+    /**
+     * 生成随机字符串
+     *
+     * @return string
+     */
+    private function getRandomStr()
+    {
+        $str = '';
+        $str_pol = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyl';
+        $max = strlen($str_pol) - 1;
+        for ($i = 0; $i < 16; $i++) {
+            $str .= $str_pol[mt_rand(0, $max)];
+        }
+        return $str;
+    }
+}

application/common/wework/callback/SHA1.php

@@ -0,0 +1,34 @@
+<?php
+namespace app\common\wework\callback;
+
+/**
+ * SHA1 class
+ *
+ * 计算公众平台的消息签名接口.
+ */
+class SHA1
+{
+    /**
+     * 用SHA1算法生成安全签名
+     * @param string $token 票据
+     * @param string $timestamp 时间戳
+     * @param string $nonce 随机字符串
+     * @param string $encrypt 密文消息
+     */
+    public function getSHA1($token, $timestamp, $nonce, $encrypt_msg)
+    {
+        //排序
+        try {
+            $array = array($encrypt_msg, $token, $timestamp, $nonce);
+            sort($array, SORT_STRING);
+            $str = implode($array);
+            return array(ErrorCode::$OK, sha1($str));
+        } catch (Exception $e) {
+            print $e . "\n";
+            return array(ErrorCode::$ComputeSignatureError, null);
+        }
+    }
+
+}
+
+

application/common/wework/callback/WXBizMsgCrypt.php

@@ -0,0 +1,178 @@
+<?php
+namespace app\common\wework\callback;
+/**
+ * 企业微信回调消息加解密示例代码.
+ *
+ * @copyright Copyright (c) 1998-2014 Tencent Inc.
+ */
+
+
+class WXBizMsgCrypt
+{
+	private $m_sToken;
+	private $m_sEncodingAesKey;
+	private $m_sReceiveId;
+
+	/**
+	 * 构造函数
+	 * @param $token string 开发者设置的token
+	 * @param $encodingAesKey string 开发者设置的EncodingAESKey
+	 * @param $receiveId string, 不同应用场景传不同的id
+	 */
+	public function __construct($token, $encodingAesKey, $receiveId)
+	{
+		$this->m_sToken = $token;
+		$this->m_sEncodingAesKey = $encodingAesKey;
+		$this->m_sReceiveId = $receiveId;
+	}
+	
+    /*
+	*验证URL
+    *@param sMsgSignature: 签名串，对应URL参数的msg_signature
+    *@param sTimeStamp: 时间戳，对应URL参数的timestamp
+    *@param sNonce: 随机串，对应URL参数的nonce
+    *@param sEchoStr: 随机串，对应URL参数的echostr
+    *@param sReplyEchoStr: 解密之后的echostr，当return返回0时有效
+    *@return：成功0，失败返回对应的错误码
+	*/
+	public function VerifyURL($sMsgSignature, $sTimeStamp, $sNonce, $sEchoStr, &$sReplyEchoStr)
+	{
+		if (strlen($this->m_sEncodingAesKey) != 43) {
+			return ErrorCode::$IllegalAesKey;
+		}
+
+		$pc = new Prpcrypt($this->m_sEncodingAesKey);
+		//verify msg_signature
+		$sha1 = new SHA1();
+		$array = $sha1->getSHA1($this->m_sToken, $sTimeStamp, $sNonce, $sEchoStr);
+		$ret = $array[0];
+
+		if ($ret != 0) {
+			return $ret;
+		}
+
+		$signature = $array[1];
+		if ($signature != $sMsgSignature) {
+			return ErrorCode::$ValidateSignatureError;
+		}
+
+		$result = $pc->decrypt($sEchoStr, $this->m_sReceiveId);
+		if ($result[0] != 0) {
+			return $result[0];
+		}
+		$sReplyEchoStr = $result[1];
+
+		return ErrorCode::$OK;
+	}
+	/**
+	 * 将公众平台回复用户的消息加密打包.
+	 * <ol>
+	 *    <li>对要发送的消息进行AES-CBC加密</li>
+	 *    <li>生成安全签名</li>
+	 *    <li>将消息密文和安全签名打包成xml格式</li>
+	 * </ol>
+	 *
+	 * @param $replyMsg string 公众平台待回复用户的消息，xml格式的字符串
+	 * @param $timeStamp string 时间戳，可以自己生成，也可以用URL参数的timestamp
+	 * @param $nonce string 随机串，可以自己生成，也可以用URL参数的nonce
+	 * @param &$encryptMsg string 加密后的可以直接回复用户的密文，包括msg_signature, timestamp, nonce, encrypt的xml格式的字符串,
+	 *                      当return返回0时有效
+	 *
+	 * @return int 成功0，失败返回对应的错误码
+	 */
+	public function EncryptMsg($sReplyMsg, $sTimeStamp, $sNonce, &$sEncryptMsg)
+	{
+		$pc = new Prpcrypt($this->m_sEncodingAesKey);
+
+		//加密
+		$array = $pc->encrypt($sReplyMsg, $this->m_sReceiveId);
+		$ret = $array[0];
+		if ($ret != 0) {
+			return $ret;
+		}
+
+		if ($sTimeStamp == null) {
+			$sTimeStamp = time();
+		}
+		$encrypt = $array[1];
+
+		//生成安全签名
+		$sha1 = new SHA1;
+		$array = $sha1->getSHA1($this->m_sToken, $sTimeStamp, $sNonce, $encrypt);
+		$ret = $array[0];
+		if ($ret != 0) {
+			return $ret;
+		}
+		$signature = $array[1];
+
+		//生成发送的xml
+		$xmlparse = new XMLParse;
+		$sEncryptMsg = $xmlparse->generate($encrypt, $signature, $sTimeStamp, $sNonce);
+		return ErrorCode::$OK;
+	}
+
+
+	/**
+	 * 检验消息的真实性，并且获取解密后的明文.
+	 * <ol>
+	 *    <li>利用收到的密文生成安全签名，进行签名验证</li>
+	 *    <li>若验证通过，则提取xml中的加密消息</li>
+	 *    <li>对消息进行解密</li>
+	 * </ol>
+	 *
+	 * @param $msgSignature string 签名串，对应URL参数的msg_signature
+	 * @param $timestamp string 时间戳 对应URL参数的timestamp
+	 * @param $nonce string 随机串，对应URL参数的nonce
+	 * @param $postData string 密文，对应POST请求的数据
+	 * @param &$msg string 解密后的原文，当return返回0时有效
+	 *
+	 * @return int 成功0，失败返回对应的错误码
+	 */
+	public function DecryptMsg($sMsgSignature, $sTimeStamp = null, $sNonce, $sPostData, &$sMsg)
+	{
+		if (strlen($this->m_sEncodingAesKey) != 43) {
+			return ErrorCode::$IllegalAesKey;
+		}
+
+		$pc = new Prpcrypt($this->m_sEncodingAesKey);
+
+		//提取密文
+		$xmlparse = new XMLParse;
+		$array = $xmlparse->extract($sPostData);
+		$ret = $array[0];
+
+		if ($ret != 0) {
+			return $ret;
+		}
+
+		if ($sTimeStamp == null) {
+			$sTimeStamp = time();
+		}
+
+		$encrypt = $array[1];
+
+		//验证安全签名
+		$sha1 = new SHA1;
+		$array = $sha1->getSHA1($this->m_sToken, $sTimeStamp, $sNonce, $encrypt);
+		$ret = $array[0];
+
+		if ($ret != 0) {
+			return $ret;
+		}
+
+		$signature = $array[1];
+		if ($signature != $sMsgSignature) {
+			return ErrorCode::$ValidateSignatureError;
+		}
+
+		$result = $pc->decrypt($encrypt, $this->m_sReceiveId);
+		if ($result[0] != 0) {
+			return $result[0];
+		}
+		$sMsg = $result[1];
+
+		return ErrorCode::$OK;
+	}
+
+}
+

application/common/wework/callback/XMLParse.php

@@ -0,0 +1,61 @@
+<?php
+namespace app\common\wework\callback;
+
+/**
+ * XMLParse class
+ *
+ * 提供提取消息格式中的密文及生成回复消息格式的接口.
+ */
+class XMLParse
+{
+
+	/**
+	 * 提取出xml数据包中的加密消息
+	 * @param string $xmltext 待提取的xml字符串
+	 * @return string 提取出的加密消息字符串
+	 */
+	public function extract($xmltext)
+	{
+		try {
+			$xml = new \DOMDocument();
+			$xml->loadXML($xmltext);
+			$array_e = $xml->getElementsByTagName('Encrypt');
+			$encrypt = $array_e->item(0)->nodeValue;
+			return array(0, $encrypt);
+		} catch (Exception $e) {
+			print $e . "\n";
+			return array(ErrorCode::$ParseXmlError, null);
+		}
+	}
+
+	/**
+	 * 生成xml消息
+	 * @param string $encrypt 加密后的消息密文
+	 * @param string $signature 安全签名
+	 * @param string $timestamp 时间戳
+	 * @param string $nonce 随机字符串
+	 */
+	public function generate($encrypt, $signature, $timestamp, $nonce)
+	{
+		$format = "<xml>
+<Encrypt><![CDATA[%s]]></Encrypt>
+<MsgSignature><![CDATA[%s]]></MsgSignature>
+<TimeStamp>%s</TimeStamp>
+<Nonce><![CDATA[%s]]></Nonce>
+</xml>";
+		return sprintf($format, $encrypt, $signature, $timestamp, $nonce);
+	}
+
+}
+
+//
+// Test 
+/*
+$sPostData = "<xml><ToUserName><![CDATA[toUser]]></ToUserName><AgentID><![CDATA[toAgentID]]></AgentID><Encrypt><![CDATA[msg_encrypt]]></Encrypt></xml>";
+$xmlparse = new XMLParse;
+$array = $xmlparse->extract($sPostData);
+var_dump($array);
+*/
+
+
+?>

application/crm/controller/Callback.php

@@ -0,0 +1,86 @@
+<?php
+// +----------------------------------------------------------------------
+// | Description: CRM工作台
+// +----------------------------------------------------------------------
+// | Author: Michael_xu | gengxiaoxu@5kcrm.com 
+// +----------------------------------------------------------------------
+
+namespace app\crm\controller;
+
+use app\common\wework\api\Api;
+use app\common\wework\callback\WXBizMsgCrypt;
+use think\Controller;
+use think\Log;
+use think\Request;
+
+class Callback extends Controller
+{
+    public function index()
+    {
+        $wxcpt = new WXBizMsgCrypt(config('wework.token'), config('wework.encodingAesKey'), config('wework.corpId'));
+        if (Request::instance()->isPost()) {
+            $sReqMsgSig = Request::instance()->get('msg_signature');
+            $sReqTimeStamp = Request::instance()->get('timestamp');
+            $sReqNonce = Request::instance()->get('nonce');
+
+            $sReqData =Request::instance()->getContent();
+            $sMsg = "";  // 解析之后的明文
+
+            $errCode = $wxcpt->DecryptMsg($sReqMsgSig, $sReqTimeStamp, $sReqNonce, $sReqData, $sMsg);
+            if ($errCode == 0) {
+                // 解密成功，sMsg即为xml格式的明文
+                $simpleXMLElement = simplexml_load_string($sMsg,'SimpleXMLElement', LIBXML_NOCDATA);
+                switch ($simpleXMLElement->Event->__toString()) {
+                    case 'change_external_contact':
+                        $api = new Api(config('wework.corpId'), config('wework.corpSecret'));
+                        $contactInfo = $api->contactInfo('wm9nLQEAAA6lshIXRN5xdd1iZjqevSyA');
+                        foreach ($contactInfo['follow_user'] as $contactUserInfo) {
+                            if ($contactUserInfo['userid'] == $simpleXMLElement->UserID->__toString()) {
+                                $customerInfo = model('Customer')->where('name', $contactUserInfo['remark_corp_name'])->find();
+                                if ($customerInfo) {
+                                    $contactsInfo = model('Contacts')->where([
+                                        'name' => $contactUserInfo['remark'],
+                                        'customer_id' => $customerInfo['customer_id']
+                                    ])->find();
+                                    if (!$contactsInfo) {
+                                        $param = [
+                                            'business_id' => null,
+                                            'create_user_id' => 1,
+                                            'owner_user_id' => 1,
+                                            'customer_id' => $customerInfo['customer_id'],
+                                            'name' => $contactUserInfo['remark'],
+                                            'mobile' => $contactUserInfo['remark_mobiles'][0],
+                                        ];
+                                        if (model('Contacts')->createData($param)) {
+                                            Log::record('联系人添加成功');
+                                        } else {
+                                            Log::record('联系人添加失败');
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                }
+            } else {
+                print("ERR: " . $errCode . "\n\n");
+            }
+        } else {
+            $sVerifyMsgSig = Request::instance()->get('msg_signature');
+            $sVerifyTimeStamp = Request::instance()->get('timestamp');
+            $sVerifyNonce = Request::instance()->get('nonce');
+            $sVerifyEchoStr = Request::instance()->get('echostr');
+            // 需要返回的明文
+            $sEchoStr = "";
+
+            $errCode = $wxcpt->VerifyURL($sVerifyMsgSig, $sVerifyTimeStamp, $sVerifyNonce, $sVerifyEchoStr, $sEchoStr);
+            if ($errCode == 0) {
+                echo ($sEchoStr);
+                // 验证URL成功，将sEchoStr返回
+                // HttpUtils.SetResponce($sEchoStr);
+            } else {
+                print("ERR: " . $errCode . "\n\n");
+            }
+        }
+    }
+}

application/crm/controller/Message.php

@@ -56,8 +56,8 @@ class Message extends ApiCommon
     /**
      * 系统通知
      *
-     * @author Michael_xu
      * @return
+     * @author Michael_xu
      */
     public function index()
     {
@@ -172,6 +172,19 @@ class Message extends ApiCommon
             cache('checkInvoiceCount' . $userInfo['id'], $data['checkInvoice']);
             cache('checkInvoiceTime' . $userInfo['id'], time());
         }
+        # 待审核商机
+        $checkBusinessTime = cache('checkBusinessTime' . $userInfo['id']);
+        $checkBusinessCount = cache('checkBusinessCount' . $userInfo['id']);
+        if (time() <= $checkBusinessTime) {
+            $data['checkBusiness'] = (int)$checkBusinessCount;
+
+        } else {
+            $checkBusiness = $this->checkBusiness(true);
+            $data['checkBusiness'] = $checkBusiness['dataCount'] ?: 0;
+
+            cache('checkBusinessCount' . $userInfo['id'], $data['checkBusiness']);
+            cache('checkBusinessTime' . $userInfo['id'], time());
+        }
         # 待回款提醒
         $remindReceivablesPlanTime = cache('remindReceivablesPlanTime' . $userInfo['id']);
         $remindReceivablesPlanCount = cache('remindReceivablesPlanCount' . $userInfo['id']);
@@ -209,6 +222,19 @@ class Message extends ApiCommon
                 cache('endContractTime' . $userInfo['id'], time());
             }
         }
+
+        # 新增商机
+        $newBusinessTime = cache('newBusinessTime' . $userInfo['id']);
+        $newBusinessCount = cache('newBusinessCount' . $userInfo['id']);
+        if (time() <= $newBusinessTime) {
+            $data['newBusiness'] = (int)$newBusinessCount;
+        } else {
+            $newBusiness = $this->newBusiness(true);
+            $data['newBusiness'] = $newBusiness['dataCount'] ?: 0;
+            cache('newBusinessCount' . $userInfo['id'], $data['newBusiness']);
+            cache('newBusinessTime' . $userInfo['id'], time());
+        }
+
         # 待进入公海提醒
         $pool = db('crm_customer_pool')->where(['status' => 1, 'remind_conf' => 1])->count();
         if (!empty($pool)) {
@@ -301,8 +327,8 @@ class Message extends ApiCommon
 
     /**
      * 分配给我的线索
-     * @author Michael_xu
      * @return
+     * @author Michael_xu
      */
     public function followLeads($getCount = false)
     {
@@ -322,8 +348,8 @@ class Message extends ApiCommon
 
     /**
      * 分配给我的客户
-     * @author Michael_xu
      * @return
+     * @author Michael_xu
      */
     public function followCustomer($getCount = false)
     {
@@ -369,8 +395,8 @@ class Message extends ApiCommon
 
     /**
      * 待审核回款
-     * @author Michael_xu
      * @return
+     * @author Michael_xu
      */
     public function checkReceivables($getCount = false)
     {
@@ -412,10 +438,33 @@ class Message extends ApiCommon
         return $data;
     }
 
+    /**
+     * 待审核商机
+     *
+     * @return array|\think\response\Json
+     * @throws \think\exception\DbException
+     */
+    public function checkBusiness($getCount = false)
+    {
+        $param = $this->param;
+        $userId = $this->userInfo['id'];
+        $types = $param['types'];
+        if ($getCount == true) $param['getCount'] = 1;
+        # 清除与模型无关的数据
+        unset($param['types']);
+        $param['user_id'] = $userId;
+        $messageLogic = new MessageLogic();
+        $data = $messageLogic->checkBusiness($param);
+
+        if ($types == 'list') return resultArray(['data' => $data]);
+
+        return $data;
+    }
+
     /**
      * 待回款提醒
-     * @author Michael_xu
      * @return
+     * @author Michael_xu
      */
     public function remindReceivablesPlan($getCount = false)
     {
@@ -463,8 +512,8 @@ class Message extends ApiCommon
 
     /**
      * 即将到期合同
-     * @author Michael_xu
      * @return
+     * @author Michael_xu
      */
     public function endContract($getCount = false)
     {
@@ -492,7 +541,9 @@ class Message extends ApiCommon
                 $param['end_time'] = array('between', array(date('Y-m-d', time()), date('Y-m-d', time() + 86400 * $expireDay)));
                 $param['expire_remind'] = 0;
                 break;
-            case '2' : $param['end_time'] = array('lt',date('Y-m-d',time())); break;
+            case '2' :
+                $param['end_time'] = array('lt', date('Y-m-d', time()));
+                break;
         }
         $data = $contractModel->getDataList($param);
 //        p($contractModel->getLastSql());
@@ -503,9 +554,38 @@ class Message extends ApiCommon
     }
 
     /**
-     * 待进入客户池
+     * 新增商机
+     * @return
      * @author Michael_xu
+     */
+    public function newBusiness($getCount = false)
+    {
+        $param = $this->param;
+        $userInfo = $this->userInfo;
+        $types = $param['types'];
+        $type = $param['type'] ?: 1;
+        $isSub = $param['isSub'] ?: '';
+        if ($getCount == true) $param['getCount'] = 1;
+        unset($param['types']);
+        unset($param['type']);
+        unset($param['isSub']);
+        $businessModel = model('Business');
+        $param['owner_user_id'] = $userInfo['id'];
+        if ($isSub) {
+            $param['owner_user_id'] = array('in', getSubUserId(false));
+        }
+        $data = $businessModel->getDataList($param);
+//        p($contractModel->getLastSql());
+        if ($types == 'list') {
+            return resultArray(['data' => $data]);
+        }
+        return $data;
+    }
+
+    /**
+     * 待进入客户池
      * @return
+     * @author Michael_xu
      */
     public function remindCustomer($getCount = false)
     {
@@ -717,7 +797,7 @@ class Message extends ApiCommon
                     $whereData['owner_user_id'] = !empty($isSub) ? ['in', getSubUserId(false, 0, $userId)] : $userId;
                     $poolCustomers = (new \app\crm\model\Customer())->getDataList($whereData);
                     $ids = [];
-                    foreach ($poolCustomers['list'] AS $key => $value) {
+                    foreach ($poolCustomers['list'] as $key => $value) {
                         if (!empty($value['customer_id'])) $ids[] = $value['customer_id'];
                     }
                     if (!empty($ids)) Db::name('crm_customer')->whereIn('customer_id', $ids)->update(['pool_remain' => 1]);
@@ -741,7 +821,7 @@ class Message extends ApiCommon
                 $param['limit'] = 1000;
                 $receivablesPlanModel = model('ReceivablesPlan');
                 $data = $receivablesPlanModel->getDataList($param);
-                foreach ($data['list'] AS $key => $value) {
+                foreach ($data['list'] as $key => $value) {
                     $planId[] = $value['plan_id'];
                 }
             }
@@ -769,6 +849,7 @@ class Message extends ApiCommon
         cache::rm('checkContractTime' . $userId);
         cache::rm('checkReceivablesTime' . $userId);
         cache::rm('checkInvoiceTime' . $userId);
+        cache::rm('checkBusinessTime' . $userId);
         cache::rm('remindReceivablesPlanTime' . $userId);
         cache::rm('visitContractTime' . $userId);
         cache::rm('endContractTime' . $userId);

application/crm/logic/MessageLogic.php

@@ -167,6 +167,25 @@ class MessageLogic extends Common
         $data = (new InvoiceLogic())->index($request);
         return $data;
     }
+
+    /**
+     *待审核商机
+     *
+     * @author      alvin guogaobo
+     * @version     1.0 版本号
+     * @since       2021/5/26 0026 13:35
+     */
+    public function checkBusiness($param){
+        $type   = !empty($param['type'])  ? $param['type']  : 1;
+        $isSub = 1;
+        unset($param['type']);
+        $businessModel = model('Business');
+        $request = $this->whereCheck($param, $type,$isSub);
+        $request['isMessage'] = true;
+        $data = $businessModel->getDataList($request);
+        return $data;
+    }
+
     /**
      * 审批查询条件
      * @param $param

application/crm/model/Business.php

@@ -49,6 +49,7 @@ class Business extends Common
         $businessTypeId = $request['typesId']; // 针对mobile
         $businessStatusId = $request['statusId']; // 针对mobile
         $overdue = $request['overdue']; // 待办事项下需联系商机(逾期)
+        $isMessage = !empty($request['isMessage']);
         unset($request['scene_id']);
         unset($request['search']);
         unset($request['user_id']);
@@ -60,6 +61,7 @@ class Business extends Common
         unset($request['typesId']);
         unset($request['statusId']);
         unset($request['overdue']);
+        unset($request['isMessage']);
         $request = $this->fmtRequest($request);
         $requestMap = $request['map'] ?: [];
         $sceneModel = new \app\admin\model\Scene();
@@ -126,6 +128,7 @@ class Business extends Common
             $auth_user_ids = array_merge(array_unique(array_filter($auth_user_ids))) ?: ['-1'];
             $authMap['business.owner_user_id'] = array('in', $auth_user_ids);
         } else {
+            if (!$isMessage) {
                 $authMapData = [];
                 $authMapData['auth_user_ids'] = $auth_user_ids;
                 $authMapData['user_id'] = $user_id;
@@ -135,6 +138,7 @@ class Business extends Common
                         ->whereOr('business.rw_user_id', array('like', '%,' . $authMapData['user_id'] . ',%'));
                 };
             }
+        }
 
         //联系人商机
         if ($contacts_id) {
@@ -310,14 +314,14 @@ class Business extends Common
         // 处理日期（date）类型
         $dateField = $fieldModel->getFieldByFormType('crm_business', 'date');
         if (!empty($dateField)) {
-            foreach ($param AS $key => $value) {
+            foreach ($param as $key => $value) {
                 if (in_array($key, $dateField) && empty($value)) $param[$key] = null;
             }
         }
         // 处理手写签名类型
         $handwritingField = $fieldModel->getFieldByFormType('crm_business', 'handwriting_sign');
         if (!empty($handwritingField)) {
-            foreach ($param AS $key => $value) {
+            foreach ($param as $key => $value) {
                 if (in_array($key, $handwritingField)) {
                     $param[$key] = !empty($value['file_id']) ? $value['file_id'] : '';
                 }
@@ -328,7 +332,7 @@ class Business extends Common
         $locationField = $fieldModel->getFieldByFormType($this->name, 'location');
         $dateIntervalField = $fieldModel->getFieldByFormType($this->name, 'date_interval');
         $detailTableField = $fieldModel->getFieldByFormType($this->name, 'detail_table');
-        foreach ($param AS $key => $value) {
+        foreach ($param as $key => $value) {
             // 处理地址类型字段数据
             if (in_array($key, $positionField)) {
                 if (!empty($value)) {
@@ -480,14 +484,14 @@ class Business extends Common
         // 处理日期（date）类型
         $dateField = $fieldModel->getFieldByFormType('crm_business', 'date');
         if (!empty($dateField)) {
-            foreach ($param AS $key => $value) {
+            foreach ($param as $key => $value) {
                 if (in_array($key, $dateField) && empty($value)) $param[$key] = null;
             }
         }
         // 处理手写签名类型
         $handwritingField = $fieldModel->getFieldByFormType('crm_business', 'handwriting_sign');
         if (!empty($handwritingField)) {
-            foreach ($param AS $key => $value) {
+            foreach ($param as $key => $value) {
                 if (in_array($key, $handwritingField)) {
                     $param[$key] = !empty($value['file_id']) ? $value['file_id'] : '';
                 }
@@ -498,7 +502,7 @@ class Business extends Common
         $locationField = $fieldModel->getFieldByFormType($this->name, 'location');
         $dateIntervalField = $fieldModel->getFieldByFormType($this->name, 'date_interval');
         $detailTableField = $fieldModel->getFieldByFormType($this->name, 'detail_table');
-        foreach ($param AS $key => $value) {
+        foreach ($param as $key => $value) {
             // 处理地址类型字段数据
             if (in_array($key, $positionField)) {
                 if (!empty($value)) {
@@ -616,7 +620,7 @@ class Business extends Common
                     }
                 }
             }
-            foreach ($fieldGrant AS $key => $val){
+            foreach ($fieldGrant as $key => $val) {
                 //掩码相关类型字段
                 if ($val['maskType'] != 0 && $val['form_type'] == 'mobile') {
                     $pattern = "/(1[3458]{1}[0-9])[0-9]{4}([0-9]{4})/i";
@@ -665,7 +669,7 @@ class Business extends Common
         if (!empty($userId)) {
             $grantData = getFieldGrantData($userId);
             $userLevel = isSuperAdministrators($userId);
-            foreach ($dataInfo AS $key => $value) {
+            foreach ($dataInfo as $key => $value) {
                 if (!$userLevel && !empty($grantData['crm_business'])) {
                     $status = getFieldGrantStatus($key, $grantData['crm_business']);
 
@@ -728,7 +732,7 @@ class Business extends Common
             "status_id",
             'COUNT(*)' => 'count',
             'SUM(`money`)' => 'sum',
-            'type_id'
+//            'type_id'
         ])
             ->where($where)
             ->whereNotIn('is_end', '3')

application/crm/model/Contacts.php

@@ -315,11 +315,11 @@ class Contacts extends Common
         $fieldModel = new \app\admin\model\Field();
 
         // 数据验证
-        $validateResult = $this->fieldDataValidate($param, $this->name, $param['create_user_id']);
+//        $validateResult = $this->fieldDataValidate($param, $this->name, $param['create_user_id']);
-        if (!empty($validateResult)) {
+//        if (!empty($validateResult)) {
-            $this->error = $validateResult;
+//            $this->error = $validateResult;
-            return false;
+//            return false;
-        }
+//        }
         
         # 处理客户首要联系人
         $primaryStatus = Db::name('crm_contacts')->where('customer_id', $param['customer_id'])->value('contacts_id');

config/config.php

@@ -4,6 +4,8 @@
 // +----------------------------------------------------------------------
 // | Author: 
 // +----------------------------------------------------------------------
+use think\Env;
+
 error_reporting(E_ERROR | E_WARNING | E_PARSE);
 
 return [
@@ -183,7 +185,7 @@ return [
         // 驱动方式
         'type'   => 'redis',
         // 连接地址
-        'host' => '127.0.0.1',
+        'host' => Env::get('cache_host','127.0.0.1'),
         // 端口
         'port' => 6379,
         // 密码
@@ -271,5 +273,12 @@ return [
     // 商机状态组列表缓存时间（秒）
     'business_status_cache_time' => 1800,
 
+    'wework' => [
+        'corpId' => Env::get('wework_corpId',''),
+        'corpSecret' => Env::get('wework_corpSecret',''),
+        'token' => Env::get('wework_token',''),
+        'encodingAesKey' => Env::get('wework_encodingAesKey',''),
+    ],
+
     'public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkqKFcAQtIp4rlkB5LOMnViyVY/hhA6x0R9ftwtEXsAFu4hBZrm9txdEvxSrDCUsx3Zwv/gdimeOzTtfSKffdoE/DwllNP9Zu6nsr2kGRgPrRwjtlO+j2FOM0b9UY1SQ/bWE+a9oQL2jL9xMSbtX1xG/+HcMo1bT+pa6FNQzs3egmvMt75/jaxINPSraj4kgNFawSBk7qDBEqDYiQwtPTuaNW1YZIs++/gZHsCRgGs/JrAbxNpl7+v/+Z503I3I2rs/8eUM5d16NXR8M7vtobUDCTIiQOgRahO8WMadgFlwavyVCYhy/TBXyj5RUfWaS26LrEN3vkj4TjoJu5m9LQ5QIDAQAB',
 ];

config/database.php

@@ -5,11 +5,11 @@ return [
     // 服务器地址
     'hostname'        => '127.0.0.1',
     // 数据库名
-    'database'        => 'test_com',
+    'database'        => 'wkcrm',
     // 用户名
-    'username'        => 'test_com',
+    'username'        => 'root',
     // 密码
-    'password'        => 'YNKdaMS2XBHKcAh7',
+    'password'        => '123123',
     // 端口
     'hostport'        => '3306',
     // 连接dsn

config/route_crm.php

@@ -189,6 +189,8 @@ return [
     'crm/business/count' => ['crm/business/count', ['method' => 'POST']],
     // 【商机】菜单数量
     'crm/business/setPrimary' => ['crm/business/setPrimary', ['method' => 'POST']],
+    // 【商机】审批
+    'crm/business/check' => ['crm/business/check', ['method' => 'POST']],
 
     // 【合同】列表
     'crm/contract/index' => ['crm/contract/index', ['method' => 'POST']],
@@ -406,6 +408,8 @@ return [
     'crm/message/endContract' => ['crm/message/endContract', ['method' => 'POST']],
     'crm/message/remindCustomer' => ['crm/message/remindCustomer', ['method' => 'POST']],
     'crm/message/checkInvoice' => ['crm/message/checkInvoice', ['method' => 'POST']],
+    'crm/message/checkBusiness' => ['crm/message/checkBusiness', ['method' => 'POST']],
+    'crm/message/newBusiness' => ['crm/message/newBusiness', ['method' => 'POST']],
     'crm/message/visitContract' => ['crm/message/visitContract', ['method' => 'POST']],
     'crm/message/allDeal' => ['crm/message/allDeal', ['method' => 'POST']],
 
@@ -522,6 +526,10 @@ return [
     'crm/setting/appMenuConfig' => ['crm/setting/appMenuConfig', ['method' => 'POST']],
     //办公数量
     'crm/setting/oaNumber' => ['crm/setting/oaNumber', ['method' => 'POST']],
+
+    // 企业微信回调
+    'crm/callback/index' => ['crm/callback/index', ['method' => 'POST|GET']],
+
     // MISS路由
     '__miss__' => 'admin/base/miss',
 ];