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

application/admin/model/system/SystemLog.php

@@ -99,11 +99,13 @@ class SystemLog extends ModelBasic
         return self::page($model,$where);
     }
     /**
+     * @day
      * 删除超过90天的日志
      */
-    public static function deleteLog(){
+    public static function deleteLog($day = 90){
         $model = new self;
-        $model->where('add_time','<',time()-7776000);
+        $times = $day*86400;
+        $model->where('add_time','<',time()-$times);
         $model->delete();
     }
 }

.htaccess

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

web.config

@@ -1,13 +1,13 @@
-<rewrite> 
-<rules> 
-<rule name="OrgPage" stopProcessing="true"> 
-<match url="^(.*)$" /> 
-<conditions logicalGrouping="MatchAll"> 
-<add input="{HTTP_HOST}" pattern="^(.*)$" /> 
-<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" /> 
-<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" /> 
-</conditions> 
-<action type="Rewrite" url="index.php/{R:1}" /> 
-</rule> 
-</rules> 
+<rewrite> 
+<rules> 
+<rule name="OrgPage" stopProcessing="true"> 
+<match url="^(.*)$" /> 
+<conditions logicalGrouping="MatchAll"> 
+<add input="{HTTP_HOST}" pattern="^(.*)$" /> 
+<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" /> 
+<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" /> 
+</conditions> 
+<action type="Rewrite" url="index.php/{R:1}" /> 
+</rule> 
+</rules> 
 </rewrite>

readme.txt

@@ -1,13 +0,0 @@
-项目支持公众号商城和小程序商城可单独配置使用，如需公众号和小程序账户同步，请申请微信开放平台进行绑定
-开放平台申请地址：https://open.weixin.qq.com/
-CRMEB开源文档地址：https://gitee.com/ZhongBangKeJi/CRMEB
-帮助文档：https://gitee.com/ZhongBangKeJi/CRMEB/wikis
-技术支持QQ群：116279623
-form-builder帮助文档：https://github.com/xaboy/form-builder
-
-小程序页面路径：/application/routine/view/crmebN
-小程序后台下载开发工具，打开模版小程序模版路径
-
-开源项目不含：砍价和拼团功能
-如需砍价和拼团完功能请淘宝购买仅需49元
-官方淘宝地址：https://shop120689819.taobao.com/