Merge branch '1.0' of http://gogs.tcmbrain.com/zjh/pre_paramater into 1.0

cbkj_web_parameter/src/main/resources/application.properties

@@ -155,3 +155,6 @@ rsa.privateKey=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANoqYJctaoEhU5VJr
 rsa.publicKey2=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjzm8Gij4bzGp5oVP/6IjUwKGtuAt/MX2di7/e09teyL0JD3E2TFY8hfJE+RN4tp8SwZi+44mKwZUNhjhtDayEBx+LnKnhtkxtruGbyteHe0GUczDy2FFh4eT6cN/KXR/Bcc19TSfleZMRq56l1atKicPgXfysEzWq+O8UgRiZ/UyY/pf8UNec3PePtlj47hzs+7Bh+q1tUYOHqrogeSD92xvG6xushjQcuoTcdDJCVCLVxXVmff/YBbpZAwCQKB28W0gH4B7n9IpaONL6/jghbNUahKO6NL6iofxE6TOgc2VfzR5wlqaqD3wi0NRxx+S9JiSA+k3O5uqFk7V7URiwQIDAQAB
 rsa.privateKey2=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCPObwaKPhvManmhU//oiNTAoa24C38xfZ2Lv97T217IvQkPcTZMVjyF8kT5E3i2nxLBmL7jiYrBlQ2GOG0NrIQHH4ucqeG2TG2u4ZvK14d7QZRzMPLYUWHh5Ppw38pdH8FxzX1NJ+V5kxGrnqXVq0qJw+Bd/KwTNar47xSBGJn9TJj+l/xQ15zc94+2WPjuHOz7sGH6rW1Rg4equiB5IP3bG8brG6yGNBy6hNx0MkJUItXFdWZ9/9gFulkDAJAoHbxbSAfgHuf0ilo40vr+OCFs1RqEo7o0vqKh/ETpM6BzZV/NHnCWpqoPfCLQ1HHH5L0mJID6Tc7m6oWTtXtRGLBAgMBAAECggEBAI6+pveXn8sKv19tvIZ17SjdWrBHC+5iyrmNK7mVNvNDqfm4ykkBQrm99PzrTKjswnXvvpUiXm4BF8r2z3RSEvO1whi+0rK2IzMRAPIpUdsXkXXTU8yOfMKP4F5aJpGFdtembOOe9/JpHdpQKQROMbXSSkTp7CnD2yxjhBxmHEGog8PbpHTElP0SsYPPf3PkfkoEiwkTPS18j8sK5kEdqgZ3/y5GUKOb1iBsoGxM1TGDFD+iux3Jc1WbuYeRKdsQjvT2KMV5V+9+OFj4yqd70/v2lq2RW80B9H15dKWvPYHfEA69KV6nJneD6gVJ2G+/RLr/pfqHXZt1hsMgXexY/1UCgYEAycUxbtdi5Tjg1xV6gfhjNwoqkGdC0V7EMrJqv+OwuQLBciMWYo1AskBO9EwbUHwes2fTFDTAj//sSY/mLlp9k9UpofqisUCw3u2Vz4rRTThRDlNNMkZ4B3JtSEshzGoT/6TIYG7SZwfY99hjabbVHHf8NNxguIcVEhzQaE988lcCgYEAtbhea6lQJAACPrdkXViHtKfnxIId/h3VotA3/FRMpxTYfj/okNJsIhWrnWjLmv5QV0N40OP0Sc/5NmuuxJ/XVnVrpcMgD6eQGW8m88oHz6k6RTngW1vl63spdFF9TQS1v6Reo7QYScSrn5p0JifQ4gBRqESdByJpdtV9f8WYlKcCgYEApNgVjfAsnQe+MhsbLqpnLKWCpt2manXZJ2465rE4Rb8pmn1uIXAz5i3CE7dGLZhqYLq3ae+7TyqQunz1WvOVWz0xOWQSnWwz1L4Ywiow27ziBCksjaGjGLp07DZt05rq4daX2qlP/tsbeUnx1oGIVSz2AZ3262t5XIXsAvzGIRsCgYAdkxX626FpWn8DCgHRl1jus+zqdGrBMsXUK6MQ8/9NqfzZ/ziwaS6kFXbKtYV9gio9KYP+KztUz/41Ny1IXuNC9PVCExGiupifKxHh112SFG6hWZwEAl7XBkJm5eRIpp2VxQCKEANr7hAod5CzrQM35OllQ1VzFcyoRHKaWuRMPQKBgHaMzmTgk+32ds7VVpAdds+xaOByPF6ZFaq47x0vDXUjPgQOse07h5mA32CA0nbQUbI2yVzYAa+Gdrlnn0U8thnwn0lSp7dzh/c/UWEkHDaqp9YyaVBUw3G7K0dpb5UdfAhD1vhqecAmERirJLTxXqW8UuoiuaqqqAXDR+nRXLXg
 
