20190929 修改验证码字段

server/src/main/java/com/pica/cloud/account/account/server/Test.java

@@ -28,7 +28,7 @@ public class Test {
         register = new BaseRequest();
         register.setMobile("13024112588");
         register.setPassword("qq123456");
-        register.setSysCode("111111");
+        register.setAuthCode("111111");
         String registerString = JSONObject.toJSONString(register);
         System.out.println(registerString);
         EncryptEntity registerEncryptEntity = new EncryptEntity();
@@ -65,6 +65,14 @@ public class Test {
         jsonObject.put("authCode","13024112565");
         jsonObject.put("password","qq123456");
         System.out.println(jsonObject.toJSONString());
+        System.out.println("--------------------》");
+
+
+        EncryptEntity encryptEntity1 = new EncryptEntity();
+        encryptEntity1.setContent("content");
+        encryptEntity1.setKey("awgvsfgwgv");
+        String encryptEntity1Json = JSONObject.toJSONString(encryptEntity1);
+        System.out.println(encryptEntity1Json);
 
 
     }

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

@@ -78,7 +78,7 @@ public class LoginController extends AccountBaseController {
     @PostMapping(value = "/login-register")
     public PicaResponse loginAndRegister(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
-        accountUtils.checkMobilePhoneAndAuthCode(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_LOGIN.getCode() + "",request.getSysCode());
+        accountUtils.checkMobilePhoneAndAuthCode(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_LOGIN.getCode() + "",request.getAuthCode());
         request.setProductType(super.getProductType());
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());
@@ -101,7 +101,7 @@ public class LoginController extends AccountBaseController {
     @PostMapping(value = "/login/wechat/step2")
     public PicaResponse loginByWeChatStep(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
-        accountUtils.checkMobilePhoneAndAuthCode(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_WE_CHAT.getCode() + "", request.getSysCode());
+        accountUtils.checkMobilePhoneAndAuthCode(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_WE_CHAT.getCode() + "", request.getAuthCode());
         request.setProductType(super.getProductType());
         request.setSourceType(super.getSourceType());
         request.setLoginIp(super.getIpAddr());

server/src/main/java/com/pica/cloud/account/account/server/controller/ModifyMobileController.java

@@ -30,7 +30,7 @@ public class ModifyMobileController extends AccountBaseController {
         Integer acctId = super.getAcctId();
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         String mobile = request.getMobile();
-        accountUtils.checkMobilePhoneAndAuthCode(mobile, AccountTypeEnum.SYSCODE_TYPE_MODIFY_MOBILE.getCode() + "", request.getSysCode());
+        accountUtils.checkMobilePhoneAndAuthCode(mobile, AccountTypeEnum.SYSCODE_TYPE_MODIFY_MOBILE.getCode() + "", request.getAuthCode());
         modifyMobileService.modify(acctId, mobile);
         return PicaResponse.toResponse();
     }

server/src/main/java/com/pica/cloud/account/account/server/controller/PasswordController.java

@@ -62,7 +62,7 @@ public class PasswordController extends AccountBaseController {
     @PostMapping(value = "/reset")
     public PicaResponse forgetPassword(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
-        accountUtils.checkMobilePhoneAndAuthCode(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_RESET_PASSWORD.getCode() + "", request.getSysCode());
+        accountUtils.checkMobilePhoneAndAuthCode(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_RESET_PASSWORD.getCode() + "", request.getAuthCode());
         if (StringUtils.isEmpty(request.getPassword())) {
             throw new AccountException(AccountExceptionEnum.PICA_PASSWORD_ERROR);
         }

server/src/main/java/com/pica/cloud/account/account/server/controller/RegisterController.java

@@ -30,7 +30,7 @@ public class RegisterController extends AccountBaseController {
     @PostMapping(value = "")
     public PicaResponse<String> register(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
-        accountUtils.checkMobilePhoneAndAuthCode(request.getMobile(),AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode()+"", request.getSysCode());
+        accountUtils.checkMobilePhoneAndAuthCode(request.getMobile(),AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode()+"", request.getAuthCode());
         accountUtils.checkPassword(request.getPassword());
         request.setFlag(AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode());
         request.setProductType(super.getProductType());

server/src/main/java/com/pica/cloud/account/account/server/controller/SysCodeController.java

@@ -50,7 +50,7 @@ public class SysCodeController extends AccountBaseController {
      */
     @ApiOperation("获取短信验证码")
     @PostMapping(value = "")
-    public PicaResponse getSysCode(@RequestBody EncryptEntity entity) throws Exception {
+    public PicaResponse getAuthCode(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         AccountUtils.checkMobilePhone(request.getMobile());
         processSysCode(request.getMobile(), request.getFlag());

server/src/main/java/com/pica/cloud/account/account/server/entity/EncryptEntity.java

@@ -14,13 +14,13 @@ public class EncryptEntity {
      */
     private String content;
 
-//    public String getKey() {
-//        return key;
-//    }
-//
-//    public void setKey(String key) {
-//        this.key = key;
-//    }
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
 
     public String getContent() {
         return content;

server/src/main/java/com/pica/cloud/account/account/server/req/BaseRequest.java

@@ -16,7 +16,7 @@ public class BaseRequest {
     private String password;
     @ApiModelProperty("旧密码")
     private String oldPwd;
-    private String sysCode;
+    private String authCode;
     private int flag;
     @ApiModelProperty("产品线类型")
     private int productType;
@@ -64,12 +64,12 @@ public class BaseRequest {
         this.oldPwd = oldPwd;
     }
 
-    public String getSysCode() {
-        return sysCode;
+    public String getAuthCode() {
+        return authCode;
     }
 
-    public void setSysCode(String sysCode) {
-        this.sysCode = sysCode;
+    public void setAuthCode(String authCode) {
+        this.authCode = authCode;
     }
 
     public int getFlag() {

server/src/main/java/com/pica/cloud/account/account/server/service/impl/DoctorServiceImpl.java

@@ -11,8 +11,11 @@ import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.Date;