md5 encription added, AS search added, autologin added
Showing
5 changed files
with
130 additions
and
61 deletions
... | @@ -222,16 +222,13 @@ if(! class_exists("ApiBase") ) { | ... | @@ -222,16 +222,13 @@ if(! class_exists("ApiBase") ) { |
222 | { | 222 | { |
223 | 223 | ||
224 | $param = Array( | 224 | $param = Array( |
225 | $loginParams["userNumber"], | 225 | $loginParams[0], |
226 | $loginParams["deviceID"], | 226 | $loginParams[1], |
227 | $loginParams["deviceTypeID"], | 227 | $loginParams[2], |
228 | $loginParams["storeTypeID"], | 228 | $loginParams[3], |
229 | $loginParams["registrationKey"], | 229 | $loginParams[4] |
230 | $loginParams["appVersion"], | ||
231 | $loginparams["appType"] | ||
232 | ) ; | 230 | ) ; |
233 | 231 | ||
234 | |||
235 | $ret = Array( | 232 | $ret = Array( |
236 | "po_returnCode" => "@po_returnCode", | 233 | "po_returnCode" => "@po_returnCode", |
237 | "po_returnMsg" => "@po_returnMsg" | 234 | "po_returnMsg" => "@po_returnMsg" |
... | @@ -242,7 +239,8 @@ if(! class_exists("ApiBase") ) { | ... | @@ -242,7 +239,8 @@ if(! class_exists("ApiBase") ) { |
242 | 239 | ||
243 | $result = $this->getMultiArray($sql) ; | 240 | $result = $this->getMultiArray($sql) ; |
244 | 241 | ||
245 | 242 | //echo $loginParams[5]; | |
243 | |||
246 | if($result[0][0]["po_returnCode"] == "-1") | 244 | if($result[0][0]["po_returnCode"] == "-1") |
247 | { | 245 | { |
248 | $loginInfo["isLogin"] = $result[0][0]["po_returnCode"]; | 246 | $loginInfo["isLogin"] = $result[0][0]["po_returnCode"]; |
... | @@ -253,7 +251,14 @@ if(! class_exists("ApiBase") ) { | ... | @@ -253,7 +251,14 @@ if(! class_exists("ApiBase") ) { |
253 | { | 251 | { |
254 | $loginInfo["isLogin"] = $result[0][0]["po_returnCode"]; | 252 | $loginInfo["isLogin"] = $result[0][0]["po_returnCode"]; |
255 | $loginInfo["loginMessage"] = $result[0][0]["po_returnMsg"]; | 253 | $loginInfo["loginMessage"] = $result[0][0]["po_returnMsg"]; |
256 | $loginInfo["loginInfo"] = $this->inFn_ApiBase_getInfoOfUser($loginParams["userNumber"]); | 254 | $loginInfo["loginInfo"] = $this->inFn_ApiBase_getInfoOfUser($loginParams[0]); |
255 | if($loginParams[5]!=$loginInfo["loginInfo"]["userPwd"]){ | ||
256 | $loginInfo["loginInfo"]=""; | ||
257 | $loginInfo["isLogin"]="-1000"; | ||
258 | $loginInfo["loginMessage"]="비밀번호를 확인하세요"; | ||
259 | return $loginInfo; | ||
260 | } | ||
261 | |||
257 | LoginUtil::doAppLogin($loginInfo["loginInfo"]); | 262 | LoginUtil::doAppLogin($loginInfo["loginInfo"]); |
258 | } | 263 | } |
259 | 264 | ||
... | @@ -289,7 +294,7 @@ if(! class_exists("ApiBase") ) { | ... | @@ -289,7 +294,7 @@ if(! class_exists("ApiBase") ) { |
289 | } | 294 | } |
290 | else | 295 | else |
291 | { | 296 | { |
292 | unset($userInfo["userPwd"]) ; | 297 | //unset($userInfo["userPwd"]) ; |
293 | } | 298 | } |
294 | 299 | ||
295 | return $userInfo; | 300 | return $userInfo; |
... | @@ -309,8 +314,7 @@ if(! class_exists("ApiBase") ) { | ... | @@ -309,8 +314,7 @@ if(! class_exists("ApiBase") ) { |
309 | { | 314 | { |
310 | $appVersion = $versionParams["appVersion"]; // APP 버전 | 315 | $appVersion = $versionParams["appVersion"]; // APP 버전 |
311 | $appTypeID = $versionParams["deviceTypeID"]; // APP 타입 | 316 | $appTypeID = $versionParams["deviceTypeID"]; // APP 타입 |
312 | $storeTypeID = $versionParams["storeTypeID"]; // store 타입 | 317 | |
313 | $appType = $versionParams["appType"]; // 1:동네 2:직장 | ||
314 | $appVersionInt = (int)str_replace(".", "", $appVersion); | 318 | $appVersionInt = (int)str_replace(".", "", $appVersion); |
315 | 319 | ||
316 | $isMustUpdate = "0"; | 320 | $isMustUpdate = "0"; |
... | @@ -318,15 +322,15 @@ if(! class_exists("ApiBase") ) { | ... | @@ -318,15 +322,15 @@ if(! class_exists("ApiBase") ) { |
318 | $sql = " | 322 | $sql = " |
319 | SELECT COUNT(*) AS isUpdate | 323 | SELECT COUNT(*) AS isUpdate |
320 | FROM tblAppVersion | 324 | FROM tblAppVersion |
321 | WHERE appTypeID = '{$appTypeID}' AND storeTypeID = '{$storeTypeID}' AND versionInt > {$appVersionInt}; | 325 | WHERE appTypeID = '{$appTypeID}' AND versionInt > {$appVersionInt}; |
322 | 326 | ||
323 | SELECT COUNT(*) AS isMustUpdate | 327 | SELECT COUNT(*) AS isMustUpdate |
324 | FROM tblAppVersion | 328 | FROM tblAppVersion |
325 | WHERE appTypeID = '{$appTypeID}' AND storeTypeID = '{$storeTypeID}' AND versionInt > {$appVersionInt} AND isMustUpdate > 0; | 329 | WHERE appTypeID = '{$appTypeID}' versionInt > {$appVersionInt} AND isMustUpdate > 0; |
326 | 330 | ||
327 | SELECT version | 331 | SELECT version |
328 | FROM tblAppVersion | 332 | FROM tblAppVersion |
329 | WHERE appTypeID = '{$appTypeID}' AND storeTypeID = '{$storeTypeID}' | 333 | WHERE appTypeID = '{$appTypeID}' |
330 | ORDER BY versionInt DESC | 334 | ORDER BY versionInt DESC |
331 | LIMIT 0, 1; | 335 | LIMIT 0, 1; |
332 | "; | 336 | "; | ... | ... |
... | @@ -432,17 +432,17 @@ if (! class_exists("ApiBoard")) | ... | @@ -432,17 +432,17 @@ if (! class_exists("ApiBoard")) |
432 | //AS엄체 리스트 | 432 | //AS엄체 리스트 |
433 | function getListOfCompany(){ | 433 | function getListOfCompany(){ |
434 | $provinceNumber=$this->req["provinceNumber"]; | 434 | $provinceNumber=$this->req["provinceNumber"]; |
435 | $cityNumber=$this->req["cityNumber"]; | 435 | $productNumber=$this->req["productNumber"]; |
436 | $searchText=$this->req["searchText"]; | 436 | $searchText=$this->req["searchText"]; |
437 | 437 | ||
438 | $where="WHERE status=1"; | 438 | $where="WHERE status=1"; |
439 | 439 | ||
440 | if(!empty($provinceNumber)){ | 440 | if(!empty($provinceNumber)){ |
441 | $where.=" AND address LIKE (SELECT abbreviation FROM tblZipProvince WHERE provinceNumber='{$provinceNumber}')"; | 441 | $where.=" AND provinceCode='{$provinceNumber}'"; |
442 | } | 442 | } |
443 | 443 | ||
444 | if(!empty($cityNumber)){ | 444 | if(!empty($productNumber)){ |
445 | $where.=" AND address LIKE (SELECT abbreviation FROM tblZipCity WHERE provinceNumber='{$provinceNumber}')"; | 445 | $where.=" AND productCode='{$productNumber}'"; |
446 | } | 446 | } |
447 | if(!empty($searchText)){ | 447 | if(!empty($searchText)){ |
448 | $where.=" AND name LIKE '%{$searchText}%'"; | 448 | $where.=" AND name LIKE '%{$searchText}%'"; |
... | @@ -662,6 +662,12 @@ if (! class_exists("ApiBoard")) | ... | @@ -662,6 +662,12 @@ if (! class_exists("ApiBoard")) |
662 | $balance=$this->req["balance"]; | 662 | $balance=$this->req["balance"]; |
663 | $specialAddition=$this->req["specialAddition"]; | 663 | $specialAddition=$this->req["specialAddition"]; |
664 | 664 | ||
665 | if(empty($requestDate) || empty($customerName) || empty($companyName) || empty($productName) || empty($telephone) || empty($userFk) || empty($balance) || empty($type) || empty($alCoil) || empty($floor) || empty($tent) || empty($sideBoard) | ||
666 | || empty($windStopper) || empty($freezer) || empty($gateType) || empty($gateSize) || empty($load) || empty($frontBack) || empty($eTrackGate) || empty($eTrackWing) || empty($toolBucket) || empty($bumperFootHold) || empty($wingProtector) | ||
667 | || empty($axis)){ | ||
668 | return $this->makeResultJson("-1", "저장오류"); | ||
669 | } | ||
670 | |||
665 | $sql=" | 671 | $sql=" |
666 | INSERT INTO tblProductionSpec( | 672 | INSERT INTO tblProductionSpec( |
667 | userFk, | 673 | userFk, |
... | @@ -803,8 +809,8 @@ if (! class_exists("ApiBoard")) | ... | @@ -803,8 +809,8 @@ if (! class_exists("ApiBoard")) |
803 | if(!empty($dateLatter)){ | 809 | if(!empty($dateLatter)){ |
804 | $where .= " AND DATE_FORMAT(requestDate, '%Y%m%d') <= DATE_FORMAT('{$dateLatter}', '%Y%m%d')"; | 810 | $where .= " AND DATE_FORMAT(requestDate, '%Y%m%d') <= DATE_FORMAT('{$dateLatter}', '%Y%m%d')"; |
805 | } | 811 | } |
806 | if(!empty($managerFk)){ | 812 | if(!empty($userFk)){ |
807 | $where .= " AND userFk'{$userFk}'"; | 813 | $where .= " AND userFk='{$userFk}'"; |
808 | } | 814 | } |
809 | 815 | ||
810 | $sql=" | 816 | $sql=" |
... | @@ -834,32 +840,23 @@ if (! class_exists("ApiBoard")) | ... | @@ -834,32 +840,23 @@ if (! class_exists("ApiBoard")) |
834 | 840 | ||
835 | //제작사양서 상세정보 | 841 | //제작사양서 상세정보 |
836 | function getInfoOfProductionSpec(){ | 842 | function getInfoOfProductionSpec(){ |
843 | $userNo=$this->appUser["userNo"]; | ||
837 | $productionNo=$this->req["productionNo"]; | 844 | $productionNo=$this->req["productionNo"]; |
838 | $productionNo=3; | 845 | $productionNo=3; |
839 | $sql=" | 846 | $sql=" |
840 | SELECT PS.*, U.userNo, U.userName | 847 | SELECT PS.*, U.userNo, U.userName, IFNULL((SELECT userNo FROM tblLike WHERE userNo='{$userNo}' AND productionNo='{$productionNo}'), 0) AS likeStatus |
841 | FROM tblProductionSpec PS | 848 | FROM tblProductionSpec PS |
842 | JOIN tblUser U ON PS.userFk=U.userNo | 849 | JOIN tblUser U ON PS.userFk=U.userNo |
843 | WHERE productionNo='{$productionNo}' | 850 | WHERE productionNo='{$productionNo}' |
844 | "; | 851 | "; |
845 | $info=$this->getRow($sql); | 852 | $info=$this->getRow($sql); |
853 | |||
854 | if($userNo == $info["userNo"]) | ||
855 | $info["balance"] = null; | ||
856 | |||
846 | return $this->makeResultJson("1", "", $info); | 857 | return $this->makeResultJson("1", "", $info); |
847 | } | 858 | } |
848 | 859 | ||
849 | //담당자 리스트 | ||
850 | function getListOfManager(){ | ||
851 | $sql=" | ||
852 | SELECT userNo, userName | ||
853 | FROM tblUser | ||
854 | WHERE userType=2 AND STATUS=1 | ||
855 | ORDER BY userName ASC; | ||
856 | "; | ||
857 | $list=$this->getArray($sql); | ||
858 | if(sizeof($list)>0) | ||
859 | return $this->makeResultJson("1", "", $list); | ||
860 | else | ||
861 | return $this->makeResultJson("-1000", "내역이 없습니다"); | ||
862 | } | ||
863 | 860 | ||
864 | //좋아요 | 861 | //좋아요 |
865 | function productionLike(){ | 862 | function productionLike(){ | ... | ... |
... | @@ -138,19 +138,17 @@ if (! class_exists("ApiStatic")){ | ... | @@ -138,19 +138,17 @@ if (! class_exists("ApiStatic")){ |
138 | return $this->makeResultJson("1", "", $result); | 138 | return $this->makeResultJson("1", "", $result); |
139 | } | 139 | } |
140 | 140 | ||
141 | //시 리스트 | 141 | function getListOfCompanyProductType(){ |
142 | function getListOfCity(){ | ||
143 | $provinceNumber=$this->req["provinceNumber"]; | ||
144 | |||
145 | $sql=" | 142 | $sql=" |
146 | SELECT `cityNumber`, `desc`, `abbreviation` | 143 | SELECT * |
147 | FROM tblZipCity | 144 | FROM tblCompanyProductType |
148 | ORDER BY cityNumber ASC | 145 | ORDER BY productNumber ASC |
149 | "; | 146 | "; |
150 | $result=$this->getArray($sql); | 147 | $result=$this->getArray($sql); |
151 | return $this->makeResultJson("1", "", $result); | 148 | return $this->makeResultJson("1", "", $result); |
152 | } | 149 | } |
153 | 150 | ||
151 | |||
154 | function getListOfEmergency(){ | 152 | function getListOfEmergency(){ |
155 | $sql=" | 153 | $sql=" |
156 | SELECT * | 154 | SELECT * |
... | @@ -160,6 +158,20 @@ if (! class_exists("ApiStatic")){ | ... | @@ -160,6 +158,20 @@ if (! class_exists("ApiStatic")){ |
160 | $result=$this->getArray($sql); | 158 | $result=$this->getArray($sql); |
161 | return $this->makeResultJson("1", "", $result); | 159 | return $this->makeResultJson("1", "", $result); |
162 | } | 160 | } |
161 | |||
162 | function getListOfManager(){ | ||
163 | $sql=" | ||
164 | SELECT userNo, userName | ||
165 | FROM tblUser | ||
166 | WHERE userType=2 AND status=1 | ||
167 | ORDER BY userName ASC; | ||
168 | "; | ||
169 | $list=$this->getArray($sql); | ||
170 | if(sizeof($list)>0) | ||
171 | return $this->makeResultJson("1", "", $list); | ||
172 | else | ||
173 | return $this->makeResultJson("-1000", "내역이 없습니다"); | ||
174 | } | ||
163 | 175 | ||
164 | 176 | ||
165 | } | 177 | } | ... | ... |
... | @@ -58,8 +58,6 @@ if (! class_exists("ApiUser")) | ... | @@ -58,8 +58,6 @@ if (! class_exists("ApiUser")) |
58 | return $this->makeResultJson(-100, "사용할 수 없는 아이디 입니다"); | 58 | return $this->makeResultJson(-100, "사용할 수 없는 아이디 입니다"); |
59 | else | 59 | else |
60 | return $this->makeResultJson(1, "사용할 수 있는 아이디 입니다"); | 60 | return $this->makeResultJson(1, "사용할 수 있는 아이디 입니다"); |
61 | |||
62 | |||
63 | } | 61 | } |
64 | 62 | ||
65 | function checkNickRedundancy(){ | 63 | function checkNickRedundancy(){ |
... | @@ -83,8 +81,8 @@ if (! class_exists("ApiUser")) | ... | @@ -83,8 +81,8 @@ if (! class_exists("ApiUser")) |
83 | function memberJoin() | 81 | function memberJoin() |
84 | { | 82 | { |
85 | $userID = $this->req["userID"]; | 83 | $userID = $this->req["userID"]; |
86 | $userPwd = $this->req["userPwd"]; | 84 | $userPwd = md5($this->req["userPwd"]); |
87 | $userPwdConfirm=$this->req["userPwdConfirm"]; | 85 | $userPwdConfirm=md5($this->req["userPwdConfirm"]); |
88 | $userName = $this->req["userName"]; | 86 | $userName = $this->req["userName"]; |
89 | $nickName = $this->req["nickName"]; | 87 | $nickName = $this->req["nickName"]; |
90 | $userTel = str_replace(" ", "", $this->req["userTel"]); | 88 | $userTel = str_replace(" ", "", $this->req["userTel"]); |
... | @@ -100,7 +98,7 @@ if (! class_exists("ApiUser")) | ... | @@ -100,7 +98,7 @@ if (! class_exists("ApiUser")) |
100 | //if($nickName=="") | 98 | //if($nickName=="") |
101 | //$nickName=$userName; | 99 | //$nickName=$userName; |
102 | // $status = ($memType == this.MEM_TYPE_NOMAL) ? "" : "" ; | 100 | // $status = ($memType == this.MEM_TYPE_NOMAL) ? "" : "" ; |
103 | 101 | ||
104 | $sql = " | 102 | $sql = " |
105 | SELECT * | 103 | SELECT * |
106 | FROM tblUser | 104 | FROM tblUser |
... | @@ -109,26 +107,29 @@ if (! class_exists("ApiUser")) | ... | @@ -109,26 +107,29 @@ if (! class_exists("ApiUser")) |
109 | "; | 107 | "; |
110 | $regInfo = $this->getRow($sql); | 108 | $regInfo = $this->getRow($sql); |
111 | 109 | ||
110 | if(strlen($userID)<6) | ||
111 | return $this->makeResultJson(-106, "아이디는 여섯 자리 이상이어야 합니다."); | ||
112 | |||
112 | if($regInfo != null) | 113 | if($regInfo != null) |
113 | return $this->makeResultJson(-100, "아이디 중복을 확인해 주세요"); | 114 | return $this->makeResultJson(-100, "아이디 중복을 확인해 주세요."); |
114 | 115 | ||
115 | $sql="SELECT * FROM tblUser WHERE nickName='{$nickName} AND status=1'"; | 116 | $sql="SELECT * FROM tblUser WHERE nickName='{$nickName} AND status=1'"; |
116 | $regInfo=$this->getRow($sql); | 117 | $regInfo=$this->getRow($sql); |
117 | 118 | ||
118 | if($regInfo != null) | 119 | if($regInfo != null) |
119 | return $this->makeResultJson(-101, "닉네임 중복을 확인해 주세요"); | 120 | return $this->makeResultJson(-101, "닉네임 중복을 확인해 주세요."); |
120 | 121 | ||
121 | if(strlen($userID)<6) | 122 | if(strlen($userID)<6) |
122 | return $this->makeResultJson(-102, "아이디는 여섯자리 이상이어야 합니다"); | 123 | return $this->makeResultJson(-102, "아이디는 여섯자리 이상이어야 합니다."); |
123 | 124 | ||
124 | if(strlen($userPwd) != strlen($this->removeSpecials($userPwd))) { | 125 | if(strlen($userPwd) != strlen($this->removeSpecials($userPwd))) { |
125 | return $this->makeResultJson(-103, "비밀번호에는 특수문자가 포함될 수 없습니다."); | 126 | return $this->makeResultJson(-103, "비밀번호에는 특수문자가 포함될 수 없습니다."); |
126 | } | 127 | } |
127 | else if(strlen($userPwd) < 4) | 128 | else if(strlen($userPwd) < 4) |
128 | return $this->makeResultJson(-104, "비밀번호는 네 자리 이상이어야 합니다"); | 129 | return $this->makeResultJson(-104, "비밀번호는 네 자리 이상이어야 합니다."); |
129 | 130 | ||
130 | if($userPwd != $userPwdConfirm) | 131 | if($userPwd != $userPwdConfirm) |
131 | return $this->makeResultJson(-105, "비밀번호가 일치하지 않습니다"); | 132 | return $this->makeResultJson(-105, "비밀번호가 일치하지 않습니다."); |
132 | /* | 133 | /* |
133 | if($userTel == "") | 134 | if($userTel == "") |
134 | return $this->makeResultJson(-105, "전화번호는 필수 입력사항입니다."); | 135 | return $this->makeResultJson(-105, "전화번호는 필수 입력사항입니다."); |
... | @@ -204,6 +205,7 @@ if (! class_exists("ApiUser")) | ... | @@ -204,6 +205,7 @@ if (! class_exists("ApiUser")) |
204 | function userLogin() | 205 | function userLogin() |
205 | { | 206 | { |
206 | $userID = $this->req["userID"]; | 207 | $userID = $this->req["userID"]; |
208 | $userPwd= md5($this->req["userPwd"]); | ||
207 | $deviceID = $this->req["deviceID"]; | 209 | $deviceID = $this->req["deviceID"]; |
208 | $deviceTypeID = $this->req["deviceTypeID"]; | 210 | $deviceTypeID = $this->req["deviceTypeID"]; |
209 | $registrationKey = $this->req["registrationKey"]; | 211 | $registrationKey = $this->req["registrationKey"]; |
... | @@ -224,6 +226,11 @@ if (! class_exists("ApiUser")) | ... | @@ -224,6 +226,11 @@ if (! class_exists("ApiUser")) |
224 | if ($result[0][0]["v_returnCode"] > 0) | 226 | if ($result[0][0]["v_returnCode"] > 0) |
225 | { | 227 | { |
226 | $userInfo = $this->inFn_ApiBase_getInfoOfUser($result[0][0]["v_userNumber"]); | 228 | $userInfo = $this->inFn_ApiBase_getInfoOfUser($result[0][0]["v_userNumber"]); |
229 | //echo $userPwd; | ||
230 | //echo $userInfo["userID"]; | ||
231 | if($userInfo["userPwd"] != $userPwd) | ||
232 | return $this->makeResultJson("-1000", "비밀번호를 확인하세요"); | ||
233 | |||
227 | LoginUtil::doAppLogin($userInfo); | 234 | LoginUtil::doAppLogin($userInfo); |
228 | 235 | ||
229 | return $this->makeResultJson($result[0][0]["v_returnCode"], $result[0][0]["v_returnMsg"], $userInfo); | 236 | return $this->makeResultJson($result[0][0]["v_returnCode"], $result[0][0]["v_returnMsg"], $userInfo); |
... | @@ -234,6 +241,30 @@ if (! class_exists("ApiUser")) | ... | @@ -234,6 +241,30 @@ if (! class_exists("ApiUser")) |
234 | } | 241 | } |
235 | } | 242 | } |
236 | 243 | ||
244 | function userAutoLogin(){ | ||
245 | $userNumber=$this->req["userNumber"]; | ||
246 | $userID = $this->req["userID"]; | ||
247 | $deviceID = $this->req["deviceID"]; | ||
248 | $deviceTypeID = $this->req["deviceTypeID"]; | ||
249 | $registrationKey = $this->req["registrationKey"]; | ||
250 | $appVersion = $this->req["appVersion"]; | ||
251 | $userPwd=md5($this->req["userPwd"]); | ||
252 | |||
253 | $param = Array( | ||
254 | $userNumber, | ||
255 | $deviceID, | ||
256 | $deviceTypeID, | ||
257 | $registrationKey, | ||
258 | $appVersion, | ||
259 | $userPwd | ||
260 | ); | ||
261 | |||
262 | $result=$this->inFn_ApiBase_autoLogin($param); | ||
263 | |||
264 | return $this->makeResultJson($result["isLogin"], $result["loginMessage"], $result["loginInfo"]); | ||
265 | |||
266 | } | ||
267 | |||
237 | // 비동기 푸시키 갱신 API | 268 | // 비동기 푸시키 갱신 API |
238 | function setUserRegistrationKey() | 269 | function setUserRegistrationKey() |
239 | { | 270 | { |
... | @@ -291,7 +322,6 @@ if (! class_exists("ApiUser")) | ... | @@ -291,7 +322,6 @@ if (! class_exists("ApiUser")) |
291 | 322 | ||
292 | $userPwd = $this->req["userPwd"]; | 323 | $userPwd = $this->req["userPwd"]; |
293 | $userPwdConfirm = $this->req["userPwdConfirm"]; | 324 | $userPwdConfirm = $this->req["userPwdConfirm"]; |
294 | $userName = $this->req["userName"]; | ||
295 | $nickName = $this->req["nickName"]; | 325 | $nickName = $this->req["nickName"]; |
296 | $userTel = str_replace(" ", "", $this->req["userTel"]); | 326 | $userTel = str_replace(" ", "", $this->req["userTel"]); |
297 | $userVehicleTON=$this->req["userVehicleTON"]; | 327 | $userVehicleTON=$this->req["userVehicleTON"]; |
... | @@ -339,7 +369,6 @@ if (! class_exists("ApiUser")) | ... | @@ -339,7 +369,6 @@ if (! class_exists("ApiUser")) |
339 | UPDATE tbl_user | 369 | UPDATE tbl_user |
340 | SET | 370 | SET |
341 | userPwd='{$userPwd}', | 371 | userPwd='{$userPwd}', |
342 | userName='{$userName}', | ||
343 | nickName='{$nickName}', | 372 | nickName='{$nickName}', |
344 | userTel='{$userTel}', | 373 | userTel='{$userTel}', |
345 | userVehicleTON='{$userVehicleTON}', | 374 | userVehicleTON='{$userVehicleTON}', | ... | ... |
... | @@ -143,7 +143,8 @@ $(document).ready(function(){ | ... | @@ -143,7 +143,8 @@ $(document).ready(function(){ |
143 | async : false, | 143 | async : false, |
144 | cache : false, | 144 | cache : false, |
145 | data:{ | 145 | data:{ |
146 | "userID" : "fishcreek", | 146 | "userID" : "fishcreek1", |
147 | "userPwd": "alclsekf1", | ||
147 | "deviceID" : "device", | 148 | "deviceID" : "device", |
148 | "deviceTypeID" : 2, | 149 | "deviceTypeID" : 2, |
149 | "registrationKey" : "regKeyregKeyregKeyregKeyregKeyregKeyregKeyregKeyregKey", | 150 | "registrationKey" : "regKeyregKeyregKeyregKeyregKeyregKeyregKeyregKeyregKey", |
... | @@ -158,6 +159,30 @@ $(document).ready(function(){ | ... | @@ -158,6 +159,30 @@ $(document).ready(function(){ |
158 | }); | 159 | }); |
159 | }) ; | 160 | }) ; |
160 | 161 | ||
162 | $(".autoLogin").click2(function(){ | ||
163 | $.ajax({ | ||
164 | type: 'post', | ||
165 | url : "/action_front.php?cmd=ApiUser.userAutoLogin", | ||
166 | async : false, | ||
167 | cache : false, | ||
168 | data:{ | ||
169 | "userNumber" : 11, | ||
170 | "userID" : "fishcreek1", | ||
171 | "userPwd": "alclsekf1", | ||
172 | "deviceID" : "device", | ||
173 | "deviceTypeID" : 2, | ||
174 | "registrationKey" : "autologinKeyautologinKeyautologinKeyautologinKeyautologinKeyautologinKeyautologinKey", | ||
175 | "appVersion" : "v1.0" | ||
176 | }, | ||
177 | success : function(data){ | ||
178 | alert(data.returnmessage); | ||
179 | }, | ||
180 | error : function(req, res, error){ | ||
181 | alert(req+res+error); | ||
182 | } | ||
183 | }); | ||
184 | }) ; | ||
185 | |||
161 | $(".memberJoin").click2(function(){ | 186 | $(".memberJoin").click2(function(){ |
162 | $.ajax({ | 187 | $.ajax({ |
163 | type: 'post', | 188 | type: 'post', |
... | @@ -165,10 +190,11 @@ $(document).ready(function(){ | ... | @@ -165,10 +190,11 @@ $(document).ready(function(){ |
165 | async : false, | 190 | async : false, |
166 | cache : false, | 191 | cache : false, |
167 | data:{ | 192 | data:{ |
168 | "userID" : "ellivga", | 193 | "userID" : "fishcreek1", |
169 | "userPwd" : "device", | 194 | "userPwd" : "alclsekf1", |
195 | "userPwdConfirm" : "alclsekf1", | ||
170 | "userName" : "세호", | 196 | "userName" : "세호", |
171 | "nickName" : "device", | 197 | "nickName" : "fishcreek1", |
172 | "userTel" : "01026264848", | 198 | "userTel" : "01026264848", |
173 | "userVehicleTON" : 21, | 199 | "userVehicleTON" : 21, |
174 | "userVehicleName" : "내장탑차", | 200 | "userVehicleName" : "내장탑차", |
... | @@ -304,6 +330,7 @@ $(document).ready(function(){ | ... | @@ -304,6 +330,7 @@ $(document).ready(function(){ |
304 | <span class="button bigrounded blue saveProductionSpec btnleft_y">제작사양서 저장 </span> | 330 | <span class="button bigrounded blue saveProductionSpec btnleft_y">제작사양서 저장 </span> |
305 | <span class="button bigrounded blue memberJoin btnleft_y">회원가입 </span> | 331 | <span class="button bigrounded blue memberJoin btnleft_y">회원가입 </span> |
306 | <span class="button bigrounded blue login btnleft_y">로그인 </span> | 332 | <span class="button bigrounded blue login btnleft_y">로그인 </span> |
333 | <span class="button bigrounded blue autoLogin btnleft_y">자동 로그인 </span> | ||
307 | </form> | 334 | </form> |
308 | <div class="data"> | 335 | <div class="data"> |
309 | <table class="datacList" id="datacList"> | 336 | <table class="datacList" id="datacList"> | ... | ... |
-
Please register or sign in to post a comment