+
+address.platform.api.url=http://192.168.2.80:65/
+

cbkj_web_parameter/src/main/resources/mappers/sysMappers/AdminInfoMapper.xml

@@ -31,6 +31,7 @@
         <result column="qualifier_pic_path" jdbcType="VARCHAR" property="qualifierPicPath"/>
         <result column="update_user" jdbcType="VARCHAR" property="updateUser"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="professional" jdbcType="TIMESTAMP" property="professional"/>
         <result column="professional_pic_path" jdbcType="TIMESTAMP" property="professionalPicPath"/>
     </resultMap>
 
@@ -95,13 +96,13 @@ update_user,update_time,professional,professional_pic_path
     <insert id="insertAdminInfoList" parameterType="List">
         insert into sys_admin_info (user_id,user_name,password,sex,status,create_date,CREATE_USER,last_ip,phone
         ,address,name_zh,user_heand,email,APP_ID,INS_CODE,dept_id,dept_name,EXPIRE_DATE
-        ,create_user_name,is_qualifier,dept_id_his,dept_name_his,qualifier_pic_path,personal_share) values
+        ,create_user_name,is_qualifier,dept_id_his,dept_name_his,qualifier_pic_path,personal_share,professional) values
         <foreach collection="list" item="item" index="index" separator="," >
             (#{item.userId},#{item.userName},#{item.password},#{item.sex},#{item.status},#{item.createDate}
             ,#{item.createUser},#{item.lastIp},#{item.phone},#{item.address},#{item.nameZh},#{item.userHeand}
             ,#{item.email},#{item.appId},#{item.insCode},#{item.deptId},#{item.deptName},#{item.expireDate}
             ,#{item.createUsername}
-            ,#{item.isQualifier},#{item.deptIdHis},#{item.deptNameHis},#{item.qualifierPicPath},#{item.personalShare})
+            ,#{item.isQualifier},#{item.deptIdHis},#{item.deptNameHis},#{item.qualifierPicPath},#{item.personalShare},#{item.professional})
         </foreach>
     </insert>
 
@@ -139,6 +140,9 @@ update_user,update_time,professional,professional_pic_path
         <if test="qualifierPicPath != null">
             ,qualifier_pic_path
         </if>
+        <if test="professional != null">
+            ,professional
+        </if>
         <if test="professionalPicPath != null">
             ,professional_pic_path
         </if>
@@ -439,7 +443,7 @@ update_user,update_time,professional,professional_pic_path
     <select id="getPageDatas" parameterType="AdminInfo" resultType="Map">
         SELECT
         a.user_id as userId,
-        a.user_name as useName,
+        a.user_name as userName,
         a.password,
         a.sex,
         a.status,

cbkj_web_parameter/src/main/resources/mappers/sysMappers/SysDoctorMultipointMapper.xml

@@ -141,9 +141,12 @@
          p.dept_id_his,
          p.dept_name_his,
          p.qualifier_pic_path,
-         p.personal_share
+         p.personal_share,
+               i.ins_name insName,
+sa.app_name appName
         from sys_doctor_multipoint p
         left join sys_institution i on i.INS_CODE = p.ins_code and i.status='0'
+        left join sys_app sa on sa.app_id = p.app_id and sa.app_id=i.app_id
         where p.user_id = #{userId} and p.status='0'
         <if test=" appId != null and appId != '' ">
             and p.app_id = #{appId}