1.增加微信企业号。

2.修复头像上传。 3.TP框架升级为3.23
lichuanqinghuhongbo · Feb 8, 2015 · 3c47b15 · 3c47b15
1 parent a28aa8d
commit 3c47b15
Show file tree

Hide file tree

Showing 454 changed files with 156,089 additions and 5,238 deletions.
diff --git a/Application/Common/Common/function.php b/Application/Common/Common/function.php
@@ -1386,7 +1386,6 @@ function get_position_name($id) {
 
 function send_push($data, $info, $status, $user_id, $time = null) {
 	$model = M("Push");
-
 	$model -> data = $data;
 	$model -> info = $info;
 	$model -> status = $status;

diff --git a/Application/Common/Conf/config.php b/Application/Common/Conf/config.php
@@ -1,15 +1,15 @@
 <?php
 return array(
 	//'配置项'=>'配置值'	
-	'LOAD_EXT_CONFIG'	=>'db,auth,wechat',
+	'LOAD_EXT_CONFIG'	=>'db,auth',
 
-	'MULTI_MODULE' => false, // 单模块访问
+	'MULTI_MODULE' => true, // 单模块访问
 	'DEFAULT_MODULE' => 'Home', // 默认访问模块    
     'DEFAULT_FILTER' => '',
+    'MODULE_ALLOW_LIST'  => array('Home','Weixin'),
 
     /* URL配置 */
-    'URL_CASE_INSENSITIVE' => false, //默认false 表示URL区分大小写 true则表示不区分大小写
-    'URL_MODEL'            => 0, //URL模式
+    'URL_CASE_INSENSITIVE' => true, //默认false 表示URL区分大小写 true则表示不区分大小写
     'VAR_URL_PARAMS'       => '', // PATHINFO URL参数变量
     'URL_PATHINFO_DEPR'    => '/', //PATHINFO URL分割符
 
@@ -25,8 +25,8 @@
     'ADMIN_AUTH_KEY'			=>'administrator',        
     'USER_AUTH_GATEWAY'=>'public/login',// 默认认证网关
     'DB_LIKE_FIELDS'            =>'content|remark',
-	'SAVE_PATH'=>"Data/Files/",
-    'SHOW_PAGE_TRACE'=>1, //显示调试信息
+
+    'SHOW_PAGE_TRACE'=>0, //显示调试信息
 
     /* 认证相关 */
     'USER_AUTH_KEY'	=>'auth_id',

diff --git a/Application/Common/Conf/db.php b/Application/Common/Conf/db.php
@@ -1,6 +1,6 @@
 <?php
 return array(
-    'URL_MODEL'=>0, // 如果你的环境不支持PATHINFO 请设置为3,
+    'URL_MODEL'=>2, // 如果你的环境不支持PATHINFO 请设置为3,
 
     /* 数据库配置 */
     'DB_TYPE'   => 'mysql', // 数据库类型

diff --git a/Application/Home/Conf/config.php b/Application/Home/Conf/config.php
@@ -10,7 +10,7 @@
 			'__JS__'     => __ROOT__ . '/Public/' . MODULE_NAME . '/js',
 		),
 		'TMPL_NO_HAVE_AUTH'=>APP_PATH.MODULE_NAME.'/View/Public/no_have_auth.html',	
-
+	'EMP_PIC_PATH'=>'./Uploads/emp_pic/',	
     /* 文件上传相关配置 */
     'DOWNLOAD_UPLOAD' => array(
         'mimes'    => '', //允许上传的文件MiMe类型

diff --git a/Application/Home/Controller/FileModel.class.php b/Application/Home/Controller/FileModel.class.php