修改登录为手机和验证码

CODE/smart-community/app-api/pom.xml

@@ -149,6 +149,13 @@
 			<version>2.6</version>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.11.0</version>
+		</dependency>
+
 
 
 	</dependencies>

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/impl/PhoneCodeImpl.java

@@ -2,14 +2,21 @@ package com.community.huiju.common.code.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
+import com.community.commom.utils.HttpClientUtils;
 import com.community.huiju.common.code.ICode;
 import com.community.huiju.common.code.entity.CodeEntity;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
 /**
  * 手机验证码
  * @author weiximei
@@ -18,25 +25,46 @@ import org.springframework.web.client.RestTemplate;
 @Slf4j
 public class PhoneCodeImpl implements ICode {
 
+    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+
     @Autowired
     private RestTemplate restTemplate;
 
+    public OkHttpClient getClient() {
+        OkHttpClient client  = new OkHttpClient.Builder()
+                .connectTimeout(10, TimeUnit.SECONDS)
+                .writeTimeout(10,TimeUnit.SECONDS)
+                .readTimeout(20, TimeUnit.SECONDS)
+                .build();
+        return client;
+    }
 
     @Override
     public boolean sendCode(String phone, String code) {
         boolean bool = false;
-        CodeEntity codeEntity = new CodeEntity();
-        codeEntity.setCode(Constant.CODE);
-        codeEntity.setTel(phone);
-        codeEntity.setParams("[\""+code+"\"]");
         try {
-            String result = restTemplate.postForObject(Constant.REQUEST_URL, JSONObject.toJSONString(codeEntity),String.class);
+            String result = null;
+            OkHttpClient client = getClient();
+            RequestBody body = RequestBody.create(JSON, "{\"code\":\""+Constant.CODE+"\"," + "\"tel\":\""+phone+"\"," + "\"params\":[\""+code+"\"]}");
+            Request request = new Request.Builder()
+                    .url(Constant.REQUEST_URL)
+                    .post(body)
+                    .build();
+            Response response = client.newCall(request).execute();
+            if (response.isSuccessful()) {
+                result = response.body().string();
+            } else {
+                throw new IOException("Unexpected code " + response);
+            }
+
+
+
             if ("发送成功".equals(result)) {
                 bool = true;
                 log.info("手机号 {} 验证码 {} 发送成功!",phone,code);
             }else {
                 bool = false;
-                log.error("短信发送验证码失败!{}",result);
+                log.error("短信发送验证码失败!{}", result);
             }
         } catch (Exception e){
             e.printStackTrace();

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/CodeController.java

@@ -1,17 +1,21 @@
 package com.community.huiju.controller;
 
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.code.ICode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import sun.rmi.runtime.Log;
 
 import javax.servlet.http.HttpSession;
 
@@ -22,6 +26,7 @@ import javax.servlet.http.HttpSession;
 @RequestMapping("/code")
 @RefreshScope
 @Api("获取验证码的API")
+@Slf4j
 public class CodeController {
 
     @Autowired
@@ -30,12 +35,15 @@ public class CodeController {
 
     @ApiOperation(value = "获取手机验证码", notes = "根据手机号发送验证码")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "手机号")})
-    @RequestMapping(value = "/sendCode",method = RequestMethod.GET)
-    public ResponseBean sendCode(String phone, HttpSession session) {
+    @RequestMapping(value = "/sendCode",method = RequestMethod.POST)
+    public ResponseBean sendCode(@RequestParam String phone, HttpSession session) {
         ResponseBean response = new ResponseBean();
         int code = (int) ((Math.random()*9+1)*1000);
-        boolean result = iCode.sendCode(phone,String.valueOf(code));
+        //boolean result = iCode.sendCode(phone,String.valueOf(code));
+        boolean result = true;
         if (result) {
+            log.info("{} 验证码: {}",phone,code);
+            session.setAttribute(Constant.SESSION_PHONE_CODE,String.valueOf(code));
             response.addSuccess("发送成功!");
         } else {
             response.addError("发送失败!");

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -12,12 +12,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
+import javax.xml.crypto.dsig.keyinfo.PGPData;
 
 /**
  * 用户控制器
@@ -38,15 +36,16 @@ public class UserController {
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginPassword",value = "密码")
     })
     @RequestMapping(value = "/login",method = RequestMethod.POST)
-    public ResponseBean login(@RequestBody TaUser user, HttpSession session){
-        ResponseBean responseBean = iTaUserService.login(user);
+    public ResponseBean login(@RequestParam(value = "loginName") String loginName,@RequestParam(value = "code",defaultValue = "") String code, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        String phondeCode = (String) session.getAttribute(Constant.SESSION_PHONE_CODE);
+        if (!code.equals(phondeCode)) {
+            responseBean.addError("验证码错误!");
+            return responseBean;
+        }
+        responseBean = iTaUserService.login(loginName);
         TaUser taUser = (TaUser) responseBean.getData();
 
-//        userElement.setStatus(taUser.getStatus());
-//        userElement.setLoginName(taUser.getLoginName());
-//        userElement.setUserName(taUser.getUserName());
-//        userElement.setEmail(taUser.getEmail());
-//        userElement.setId(taUser.getId());
         if (null != taUser) {
             UserElement userElement = new UserElement();
             BeanUtils.copyProperties(taUser,userElement);

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java

@@ -2,6 +2,7 @@ package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TaUser;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 用户业务 接口
@@ -16,6 +17,13 @@ public interface ITaUserService {
      */
     ResponseBean login(TaUser user);
 
+    /**
+     * 用户登录
+     * @param loginName
+     * @return 用户对象
+     */
+    ResponseBean login(String loginName);
+
     /**
      * 注册用户
      * @param user

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -56,6 +56,29 @@ public class TaUserServiceImpl implements ITaUserService {
         return response;
     }
 
+    @Override
+    public ResponseBean login(String loginName) {
+        ResponseBean response = new ResponseBean();
+        log.info("{} 手机号校验结果: {}",loginName,AccountValidatorUtil.isPhone(loginName));
+        if (!AccountValidatorUtil.isPhone(loginName)){
+            response.addError("请输入正取的手机号!");
+            return response;
+        }
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("loginName",loginName);
+        TaUser currentUser = taUserMapper.selectByLoginName(map);
+        if (null != currentUser){
+            response.addSuccess(currentUser);
+            return response;
+        }else {
+            TaUser user = new TaUser();
+            user.setLoginName(loginName);
+            ResponseBean result = register(user);
+            response.addSuccess(result.getData());
+        }
+        return response;
+    }
+
     @Transactional
     @Override
     public ResponseBean register(TaUser user) {
@@ -67,7 +90,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setAcceptAgreementStatus("1");
         user.setUserName(user.getLoginName());
         user.setRemark("这是系统自动注册!");
-        user.setLoginPassword(MD5Utils.encode(user.getLoginPassword()));
+        //user.setLoginPassword(MD5Utils.encode(user.getLoginPassword()));
         taUserMapper.insertSelective(user);
 
         response.addSuccess(user);