Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB

.htaccess

@@ -0,0 +1,10 @@
+RewriteEngine
+on
+
+#不显示index.php
+
+RewriteCond %{REQUEST_FILENAME}
+!-d
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ index.php/$1
+[QSA,PT,L]

application/admin/controller/system/SystemAttachment.php

@@ -24,9 +24,12 @@ class SystemAttachment extends AuthController
         if($res->status==false && $res->error){
             exit(json_encode(['state'=>$res->error]));
         }
-        $fileInfo = $res->fileInfo->getinfo();
         //产品图片上传记录
         $fileInfo = $res->fileInfo->getinfo();
+        //入口是public需要替换图片路径
+        if(strpos(PUBILC_PATH,'public') == false){
+            $res->dir = str_replace('public/','',$res->dir);
+        }
         SystemAttachmentModel::attachmentAdd($res->fileInfo->getSaveName(),$fileInfo['size'],$fileInfo['type'],$res->dir,'',0);
         $info = array(
             "originalName" => $fileInfo['name'],

application/admin/controller/widget/Images.php

@@ -56,6 +56,10 @@ class Images extends AuthController
         $res = Upload::image('file',$pid.'/'.date('Ymd'));
         //产品图片上传记录
         $fileInfo = $res->fileInfo->getinfo();
+        //入口是public需要替换图片路径
+        if(strpos(PUBILC_PATH,'public') == false){
+            $res->dir = str_replace('public/','',$res->dir);
+        }
         SystemAttachmentModel::attachmentAdd($res->fileInfo->getSaveName(),$fileInfo['size'],$fileInfo['type'],$res->dir,'',$pid);
         $info = array(
 //            "originalName" => $fileInfo['name'],

application/admin/view/public/style.php

@@ -5,7 +5,7 @@
     requirejs.config({
         map: {
             '*': {
-                'css': '/public/static/plug/requirejs/require-css.js'
+                'css': "{__PUBLIC_PATH}static/plug/requirejs/require-css.js"
             }
         },
         shim:{
@@ -16,7 +16,7 @@
                 deps:['css!layercss']
             }
         },
-        baseUrl:'//'+location.hostname+'/public',
+        baseUrl:'//'+location.hostname+"{__PUBLIC_PATH}",
         paths: {
             'static':'static',
             'system':'system',

application/common.php

@@ -20,7 +20,7 @@
 function sensitive_words_filter($str)
 {
     if (!$str) return '';
-    $file = ROOT_PATH. 'public/static/plug/censorwords/CensorWords';
+    $file = ROOT_PATH. PUBILC_PATH.'static/plug/censorwords/CensorWords';
     $words = file($file);
     foreach($words as $word)
     {

application/config.php

@@ -144,13 +144,13 @@ return [
 
     // 视图输出字符串内容替换
     'view_replace_str'       => [
-        '{__ADMIN_PATH}'=>'/public/system/',
-        '{__FRAME_PATH}'=>'/public/system/frame/',
-        '{__PLUG_PATH}'=>'/public/static/plug/',
-        '{__MODULE_PATH}'=>'/public/system/module/',
-        '{__STATIC_PATH}'=>'/public/static/',
-        '{__PUBLIC_PATH}'=>'/public/',
-        '{__WAP_PATH}'=>'/public/wap/'
+        '{__ADMIN_PATH}'=>PUBILC_PATH.'system/',
+        '{__FRAME_PATH}'=>PUBILC_PATH.'system/frame/',
+        '{__PLUG_PATH}'=>PUBILC_PATH.'static/plug/',
+        '{__MODULE_PATH}'=>PUBILC_PATH.'system/module/',
+        '{__STATIC_PATH}'=>PUBILC_PATH.'static/',
+        '{__PUBLIC_PATH}'=>PUBILC_PATH,
+        '{__WAP_PATH}'=>PUBILC_PATH.'wap/first/static/'
     ],
     // 默认跳转页面对应的模板文件
     'dispatch_success_tmpl'  => THINK_PATH . 'tpl' . DS . 'dispatch_jump.tpl',

application/route.php

@@ -9,9 +9,10 @@
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 use \think\Route;
-
+//兼容模式 不支持伪静态可开启
+//\think\Url::root('index.php?s=');
 Route::group('admin',function(){
-    Route::rule('/index2','admin/Index/index2','get');
+//    Route::rule('/index2','admin/Index/index2','get');
 //    Route::controller('index','admin/Index');
 //    resource('system_menus','SystemMenus');
 //    Route::rule('/menus','SystemMenus','get');

application/routine/controller/Routine.php

@@ -0,0 +1,35 @@
+<?php
+namespace app\wap\controller;
+
+use service\WechatService;
+
+
+/**
+ * 微信服务器  验证控制器
+ * Class Wechat
+ * @package app\wap\controller
+ */
+class Wechat
+{
+
+    /**
+     * 微信服务器  验证
+     */
+    public function serve()
+    {
+        WechatService::serve();
+    }
+
+    /**
+     *   支付  异步回调
+     */
+    public function notify()
+    {
+        WechatService::handleNotify();
+    }
+
+
+
+}
+
+

application/version.php

@@ -1,2 +1,2 @@
-version=v2.0
+version=v2.5
 version_code=129

application/wap/config.php

@@ -36,14 +36,6 @@ return [
         // 标签库标签结束标记
         'taglib_end'   => '}',
     ],
-    // 视图输出字符串内容替换
-    'view_replace_str'       => [
-        '{__PLUG_PATH}'=>'/public/static/plug/',
-        '{__STATIC_PATH}'=>'/public/static/',
-        '{__PUBLIC_PATH}'=>'/public/',
-        '{__WAP_PATH}'=>'/application/wap/view/first/static/wap/'
-    ],
-
     'exception_handle' =>\basic\WapException::class,
     'empty_controller' =>'AuthController'
 ];

application/wap/view/first/public/requirejs.html

@@ -4,7 +4,7 @@
         urlArgs: "v=201712230955",
         map: {
             '*': {
-                'css': '/public/static/plug/requirejs/require-css.js'
+                'css': "{__PLUG_PATH}requirejs/require-css.js"
             }
         },
         shim: {
@@ -24,7 +24,7 @@
                 deps: ['css!yduicss']
             }
         },
-        baseUrl: '//' + location.hostname + '/public',
+        baseUrl: '//' + location.hostname + "{__PUBLIC_PATH}",
         paths: {
             'static': 'static',
             'vue': 'static/plug/vue/dist/vue.min',

extend/service/RoutineService.php

@@ -27,10 +27,10 @@ class RoutineService{
         $appid =        self::options()['routine_appId'] ? self::options()['routine_appId'] : '';//如果是公众号 就是公众号的appid
         $mch_id =       self::options()['pay_routine_mchid'] ? self::options()['pay_routine_mchid'] : '';
         $nonce_str =    self::nonce_str();//随机字符串
-        $spbill_create_ip = '118.190.105.59';
+        $spbill_create_ip = self::get_server_ip();
         $total_fee =    $fee*100;//因为充值金额最小是1 而且单位为分 如果是充值1元所以这里需要*100
         $trade_type = 'JSAPI';//交易类型 默认
-        $notify_url = SystemConfigService::get('site_url').Url::build('wechat/Index/notify');
+        $notify_url = SystemConfigService::get('site_url').Url::build('routine/Routine/notify');
         $post['appid'] = $appid;
         $post['attach'] = $attach;
         $post['body'] = $body;
@@ -43,9 +43,6 @@ class RoutineService{
         $post['total_fee'] = $total_fee;//总金额
         $post['trade_type'] = $trade_type;
         $sign = self::sign($post);//签名
-//        dump($sign);
-//        dump($post);
-//        exit();
         $post_xml = '<xml>
            <appid>'.$appid.'</appid>
            <attach>'.$attach.'</attach>
@@ -154,4 +151,19 @@ class RoutineService{
         }
         return $data;
     }
+
+    public static function get_server_ip() {
+        if (isset($_SERVER)) {
+            if($_SERVER['SERVER_ADDR']) {
+                $server_ip = $_SERVER['SERVER_ADDR'];
+            }
+            else {
+                $server_ip = $_SERVER['LOCAL_ADDR'];
+            }
+        }
+        else {
+            $server_ip = getenv('SERVER_ADDR');
+        }
+        return $server_ip;
+    }
 }

extend/service/UploadService.php

@@ -79,7 +79,7 @@ class UploadService
      */
     protected static function uploadDir($path, $root=null)
     {
-        if($root === null) $root = 'public' . DS . 'uploads';
+        if($root === null) $root = 'public/' . 'uploads';
         return $root . DS . $path;
     }
 

index.php

@@ -12,16 +12,18 @@ if(version_compare(PHP_VERSION,'5.5.9','<'))  die('require PHP > 5.5.9 !');
 //error_reporting(E_ALL ^ E_NOTICE);//显示除去 E_NOTICE 之外的所有错误信息
 error_reporting(E_ERROR | E_WARNING | E_PARSE);//报告运行时错误
 //检测是否已安装CrmEb系统
-if(file_exists("./install/") && !file_exists("./install/install.lock")){
+if(file_exists("./public/install/") && !file_exists("./public/install/install.lock")){
     if($_SERVER['PHP_SELF'] != '/index.php'){
         header("Content-type: text/html; charset=utf-8");
         exit("请在域名根目录下安装,如:<br/> www.xxx.com/index.php 正确 <br/>  www.xxx.com/www/index.php 错误,域名后面不能圈套目录, 但项目没有根目录存放限制,可以放在任意目录,apache虚拟主机配置一下即可");
     }
-    header('Location:/install/index.php');
+    header('Location:/public/install/index.php');
     exit();
 }
 // [ 应用入口文件 ]
 // 定义应用目录
 define('APP_PATH', __DIR__ . '/application/');
+//静态文件目录
+define('PUBILC_PATH', '/public/');
 // 加载框架引导文件
 require __DIR__ . '/thinkphp/start.php';

public/index.php

@@ -0,0 +1,29 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: honor <rongyao_xu@163.com>
+// +----------------------------------------------------------------------
+
+// 检测PHP环境
+if(version_compare(PHP_VERSION,'5.5.9','<'))  die('require PHP > 5.5.9 !');
+//error_reporting(E_ALL ^ E_NOTICE);//显示除去 E_NOTICE 之外的所有错误信息
+error_reporting(E_ERROR | E_WARNING | E_PARSE);//报告运行时错误
+//检测是否已安装CrmEb系统
+if(file_exists("./install/") && !file_exists("./install/install.lock")){
+    if($_SERVER['PHP_SELF'] != '/index.php'){
+        header("Content-type: text/html; charset=utf-8");
+        exit("请在域名根目录下安装,如:<br/> www.xxx.com/index.php 正确 <br/>  www.xxx.com/www/index.php 错误,域名后面不能圈套目录, 但项目没有根目录存放限制,可以放在任意目录,apache虚拟主机配置一下即可");
+    }
+    header('Location:/install/index.php');
+    exit();
+}
+// [ 应用入口文件 ]
+// 定义应用目录
+define('APP_PATH', __DIR__ . '/../application/');
+//静态文件目录
+define('PUBILC_PATH', '/');
+// 加载框架引导文件
+require __DIR__ . '/../thinkphp/start.php';

install/index.php

@@ -27,10 +27,11 @@ define("CRMEB_VERSION", '20180601');
 date_default_timezone_set('PRC');
 error_reporting(E_ALL & ~E_NOTICE);
 header('Content-Type: text/html; charset=UTF-8');
-define('SITEDIR', _dir_path(substr(dirname(__FILE__), 0, -8)));
+define('SITEDIR', _dir_path(substr(dirname(__FILE__), 0, -8)));//入口文件目录
+define('CRMEBDIR', _dir_path(substr(dirname(__FILE__), 0, -15)));//项目目录
 //define('SITEDIR2', substr(SITEDIR,0,-7));
-//echo SITEDIR2;
-//exit;
+//echo SITEDIR;
+//exit;SITEDIR
 //数据库
 $sqlFile = 'crmeb.sql';
 $configFile = 'config.php';
@@ -66,7 +67,7 @@ switch ($step) {
 
     case '2':
 
-        if (phpversion() < 5.5.9) {
+        if (phpversion() < 5.6) {
             die('本系统需要PHP5+MYSQL >=5.5.9环境，当前PHP版本为：' . phpversion());
         }
 
@@ -118,14 +119,23 @@ switch ($step) {
         	$file_put_contents = '<font color=red>[×]不支持</font>';
         	$err++;
         }
+        if(function_exists('bcadd')){
+            $BC = '<font color=green>[√]支持</font> ';
+        }else{
+            $BC = '<font color=red>[×]不支持</font>';
+            $err++;
+        }
+
         
         $folder = array(
-            'install',
+            'public/install',
             'public/uploads',
             'runtime',
             'runtime/cache',
 	    	'runtime/temp',
-	    	'runtime/log',        	
+	    	'runtime/log',
+            'application/database.php',
+            'application/config.php',
         );
         include_once ("./templates/step2.php");
         exit();
@@ -267,7 +277,7 @@ switch ($step) {
 						mysqli_query($conn,"truncate table ".$val[0]);
 					}		
 				}   	
-				delFile('../public/upload'); // 清空测试图片
+				delFile(CRMEBDIR.'/public/uploads'); // 清空测试图片
 			}
             //读取配置文件，并替换真实配置数据1
             $strConfig = file_get_contents(SITEDIR . 'install/' . $configFile);
@@ -279,8 +289,8 @@ switch ($step) {
             $strConfig = str_replace('#DB_PREFIX#', $dbPrefix, $strConfig);
             $strConfig = str_replace('#DB_CHARSET#', 'utf8', $strConfig);
             // $strConfig = str_replace('#DB_DEBUG#', false, $strConfig);
-            @chmod(SITEDIR . '/application/database.php',0777); //数据库配置文件的地址
-            @file_put_contents(SITEDIR . '/application/database.php', $strConfig); //数据库配置文件的地址
+            @chmod(CRMEBDIR . '/application/database.php',0777); //数据库配置文件的地址
+            @file_put_contents(CRMEBDIR . '/application/database.php', $strConfig); //数据库配置文件的地址
             
             //读取配置文件，并替换换配置
 //            $strConfig = file_get_contents(SITEDIR . '/application/config.php');
@@ -315,7 +325,7 @@ switch ($step) {
     case '5':
     	$ip = get_client_ip();
     	$host = $_SERVER['HTTP_HOST'];
-        $curent_version = file_get_contents(SITEDIR .'/application/version.php');
+        $curent_version = file_get_contents(CRMEBDIR .'/application/version.php');
         $time = time();
         $mt_rand_str = $create_date.sp_random_string(6);
         $str_constant = "<?php".PHP_EOL."define('INSTALL_DATE',".$time.");".PHP_EOL."define('SERIALNUMBER','".$mt_rand_str."');";
@@ -326,17 +336,26 @@ switch ($step) {
 }
 
 function testwrite($d) {
-    $tfile = "_test.txt";
-    $fp = @fopen($d . "/" . $tfile, "w");
-    if (!$fp) {
+    if(is_file($d)){
+        if(is_writeable($d)){
+            return true;
+        }
+        return false;
+
+    }else{
+        $tfile = "_test.txt";
+        $fp = @fopen($d . "/" . $tfile, "w");
+        if (!$fp) {
+            return false;
+        }
+        fclose($fp);
+        $rs = @unlink($d . "/" . $tfile);
+        if ($rs) {
+            return true;
+        }
         return false;
     }
-    fclose($fp);
-    $rs = @unlink($d . "/" . $tfile);
-    if ($rs) {
-        return true;
-    }
-    return false;
+
 }
 
 function sql_execute($sql, $tablepre) {

install/templates/step2.php

@@ -82,15 +82,22 @@
         </tr>
 		<?php
 		foreach($folder as $dir){
-		     $Testdir = SITEDIR.$dir;
-			 //echo "<br/>";
-		         dir_create($Testdir);
-			 if(TestWrite($Testdir)){
-			     $w = '<span class="correct_span">&radic;</span>可写 ';
-			 }else{
-			     $w = '<span class="correct_span error_span">&radic;</span>不可写 ';
-				 $err++;
-			 }
+		     $Testdir = CRMEBDIR.$dir;
+//			 echo $Testdir."<br/>";
+            if(!is_file($Testdir)){
+                if(!is_dir($Testdir)){
+                    dir_create($Testdir);
+                }
+            }
+
+             if(testwrite($Testdir)){
+                 $w = '<span class="correct_span">&radic;</span>可写 ';
+             }else{
+                 $w = '<span class="correct_span error_span">&radic;</span>不可写 ';
+                 $err++;
+             }
+
+
 			 if(is_readable($Testdir)){
 			     $r = '<span class="correct_span">&radic;</span>可读' ;
 			 }else{
@@ -106,35 +113,7 @@
 		        </tr>
 		<?php
 		}                
-		?>   
-                <tr>
-                  <td>application/database.php</td>
-                  <td>读写</td>
-                  <?php
-                     if (is_writable(SITEDIR.'application/database.php')){
-                        echo "<td><span class='correct_span'>√</span>可写 </td>
-                              <td><span class='correct_span'>√</span>可读</td>";                 
-                     }else{
-                         $err++;
-                        echo "<td><span class='correct_span error_span'>&radic;</span>不可写 </td>
-                              <td><span class='correct_span error_span'>&radic;</span>不可读</td>";                        
-                     }
-                  ?>
-                </tr>            
-                <tr>
-                  <td>application/config.php</td>
-                  <td>读写</td>
-                  <?php
-                     if (is_writable(SITEDIR.'application/config.php')){
-                        echo "<td><span class='correct_span'>√</span>可写 </td>
-                              <td><span class='correct_span'>√</span>可读</td>";                 
-                     }else{
-                         $err++;
-                        echo "<td><span class='correct_span error_span'>&radic;</span>不可写 </td>
-                              <td><span class='correct_span error_span'>&radic;</span>不可读</td>";                        
-                     }
-                  ?>
-                </tr>                                 
+		?>
       </table>
       <table width="100%">
         <tr>
@@ -154,6 +133,11 @@
           <td>建议开启</td>
           <td><?php echo $file_put_contents; ?></td>
           <td>--</td>
+        </tr> <tr>
+          <td>BC</td>
+          <td>必须扩展</td>
+          <td><?php echo $BC; ?></td>
+          <td>--</td>
         </tr>
       </table>
     </div>

install/templates/step5.php

@@ -8,7 +8,7 @@
 <?php 
 $uri = $_SERVER['REQUEST_URI'];
 $root = substr($uri, 0,strpos($uri, "install"));
-$admin = $root."../index.php/Admin/admin/";
+$admin = $root."../index.php/admin/index/";
 ?>
 </head>
 <body>
@@ -20,8 +20,8 @@ $admin = $root."../index.php/Admin/admin/";
 		<p>为了您站点的安全，安装完成后即可将网站根目录下的“install”文件夹删除，或者/install/目录下创建install.lock文件防止重复安装。<p>
       </div>
 	        <div class="bottom tac"> 
-	        <a href="../index.php/wap/" class="btn">进入前台</a>
-	        <a href="../index.php//admin/login/index.html" class="btn btn_submit J_install_btn">进入后台</a>
+	        <a href="<?php echo 'http://'.$host;?>/index.php/wap/" class="btn">进入前台</a>
+	        <a href="<?php echo 'http://'.$host;?>/index.php/admin/login/index" class="btn btn_submit J_install_btn">进入后台</a>
       </div>
       <div class=""> </div>
     </div>