20191102 解决冲突

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

@@ -103,7 +103,7 @@ public class Test {
         System.out.println("--------------------获取验证码接口-------------");
         BaseRequest authCode = new BaseRequest();
         authCode.setFlag(3);
-        authCode.setMobile("13024112092");
+        authCode.setMobile("13024112588");
         String authCodeStr = JSONObject.toJSONString(authCode);
         System.out.println(authCodeStr);
         String contentResult2 = AESUtil.aesEncrypt(authCodeStr, "YCPQPx4qpQjEjDea");
@@ -180,8 +180,9 @@ public class Test {
 
         System.out.println("--------------------修改手机号-------------");
         BaseRequest changeMobile = new BaseRequest();
-        changeMobile.setMobile("13024112092");
-        changeMobile.setAuthCode("100814");
+        changeMobile.setMobile("13024112588");
+        changeMobile.setAuthCode("510312");
+        changeMobile.setFlag(3);
         String string1 = JSONObject.toJSONString(changeMobile);
         System.out.println(string1);
         String changeMobileContent = AESUtil.aesEncrypt(string1, "YCPQPx4qpQjEjDea");

server/src/main/resources/bootstrap-test1.properties

@@ -51,12 +51,6 @@ spring.rabbitmq.username=appuser
 spring.rabbitmq.password=AqLfvyWOvLQEUzdI
 spring.rabbitmq.virtual-host=account-register-vhost
 
-<<<<<<< HEAD
-
-# Job config begin
-# 控制器地址：服务启动自动注册到控制器中
-xxl.job.admin.addresses=http://192.168.110.133:7899/job
-=======
 # Job config begin
 # 控制器地址：服务启动自动注册到控制器中
 xxl.job.admin.addresses=http://192.168.110.133:7899/job

server/src/main/resources/bootstrap.properties

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