1

src/cn/compass/entity/definition/UserRole.inc

@@ -41,6 +41,9 @@ class UserRole
 			$tmp = array("id"=>5, "title"=>"社会用户");
 			array_push($data, $tmp);
 			
+			$tmp = array("id"=>6, "title"=>"机构用户");
+			array_push($data, $tmp);
+			
 			$result = array();
 			foreach ($data as $row) {
 				$tmp2 = new UserRole($row);

src/user/if/ajax_check_user_registed.php

@@ -15,14 +15,12 @@ ErrorLogger::doOutput("Compass...ajax_check_user_registed.php....openId=" . $ope
 $result = array();
 //如果都为空说明调用错误
 if(empty($jsCode) && empty($openId)) {
-	ErrorLogger::doOutput("Compass...ajax_check_user_registed.php....1", 0);
 	$result["message"] = "参数错误！";
 	responseNG($result);
 }
 
 //有openId的情况下
 if(!empty($openId)) {
-	ErrorLogger::doOutput("Compass...ajax_check_user_registed.php....2", 0);
 	//检索数据库
 	$param['openid'] = $openId;
 	$param['delete_flg'] = false;
@@ -38,21 +36,18 @@ if(!empty($openId)) {
 
 //有code的情况下
 if(!empty($jsCode)) {
-	ErrorLogger::doOutput("Compass...ajax_check_user_registed.php....3", 0);
 	$appId = WECHAT_APP_ID;
 	$appSecret = WECHAT_APP_SECRET;
 	//调用微信接口获取用户的openId和unionId
 	//调用服务器查询并插入数据
 	$ch = curl_init();
 	$url = "https://api.weixin.qq.com/sns/jscode2session?appid=" . $appId . "&secret=" . $appSecret . "&js_code=" . $jsCode . "&grant_type=authorization_code";
-	ErrorLogger::doOutput("Compass...ajax_check_user_registed.php....url=" . $url, 0);
 	//通过code换取网页授权access_token
 	$weixin =  file_get_contents($url);
 	$json = json_decode($weixin); //对JSON格式的字符串进行编码
 	$wxArray = get_object_vars($json);//转换成数组
 	$openId = $wxArray["openid"];
 	$unionId = $wxArray["unionid"];
-	ErrorLogger::doOutput("Compass...ajax_check_user_registed.php....wxArray=" . print_r($wxArray, 1), 0);
 	if(!empty($openId)) {
 		//检索数据库
 		$param['openid'] = $openId;

src/user/if/ajax_get_user_role.php

@@ -33,6 +33,7 @@ $userMst = $userList[0];
 $result["role"] = $userMst->role;
 $result["schoolOwner"] = $userMst->school_owner;
 $result["classOwner"] = $userMst->class_owner;
+$result["governmentId"] = $userMst->government_id;
 
 ErrorLogger::doOutput("Compass...ajax_get_user_role.php....End.", 0);
 

src/user/if/ajax_leader_user_register.php

@@ -54,18 +54,18 @@ if(date("Y-m-d")> $governmentQrDat->limit_date) {
 $userMst = new UserMst();
 $userMst->openid = $openId;
 $userMst->unionid = $unionId;
+$userMst->role = 4;//4：教育局领导
 $userMst->government_id = $governmentQrDat->government_id;
 $userMst->province = $governmentQrDat->province;
 $userMst->city = $governmentQrDat->city;
 $userMst->district = $governmentQrDat->district;
 $userMst->save();
 
-//设定到session中保持
-$_SESSION['_user_'] = $user_mst;
 
 ErrorLogger::doOutput("Compass...ajax_leader_user_register.php....End.", 0);
 
-responseOK("注册成功！");
+$result["message"] = "注册成功！";
+responseOK($result);
 
 function responseNG($result) {
 	$result = array("status"=>"NG", "result"=>$result);

src/user/if/ajax_social_user_register1.php

+<?
+// 社会用户注册1【非机构】
+require_once ("../user_include.inc");
+
+ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....Start.", 0);
+
+//获取参数
+$name = ParamUtil::getRequestString("name");//用户填写的用户名称
+$mobile = ParamUtil::getRequestNumber("mobile");
+$openId = ParamUtil::getRequestString("openId");
+$unionId = ParamUtil::getRequestString("unionId");
+
+ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....name=" . $name, 0);
+ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....mobile=" . $mobile, 0);
+ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....openId=" . $openId, 0);
+ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....unionId=" . $unionId, 0);
+
+
+//参数验证
+if(empty($name) || empty($openId) || empty($unionId) || empty($mobile)) {
+	$result["message"] = "参数错误！";
+	responseNG($result);
+}
+
+//判断用户是否已经存在
+$param = array();
+$param['openid'] = $openId;
+$param['unionid'] = $unionId;
+$param['delete_flg'] = false;
+$userList = UserMst::getList($param,'id','desc', 0, 1);
+if(!empty($userList)) {
+	$result["message"] = "用户已注册！";
+	responseOK($result);
+}
+
+//用户数据插入
+$userMst = new UserMst();
+$userMst->school_no = $schoolNo;
+$userMst->class_no = $classNo;
+$userMst->original_source = $role;//此处跟role一样
+$userMst->openid = $openId;
+$userMst->unionid = $unionId;
+$userMst->name = $name;
+$userMst->mobile = $mobile;
+$userMst->role = 5; //社会用户
+
+$userMst->save();
+
+ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....End.", 0);
+
+$result["message"] = "注册成功！";
+responseOK($result);
+
+function responseNG($result) {
+	$result = array("status"=>"NG", "result"=>$result);
+	print json_encode($result);
+	exit;
+}
+function responseOK($result) {
+	$result = array("status"=>"OK", "result"=>$result);
+	print json_encode($result);
+	exit;
+}
+
+?>
\ No newline at end of file

src/user/if/ajax_social_user_register2.php

+<?
+// 社会用户注册2【机构】
+require_once ("../user_include.inc");
+
+ErrorLogger::doOutput("Compass...ajax_social_user_register2.php....Start.", 0);
+
+//获取参数
+$name = ParamUtil::getRequestString("name");//用户微信昵称
+$openId = ParamUtil::getRequestString("openId");
+$unionId = ParamUtil::getRequestString("unionId");
+$role = ParamUtil::getRequestNumber("role");
+$schoolNo = ParamUtil::getRequestString("schoolNo");
+$classNo = ParamUtil::getRequestString("classNo");
+$schoolOwner = ParamUtil::getRequestBoolean("schoolOwner", false);
+$classOwner = ParamUtil::getRequestBoolean("classOwner", false);
+
+ErrorLogger::doOutput("Compass...ajax_social_user_register2.php....name=" . $name, 0);
+ErrorLogger::doOutput("Compass...ajax_social_user_register2.php....openId=" . $openId, 0);
+ErrorLogger::doOutput("Compass...ajax_social_user_register2.php....unionId=" . $unionId, 0);
+ErrorLogger::doOutput("Compass...ajax_social_user_register2.php....schoolNo=" . $schoolNo, 0);
+ErrorLogger::doOutput("Compass...ajax_social_user_register2.php....classNo=" . $classNo, 0);
+
+//参数验证
+if(empty($name) || empty($openId) || empty($unionId) || empty($schoolNo)) {
+	$result["message"] = "参数错误！";
+	responseNG($result);
+}
+if(role<>1 && role<>2 && role<>3) {
+	$result["message"] = "参数错误！";
+	responseNG($result);
+}
+
+//判断用户是否已经存在
+$param = array();
+$param['openid'] = $openId;
+$param['unionid'] = $unionId;
+$param['delete_flg'] = false;
+$userList = UserMst::getList($param,'id','desc', 0, 1);
+if(!empty($userList)) {
+	$result["message"] = "用户已注册！";
+	responseOK($result);
+}
+
+//用户数据插入
+$userMst = new UserMst();
+$userMst->school_no = $schoolNo;
+$userMst->class_no = $classNo;
+$userMst->original_source = $role;//此处跟role一样
+$userMst->openid = $openId;
+$userMst->unionid = $unionId;
+$userMst->name = $name;
+$userMst->role = $role;
+//年龄端
+if($role == 1) {
+	$userMst->child_age = 1; //3~6岁
+} else if($role == 2) {
+	$userMst->child_age = 2; //7岁以上
+} else {
+	$userMst->child_age = 0; //不设定
+}
+$userMst->school_owner = $schoolOwner
+$userMst->class_owner = $classOwner
+$userMst->save();
+
+ErrorLogger::doOutput("Compass...ajax_social_user_register2.php....End.", 0);
+
+$result["message"] = "注册成功！";
+responseOK($result);
+
+function responseNG($result) {
+	$result = array("status"=>"NG", "result"=>$result);
+	print json_encode($result);
+	exit;
+}
+function responseOK($result) {
+	$result = array("status"=>"OK", "result"=>$result);
+	print json_encode($result);
+	exit;
+}
+
+?>
\ No newline at end of file

src/user/if/ajax_user_check_login.php

-<?
-// クラス、設定読み込み
-//判断当前客户端是否在登陆状态
-require_once ("../user_include.inc");
-
-ErrorLogger::doOutput("Koala...ajax_user_check_login.php....Start.", 0);
-
-$ta = new TemplateAction();
-if($ta->isLogin()) {
-	ErrorLogger::doOutput("Koala...ajax_user_check_login.php..LOGIN_IN..End.", 0);
-	responseStatus("LOGIN_IN");
-} else {
-	ErrorLogger::doOutput("Koala...ajax_user_check_login.php..LOGIN_OUT..End.", 0);
-	responseStatus("LOGIN_OUT");
-}
-
-function responseStatus($status) {
-	$result = array("status"=>$status);
-	print json_encode($result);
-	exit;
-}
-
-?>
\ No newline at end of file

src/user/if/ajax_user_login.php

-<?
-// クラス、設定読み込み
-require_once ("../user_include.inc");
-
-ErrorLogger::doOutput("Koala...ajax_user_login.php....Start.", 0);
-
-$mobile = ParamUtil::getRequestString("mobile");
-$verifycode = ParamUtil::getRequestString("verifycode");
-
-ErrorLogger::doOutput("Koala...ajax_user_login.php....mobile=" . $mobile, 0);
-ErrorLogger::doOutput("Koala...ajax_user_login.php....verifycode=" . $verifycode, 0);
-
-//获取不到手机号码
-if(empty($mobile)) {
-	responseNG("手机号码错误！");
-}
-
-//获取不到验证码
-if(empty($verifycode)) {
-	responseNG("验证码错误！");
-}
-
-//检测验证码
-$verification_code = @$_SESSION['verificationCode'];
-if(empty($verification_code) || $verification_code != $verifycode) {
-	responseNG("验证码错误！");
-}
-
-//检测用户是否已经注册
-$param = array();
-$param["delete_flg"] = false;
-$param["mobile"] = $mobile;
-$user_list = UserMst::getList($param);
-//存在的情况下，注册一条数据
-if(empty($user_list)) {	
-	responseNG("手机号码不存在！");
-}
-
-//清除验证码
-if(isset($_SESSION['verificationCode'])) {
-	unset($_SESSION['verificationCode']);
-}
-//设定到session中保持
-$_SESSION['_user_'] = $user_list[0];
-
-ErrorLogger::doOutput("Koala...ajax_user_login.php....End.", 0);
-
-responseOK("登陆成功！");
-
-function responseNG($message) {
-	$result = array("status"=>"NG", "message"=>$message);
-	print json_encode($result);
-	exit;
-}
-function responseOK($message) {
-	$result = array("status"=>"OK", "message"=>$message);
-	print json_encode($result);
-	exit;
-}
-
-?>
\ No newline at end of file

src/user/if/ajax_user_register.php

 <?
-// クラス、設定読み込み
+// 家校/家园/高职用户注册
 require_once ("../user_include.inc");
 
-ErrorLogger::doOutput("Koala...ajax_user_register.php....Start.", 0);
+ErrorLogger::doOutput("Compass...ajax_user_register.php....Start.", 0);
 
-$mobile = ParamUtil::getRequestString("mobile");
-$nickname = ParamUtil::getRequestString("nickname");
-$verifycode = ParamUtil::getRequestString("verifycode");
-//渠道编号，默认为系统自带
-$channel_no = ParamUtil::getRequestString("channel_no", "1000");
+//获取参数
+$name = ParamUtil::getRequestString("name");//用户微信昵称
+$openId = ParamUtil::getRequestString("openId");
+$unionId = ParamUtil::getRequestString("unionId");
+$role = ParamUtil::getRequestNumber("role");
+$schoolNo = ParamUtil::getRequestString("schoolNo");
+$classNo = ParamUtil::getRequestString("classNo");
+$schoolOwner = ParamUtil::getRequestBoolean("schoolOwner", false);
+$classOwner = ParamUtil::getRequestBoolean("classOwner", false);
 
-ErrorLogger::doOutput("Koala...ajax_user_register.php....mobile=" . $mobile, 0);
-ErrorLogger::doOutput("Koala...ajax_user_register.php....nickname=" . $nickname, 0);
-ErrorLogger::doOutput("Koala...ajax_user_register.php....verifycode=" . $verifycode, 0);
-ErrorLogger::doOutput("Koala...ajax_user_register.php....channel_no=" . $channel_no, 0);
+ErrorLogger::doOutput("Compass...ajax_user_register.php....name=" . $name, 0);
+ErrorLogger::doOutput("Compass...ajax_user_register.php....openId=" . $openId, 0);
+ErrorLogger::doOutput("Compass...ajax_user_register.php....unionId=" . $unionId, 0);
+ErrorLogger::doOutput("Compass...ajax_user_register.php....schoolNo=" . $schoolNo, 0);
+ErrorLogger::doOutput("Compass...ajax_user_register.php....classNo=" . $classNo, 0);
 
-//获取不到手机号码
-if(empty($mobile)) {
-	responseNG("请输入手机号码！");
+//参数验证
+if(empty($name) || empty($openId) || empty($unionId) || empty($schoolNo)) {
+	$result["message"] = "参数错误！";
+	responseNG($result);
 }
-//获取不到用用户名称
-if(empty($nickname)) {
-	responseNG("请输入您的姓名！");
+if(role<>1 && role<>2 && role<>3) {
+	$result["message"] = "参数错误！";
+	responseNG($result);
 }
 
-//获取不到验证码
-if(empty($verifycode)) {
-	responseNG("请输入手机验证码！");
-}
-
-//检测验证码
+//判断用户是否已经存在
 $param = array();
-$param["delete_flg"] = false;
-$param["phone"] = $mobile;
-$param["code"] = $verifycode;
-$param["is_used"] = false;
-$param["ok_flg"] = true;
-$sms_verfication_dat_list = SmsVerficationDat::getList($param, "id", "desc", 0, 1);
-if (count($sms_verfication_dat_list) < 1) {
-	responseNG("短信码验证失败，可尝试重发验证码。");
-} else {
-	$sms_verfication_dat = $sms_verfication_dat_list[0];
-	$sms_verfication_dat->is_used = true;
-	$sms_verfication_dat->save();
+$param['openid'] = $openId;
+$param['unionid'] = $unionId;
+$param['delete_flg'] = false;
+$userList = UserMst::getList($param,'id','desc', 0, 1);
+if(!empty($userList)) {
+	$result["message"] = "用户已注册！";
+	responseOK($result);
 }
 
-//检测用户是否已经注册
-$param = array();
-$param["delete_flg"] = false;
-$param["mobile"] = $mobile;
-$user_list = UserMst::getList($param);
-//存在的情况下，注册一条数据
-if(!empty($user_list)) {	
-	responseNG("您已经注册过，请关注【考拉学日语】公众号领取福利！");
+//用户数据插入
+$userMst = new UserMst();
+$userMst->school_no = $schoolNo;
+$userMst->class_no = $classNo;
+$userMst->original_source = $role;//此处跟role一样
+$userMst->openid = $openId;
+$userMst->unionid = $unionId;
+$userMst->name = $name;
+$userMst->role = $role;
+//年龄端
+if($role == 1) {
+	$userMst->child_age = 1; //3~6岁
+} else if($role == 2) {
+	$userMst->child_age = 2; //7岁以上
+} else {
+	$userMst->child_age = 0; //不设定
 }
-//不存在的情况下，注册一条数据
-$user_mst = new UserMst();
-$user_mst->nickname = $nickname;
-$user_mst->mobile = $mobile;
-$user_mst->channel_no = $channel_no;
-$user_mst->status = '1';
-$user_mst->save();
-
-//设定到session中保持
-$_SESSION['_user_'] = $user_mst;
+$userMst->school_owner = $schoolOwner
+$userMst->class_owner = $classOwner
+$userMst->save();
 
-ErrorLogger::doOutput("Koala...ajax_user_register.php....End.", 0);
+ErrorLogger::doOutput("Compass...ajax_user_register.php....End.", 0);
 
-responseOK("注册成功！");
+$result["message"] = "注册成功！";
+responseOK($result);
 
-function responseNG($message) {
-	$result = array("status"=>"NG", "message"=>$message);
-	header("Access-Control-Allow-Origin: *");
+function responseNG($result) {
+	$result = array("status"=>"NG", "result"=>$result);
 	print json_encode($result);
 	exit;
 }
-function responseOK($message) {
-	$result = array("status"=>"OK", "message"=>$message);
-	header("Access-Control-Allow-Origin: *");
+function responseOK($result) {
+	$result = array("status"=>"OK", "result"=>$result);
 	print json_encode($result);
 	exit;
 }

src/user/if/synchronize_class_dat.php

@@ -6,12 +6,12 @@ require_once ("../user_include.inc");
 ErrorLogger::doOutput("Compass...synchronize_class_dat.php....Start.", 0);
 
 //获取参数
-$schoolNo = ParamUtil::getRequestString("school_no");
-$classNo = ParamUtil::getRequestString("class_no");
-$originalSource = ParamUtil::getRequestNumber("original_source", 0);
+$schoolNo = ParamUtil::getRequestString("schoolNo");
+$classNo = ParamUtil::getRequestString("classNo");
+$originalSource = ParamUtil::getRequestNumber("originalSource", 0);
 $title = ParamUtil::getRequestString("title");
-$gradeTitle = ParamUtil::getRequestString("grade_title");
-$memberCount = ParamUtil::getRequestNumber("member_count", 0);
+$gradeTitle = ParamUtil::getRequestString("gradeTitle");
+$memberCount = ParamUtil::getRequestNumber("memberCount", 0);
 
 
 //参数检查

src/user/if/synchronize_school_dat.php

@@ -6,15 +6,14 @@ require_once ("../user_include.inc");
 ErrorLogger::doOutput("Compass...synchronize_school_dat.php....Start.", 0);
 
 //获取参数
-$schoolNo = ParamUtil::getRequestString("school_no");
-$originalSource = ParamUtil::getRequestNumber("original_source", 0);
+$schoolNo = ParamUtil::getRequestString("schoolNo");
+$originalSource = ParamUtil::getRequestNumber("originalSource", 0);
 $title = ParamUtil::getRequestString("title");
 $province = ParamUtil::getRequestString("province");
 $city = ParamUtil::getRequestString("city");
 $district = ParamUtil::getRequestString("district");
 $street = ParamUtil::getRequestString("street");
 
-
 //参数检查
 if(empty($schoolNo) || empty($originalSource) || empty($title)) {
 	responseNG("参数错误！");