Merge branch 'dev-20190827-account-center' into release

# Conflicts:
#	server/src/main/java/com/pica/cloud/account/account/server/Test.java
#	server/src/main/java/com/pica/cloud/account/account/server/service/impl/PasswordServiceImpl.java
#	server/src/main/resources/mybatis/AccountInfoEntityMapper.xml

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

@@ -184,6 +184,7 @@ public class RegisterServiceImpl implements RegisterService {
     @Override
     public void ocinRegister(OCINRequest request) {
         String mobile = request.getMobile();
+        String name = request.getName();
         AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobile);
         if (accountInfoEntity == null) {
             Date currentTime = new Date();
@@ -199,6 +200,7 @@ public class RegisterServiceImpl implements RegisterService {
             accountInfo.setRegTime(currentTime);
             accountInfo.setDeleteFlag(1);
             accountInfo.setSex(0);
+            accountInfo.setName(name);
             accountInfo.setRegisterProduct(productType);
             accountInfo.setRegisterSource(sourceType);
             accountInfoDetailMapper.insertSelective(accountInfo);
@@ -216,6 +218,7 @@ public class RegisterServiceImpl implements RegisterService {
             account.setFirstLoginTime(currentTime);
             account.setLastLoginTime(currentTime);
             account.setPassword("");
+            account.setName(name);
             accountMapper.insertSelective(account);
             Long userId = accountUtils.getUserIdByAcctId(productType, acctId);
             processAgreement(userId);

server/src/main/java/com/pica/cloud/account/account/server/util/RSAUtil.java

@@ -123,7 +123,7 @@ public class RSAUtil {
 
     public static void main(String[] args) throws Exception {
         //生成公钥和私钥
-        //genKeyPair();
+//        genKeyPair();
 //        keyMap.put(0, publicKey);
 //        keyMap.put(1, privateKey);
 //        //加密字符串

server/src/main/resources/mybatis/AccountInfoEntityMapper.xml

@@ -20,7 +20,7 @@
         <result column="modified_time" property="modifiedTime" jdbcType="TIMESTAMP"/>
     </resultMap>
     <sql id="Base_Column_List">
-    id, mobile_phone, password, register_product, register_source, name, age, birthday, 
+    id, mobile_phone, password, register_product, register_source, name, age, birthday,
     sex, id_card, reg_time, delete_flag, created_id, created_time, modified_id, modified_time
   </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -72,16 +72,16 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
     <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.AccountInfoEntity">
-    insert into account_info (id, mobile_phone, password, 
-      register_product, register_source, name, 
-      age, birthday, sex, id_card, 
-      reg_time, delete_flag, created_id, 
+    insert into account_info (id, mobile_phone, password,
+      register_product, register_source, name,
+      age, birthday, sex, id_card,
+      reg_time, delete_flag, created_id,
       created_time, modified_id, modified_time
       )
-    values (#{id,jdbcType=INTEGER}, #{mobilePhone,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
-      #{registerProduct,jdbcType=INTEGER}, #{registerSource,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, 
-      #{age,jdbcType=TINYINT}, #{birthday,jdbcType=DATE}, #{sex,jdbcType=TINYINT}, #{idCard,jdbcType=VARCHAR}, 
-      #{regTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{mobilePhone,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
+      #{registerProduct,jdbcType=INTEGER}, #{registerSource,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR},
+      #{age,jdbcType=TINYINT}, #{birthday,jdbcType=DATE}, #{sex,jdbcType=TINYINT}, #{idCard,jdbcType=VARCHAR},
+      #{regTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=INTEGER},
       #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER}, #{modifiedTime,jdbcType=TIMESTAMP}
       )
   </insert>