20191102 修改active环境

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

@@ -18,7 +18,7 @@ public class Test {
 
         //获取验证码参数
         BaseRequest request = new BaseRequest();
-        request.setFlag(1);
+        request.setFlag(3);
         request.setMobile("13024112070");
         String string = JSONObject.toJSONString(request);
         System.out.println(string);
@@ -76,37 +76,17 @@ public class Test {
 //        String encryptEntity1Json = JSONObject.toJSONString(encryptEntity1);
 //        System.out.println(encryptEntity1Json);
 
-//        System.out.println("--------------------登录接口-------------");
-//<<<<<<< HEAD
+        System.out.println("--------------------登录接口-------------");
         String publicKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCa6j3SJwXr/pLLwb6Pq8pi9StPq+Wvm6vu+LWQB1hNqClWk0jQm5GnF6Kj0ac2gqgsMsutc3hhMaaX2QZvLX+gFQHC/ufGBdBbpPtDeGWsQItsMf/xqqlkLPkc7eVTyfsmrpQM7BG9LVvaPVXPVUcZfJNBaYuR4+Sf6Zi2ayI/hQIDAQAB";
-//        BaseRequest login = new BaseRequest();
-//        login.setMobile("13024112588");
-//        login.setPassword("d0dcbf0d12a6b1e7fbfa2ce5848f3eff");
-//=======
-//
-//        BaseRequest login = new BaseRequest();
-//        login.setMobile("13024112588");
-//        login.setPassword("d0dcbf0d12a6b1e7fbfa2ce5848f3eff");  //qq123456
-//>>>>>>> dev-sensitive-20191112
-//        String con = JSONObject.toJSONString(login);
-//        //通过十六位随机数对参数明文进行加密 contentResult
-//        String contentResult = AESUtil.aesEncrypt(con, "YCPQPx4qpQjEjDea"); //十六位随机数
-//
-//<<<<<<< HEAD
-//        String contentResult = AESUtil.aesEncrypt(con, "YCPQPx4qpQjEjDea");
-//
-//        String keyResult = RSAUtil.encrypt("YCPQPx4qpQjEjDea",publicKey);
-//=======
-//        String publicKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCa6j3SJwXr/pLLwb6Pq8pi9StPq+Wvm6vu+LWQB1hNqClWk0jQm5GnF6Kj0ac2gqgsMsutc3hhMaaX2QZvLX+gFQHC/ufGBdBbpPtDeGWsQItsMf/xqqlkLPkc7eVTyfsmrpQM7BG9LVvaPVXPVUcZfJNBaYuR4+Sf6Zi2ayI/hQIDAQAB";
-//        //拿到RAS公钥，对上面的随机数进行加密
-//        String keyResult = RSAUtil.encrypt("YCPQPx4qpQjEjDea",publicKey);
-//
-//>>>>>>> dev-sensitive-20191112
-//        EncryptEntity encryptTest = new EncryptEntity();
-//        encryptTest.setContent(contentResult);
-//        encryptTest.setKey(keyResult);
-//        System.out.println(JSONObject.toJSONString(encryptTest));
-
+        BaseRequest login = new BaseRequest();
+        login.setMobile("13024112588");
+        login.setPassword("D0DCBF0D12A6B1E7FBFA2CE5848F3EFF");  //qq123456
+        String contentResult = AESUtil.aesEncrypt(JSONObject.toJSONString(login), "YCPQPx4qpQjEjDea");
+        String keyResult = RSAUtil.encrypt("YCPQPx4qpQjEjDea",publicKey);
+        EncryptEntity encryptTest = new EncryptEntity();
+        encryptTest.setContent(contentResult);
+        encryptTest.setKey(keyResult);
+        System.out.println(JSONObject.toJSONString(encryptTest));
         System.out.println("--------------------修改密码接口-------------");
         BaseRequest changePwd = new BaseRequest();
         changePwd.setOldPwd("D0DCBF0D12A6B1E7FBFA2CE5848F3EFF");
@@ -122,8 +102,8 @@ public class Test {
 
         System.out.println("--------------------获取验证码接口-------------");
         BaseRequest authCode = new BaseRequest();
-        authCode.setFlag(1);
-        authCode.setMobile("13024112100");
+        authCode.setFlag(3);
+        authCode.setMobile("13024112092");
         String authCodeStr = JSONObject.toJSONString(authCode);
         System.out.println(authCodeStr);
         String contentResult2 = AESUtil.aesEncrypt(authCodeStr, "YCPQPx4qpQjEjDea");
@@ -201,7 +181,7 @@ public class Test {
         System.out.println("--------------------修改手机号-------------");
         BaseRequest changeMobile = new BaseRequest();
         changeMobile.setMobile("13024112092");
-        changeMobile.setAuthCode("623849");
+        changeMobile.setAuthCode("100814");
         String string1 = JSONObject.toJSONString(changeMobile);
         System.out.println(string1);
         String changeMobileContent = AESUtil.aesEncrypt(string1, "YCPQPx4qpQjEjDea");

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

 package com.pica.cloud.account.account.server.controller;
 
+import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.entity.LoginResult;
-import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
-import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.req.BaseRequest;
-import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.server.service.RegisterService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
-import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.PostMapping;

server/src/main/resources/bootstrap.properties

-spring.profiles.active=uat
+spring.profiles.active=dev
\ No newline at end of file