Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/resources/mapper/sys/DataDictionary.xml

@@ -3,9 +3,9 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.DataDictionaryDAO">
-	<resultMap id="DataDictionaryMap" type="DataDictionary">
+	<resultMap id="DataDictionaryMap" type="com.jpsoft.picc.modules.sys.entity.DataDictionary">
 		<id property="id" column="id_" />
-			<result property="userName" column="name_" />
+			<result property="name" column="name_" />
 			<result property="value" column="value_" />
 			<result property="sortNo" column="sort_no" />
 			<result property="parentId" column="parent_id" />
@@ -18,7 +18,7 @@
 			<result property="activated" column="activated_" />
 			<result property="delFlag" column="del_flag"/>
 			</resultMap>
-	<insert id="insert" parameterType="DataDictionary">
+	<insert id="insert" parameterType="com.jpsoft.picc.modules.sys.entity.DataDictionary">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
 		select sys_guid() from dual
@@ -47,7 +47,7 @@
 	<delete id="delete" parameterType="string">
 		delete from sys_data_dictionary where id_=#{id,jdbcType=VARCHAR}
 	</delete>
-	<update id="update" parameterType="DataDictionary">
+	<update id="update" parameterType="com.jpsoft.picc.modules.sys.entity.DataDictionary">
 		update sys_data_dictionary
 		<set>
 				<if test="userName!=null">
@@ -124,7 +124,7 @@
 
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 

picc-admin-server/src/main/resources/mapper/sys/Menu.xml

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.MenuDAO">
-    <resultMap id="MenuMap" type="Menu">
+    <resultMap id="MenuMap" type="com.jpsoft.picc.modules.sys.entity.Menu">
         <id property="id" column="id_"/>
         <result property="menuName" column="menu_name"/>
         <result property="parentId" column="parent_id"/>
@@ -18,7 +18,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="delFlag" column="del_flag"/>
     </resultMap>
-    <insert id="insert" parameterType="Menu">
+    <insert id="insert" parameterType="com.jpsoft.picc.modules.sys.entity.Menu">
         <!--
         <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
             select sys_guid() from dual
@@ -47,7 +47,7 @@
     <delete id="delete" parameterType="string">
         delete from sys_menu where id_=#{id,jdbcType=VARCHAR}
     </delete>
-    <update id="update" parameterType="Menu">
+    <update id="update" parameterType="com.jpsoft.picc.modules.sys.entity.Menu">
         update sys_menu
         <set>
             <if test="menuName!=null">
@@ -118,7 +118,7 @@
             ]]>
         </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.userName} ${sort.order}
+            ${sort.name} ${sort.order}
         </foreach>
     </select>
     <select id="findAllocMenu"  parameterType="string" resultMap="MenuMap">

picc-admin-server/src/main/resources/mapper/sys/Permission.xml

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.PermissionDAO">
-    <resultMap id="PermissionMap" type="Permission">
+    <resultMap id="PermissionMap" type="com.jpsoft.picc.modules.sys.entity.Permission">
         <id property="id" column="id_"/>
         <result property="path" column="path_"/>
         <result property="method" column="method_"/>
@@ -14,7 +14,7 @@
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
-    <insert id="insert" parameterType="Permission">
+    <insert id="insert" parameterType="com.jpsoft.picc.modules.sys.entity.Permission">
         <!--
         <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
             select sys_guid() from dual
@@ -40,7 +40,7 @@
     <delete id="delete" parameterType="string">
         delete from sys_permission where id_=#{id,jdbcType=VARCHAR}
     </delete>
-    <update id="update" parameterType="Permission">
+    <update id="update" parameterType="com.jpsoft.picc.modules.sys.entity.Permission">
         update sys_permission
         <set>
             <if test="path!=null">
@@ -90,7 +90,7 @@
             and path_ like #{searchParams.path}
         </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.userName} ${sort.order}
+            ${sort.name} ${sort.order}
         </foreach>
     </select>
     <select id="hasPermitted" parameterType="string" resultType="int">

picc-admin-server/src/main/resources/mapper/sys/Role.xml

@@ -3,9 +3,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.RoleDAO">
-    <resultMap id="RoleMap" type="Role">
+    <resultMap id="RoleMap" type="com.jpsoft.picc.modules.sys.entity.Role">
         <id property="id" column="id_"/>
-        <result property="userName" column="name_"/>
+        <result property="name" column="name_"/>
         <result property="description" column="description_"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -13,7 +13,7 @@
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
     </resultMap>
-    <insert id="insert" parameterType="Role">
+    <insert id="insert" parameterType="com.jpsoft.picc.modules.sys.entity.Role">
         <!--
         <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
             select sys_guid() from dual
@@ -25,7 +25,7 @@
 		values
 		(
             #{id,jdbcType=VARCHAR}
-            ,#{userName,jdbcType=VARCHAR}
+            ,#{name,jdbcType=VARCHAR}
             ,#{description,jdbcType=VARCHAR}
             ,#{createTime,jdbcType= TIMESTAMP }
             ,#{updateTime,jdbcType= TIMESTAMP }
@@ -38,11 +38,11 @@
     <delete id="delete" parameterType="string">
         delete from sys_role where id_=#{id,jdbcType=VARCHAR}
     </delete>
-    <update id="update" parameterType="Role">
+    <update id="update" parameterType="com.jpsoft.picc.modules.sys.entity.Role">
         update sys_role
         <set>
-            <if test="userName!=null">
-                name_=#{userName,jdbcType=VARCHAR},
+            <if test="name!=null">
+                name_=#{name,jdbcType=VARCHAR},
             </if>
             <if test="description!=null">
                 description_=#{description,jdbcType=VARCHAR},
@@ -87,7 +87,7 @@
                 and description_ like #{searchParams.roleDesc}
             </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.userName} ${sort.order}
+            ${sort.name} ${sort.order}
         </foreach>
     </select>
 </mapper>

picc-admin-server/src/main/resources/mapper/sys/RoleMenu.xml

@@ -3,7 +3,7 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.RoleMenuDAO">
-	<resultMap id="RoleMenuMap" type="RoleMenu">
+	<resultMap id="RoleMenuMap" type="com.jpsoft.picc.modules.sys.entity.RoleMenu">
 		<id property="id" column="id_" />
 			<result property="roleId" column="role_id" />
 			<result property="menuId" column="menu_id" />
@@ -13,7 +13,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			</resultMap>
-	<insert id="insert" parameterType="RoleMenu">
+	<insert id="insert" parameterType="com.jpsoft.picc.modules.sys.entity.RoleMenu">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
 		select sys_guid() from dual
@@ -41,7 +41,7 @@
 	<delete id="deleteByRoleId" parameterType="string">
 		delete from sys_role_menu where role_id=#{0}
 	</delete>
-	<update id="update" parameterType="RoleMenu">
+	<update id="update" parameterType="com.jpsoft.picc.modules.sys.entity.RoleMenu">
 		update sys_role_menu
 		<set>
 				<if test="roleId!=null">
@@ -88,7 +88,7 @@ id_,role_id,menu_id,del_flag,create_by,create_time,update_by,update_time		from s
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 	<select id="findByRoleId" parameterType="string" resultMap="RoleMenuMap">

picc-admin-server/src/main/resources/mapper/sys/RolePermission.xml

@@ -3,7 +3,7 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.RolePermissionDAO">
-	<resultMap id="RolePermissionMap" type="RolePermission">
+	<resultMap id="RolePermissionMap" type="com.jpsoft.picc.modules.sys.entity.RolePermission">
 		<id property="id" column="id_" />
 			<result property="permId" column="perm_id" />
 			<result property="roleId" column="role_id" />
@@ -13,7 +13,7 @@
 			<result property="createTime" column="create_time" />
 			<result property="updateTime" column="update_time" />
 			</resultMap>
-	<insert id="insert" parameterType="RolePermission">
+	<insert id="insert" parameterType="com.jpsoft.picc.modules.sys.entity.RolePermission">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
 		select sys_guid() from dual
@@ -41,7 +41,7 @@
 	<delete id="deleteByRoleId" parameterType="string">
 		delete from sys_role_permission where role_id=#{0}
 	</delete>
-	<update id="update" parameterType="RolePermission">
+	<update id="update" parameterType="com.jpsoft.picc.modules.sys.entity.RolePermission">
 		update sys_role_permission
 		<set>
 				<if test="permId!=null">
@@ -87,7 +87,7 @@
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 	<select id="findByRoleId" parameterType="string" resultMap="RolePermissionMap">

picc-admin-server/src/main/resources/mapper/sys/User.xml

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.UserDAO">
-    <resultMap id="UserMap" type="User">
+    <resultMap id="UserMap" type="com.jpsoft.picc.modules.sys.entity.User">
         <id property="id" column="id_"/>
         <result property="userName" column="user_name"/>
         <result property="password" column="password_"/>
@@ -14,7 +14,7 @@
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
     </resultMap>
-    <insert id="insert" parameterType="User">
+    <insert id="insert" parameterType="com.jpsoft.picc.modules.sys.entity.User">
         <!--
         <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
             select sys_guid() from dual
@@ -40,7 +40,7 @@
     <delete id="delete" parameterType="string">
         delete from sys_user where id_=#{id,jdbcType=VARCHAR}
     </delete>
-    <update id="update" parameterType="User">
+    <update id="update" parameterType="com.jpsoft.picc.modules.sys.entity.User">
         update sys_user
         <set>
             <if test="userName!=null">
@@ -96,7 +96,7 @@
             and real_name like #{searchParams.realName}
         </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.userName} ${sort.order}
+            ${sort.name} ${sort.order}
         </foreach>
     </select>
 </mapper>

picc-admin-server/src/main/resources/mapper/sys/UserRole.xml

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.UserRoleDAO">
-    <resultMap id="UserRoleMap" type="UserRole">
+    <resultMap id="UserRoleMap" type="com.jpsoft.picc.modules.sys.entity.UserRole">
         <id property="id" column="id_"/>
         <result property="roleId" column="role_id"/>
         <result property="userId" column="user_id"/>
@@ -13,7 +13,7 @@
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
-    <insert id="insert" parameterType="UserRole">
+    <insert id="insert" parameterType="com.jpsoft.picc.modules.sys.entity.UserRole">
         <!--
         <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
             select sys_guid() from dual
@@ -41,7 +41,7 @@
     <delete id="deleteByUserId" parameterType="string">
         delete from sys_user_role where user_id=#{0}
     </delete>
-    <update id="update" parameterType="UserRole">
+    <update id="update" parameterType="com.jpsoft.picc.modules.sys.entity.UserRole">
         update sys_user_role
         <set>
             <if test="roleId!=null">
@@ -94,7 +94,7 @@
             </if>
         </where>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.userName} ${sort.order}
+            ${sort.name} ${sort.order}
         </foreach>
     </select>
 </mapper>

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/SMSUtil.java

@@ -0,0 +1,66 @@
+package com.jpsoft.picc.modules.common.utils;
+
+import cn.hutool.json.JSONObject;
+import com.jpsoft.picc.modules.common.dto.MessageResult;
+import com.taobao.api.DefaultTaobaoClient;
+import com.taobao.api.TaobaoClient;
+import com.taobao.api.request.AlibabaAliqinFcSmsNumSendRequest;
+import com.taobao.api.response.AlibabaAliqinFcSmsNumSendResponse;
+
+public class SMSUtil {
+    public final static String REG_TEMPLATE_CODE = "SMS_49445088";
+
+    private final static String APP_KEY = "24698874";
+    private final static String APP_SECRET = "5f5b21d1dc93e124aa803f95d71c00b8";
+    private final static String APP_URL = "https://eco.taobao.com/router/rest";
+    private final static String SIGN_NAME = "荆鹏云平台";
+    private final static String SMS_TYPE = "normal";
+
+    public static MessageResult<String> sendVerificationCode(String phones, String code){
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        TaobaoClient client = new DefaultTaobaoClient(APP_URL, APP_KEY, APP_SECRET);
+        AlibabaAliqinFcSmsNumSendRequest req = new AlibabaAliqinFcSmsNumSendRequest();
+        req.setSmsType(SMS_TYPE);
+        req.setSmsFreeSignName(SIGN_NAME);
+
+        JSONObject json = new JSONObject();
+        json.put("code", code);
+
+        req.setSmsParamString(json.toString());
+
+        req.setRecNum(phones);
+        req.setSmsTemplateCode(REG_TEMPLATE_CODE);
+
+        AlibabaAliqinFcSmsNumSendResponse rsp;
+        try {
+            rsp = client.execute(req);
+
+            JSONObject ret = new JSONObject(rsp.getBody());
+
+            if(ret.containsKey("error_response")){
+                messageResult.setResult(false);
+                messageResult.setMessage(ret.getJSONObject("error_response").getStr("sub_msg"));
+            }else if(ret.containsKey("alibaba_aliqin_fc_sms_num_send_response")){
+                JSONObject result = ret.getJSONObject("alibaba_aliqin_fc_sms_num_send_response").getJSONObject("result");
+
+                if(!result.getBool("success")){
+                    messageResult.setMessage(result.getStr("msg"));
+                }
+            }else{
+                messageResult.setResult(true);
+                messageResult.setMessage(ret.toString());
+            }
+        } catch (Exception e) {
+            messageResult.setResult(false);
+            messageResult.setMessage(e.toString());
+        }
+
+        return messageResult;
+    }
+
+    public static void main(String[] args){
+       MessageResult<String> messageResult = SMSUtil.sendVerificationCode("13986703087","134543");
+        System.out.println(messageResult);
+    }
+}

picc-common/src/main/resources/mapper/base/ApprovalRecord.xml

@@ -90,7 +90,7 @@ id_,company_id,application_id,status_,create_by,create_time,update_by,update_tim
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/base/CompanyMember.xml

@@ -6,7 +6,7 @@
 	<resultMap id="CompanyMemberMap" type="com.jpsoft.picc.modules.base.entity.CompanyMember">
 		<id property="id" column="id_" />
 			<result property="companyId" column="company_id" />
-			<result property="userName" column="name_" />
+			<result property="name" column="name_" />
 			<result property="cardType" column="card_type" />
 			<result property="cardNo" column="card_no" />
 			<result property="sex" column="sex_" />
@@ -128,7 +128,7 @@ id_,company_id,name_,card_type,card_no,sex_,age_,jobs_id,health_status,card_file
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/base/InsuranceAgent.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.jpsoft.picc.modules.base.dao.InsuranceAgentDAO">
 	<resultMap id="InsuranceAgentMap" type="com.jpsoft.picc.modules.base.entity.InsuranceAgent">
 		<id property="id" column="id_" />
-			<result property="userName" column="name_" />
+			<result property="name" column="name_" />
 			<result property="status" column="status_" />
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
@@ -85,7 +85,7 @@ id_,name_,status_,del_flag,create_by,create_time,update_by,update_time		from bas
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/base/InsuranceDefinition.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.jpsoft.picc.modules.base.dao.InsuranceDefinitionDAO">
 	<resultMap id="InsuranceDefinitionMap" type="com.jpsoft.picc.modules.base.entity.InsuranceDefinition">
 		<id property="id" column="id_" />
-			<result property="userName" column="name_" />
+			<result property="name" column="name_" />
 			<result property="insuranceDescription" column="insurance_description" />
 			<result property="clause" column="clause_" />
 			<result property="status" column="status_" />
@@ -95,7 +95,7 @@ id_,name_,insurance_description,clause_,status_,del_flag,create_by,create_time,u
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/base/InsuranceDefinitionLimit.xml

@@ -6,7 +6,7 @@
 	<resultMap id="InsuranceDefinitionLimitMap" type="com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit">
 		<id property="id" column="id_" />
 			<result property="definitionId" column="definition_id" />
-			<result property="userName" column="name_" />
+			<result property="name" column="name_" />
 			<result property="limit" column="limit_" />
 			<result property="unit" column="unit_" />
 			<result property="status" column="status_" />
@@ -103,7 +103,7 @@ id_,definition_id,name_,limit_,unit_,status_,del_flag,create_by,create_time,upda
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/base/InsuranceJobs.xml

@@ -96,7 +96,7 @@ id_,jobs_id,definition_id,charges_,del_flag,create_by,create_time,update_by,upda
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/base/Jobs.xml

@@ -6,7 +6,7 @@
 	<resultMap id="JobsMap" type="com.jpsoft.picc.modules.base.entity.Jobs">
 		<id property="id" column="id_" />
 			<result property="definitionId" column="definition_id" />
-			<result property="userName" column="name_" />
+			<result property="name" column="name_" />
 			<result property="content" column="content_" />
 			<result property="status" column="status_" />
 			<result property="delFlag" column="del_flag" />
@@ -98,7 +98,7 @@ id_,definition_id,name_,content_,status_,del_flag,create_by,create_time,update_b
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/base/Message.xml

@@ -109,7 +109,7 @@ id_,title_,content_,sender_id,recipient_id,status_,create_by,create_time,update_
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/base/TransactionRecord.xml

@@ -110,7 +110,7 @@ id_,company_id,transaction_number,amount_,order_no,payment_status,buy_type,payme
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/business/ApplicationPolicy.xml

@@ -60,7 +60,7 @@ id_,application_id,policy_id		from business_application_policy where id_=#{0}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/business/InsuranceApplication.xml

@@ -125,7 +125,7 @@ id_,company_id,definition_id,insured_name,insured_tel,start_time,end_time,number
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/business/InsurancePolicy.xml

@@ -140,7 +140,7 @@ id_,status_,process_status,insurance_fee,start_time,end_time,number_,account_ban
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/business/InsurancePolicyMember.xml

@@ -95,7 +95,7 @@ id_,policy_id,member_id,status_,is_add,del_flag,create_by,create_time,update_by,
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-common/src/main/resources/mapper/business/InsurancePolicyRecord.xml

@@ -93,7 +93,7 @@ id_,policy_id,opinion_,process_status,del_flag,create_by,create_time,update_by,u
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.userName} ${sort.order}
+	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/controller/CompanyUserController.java

@@ -9,6 +9,7 @@ import com.jpsoft.picc.modules.base.service.CompanyUserService;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.utils.DES3;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
+import com.jpsoft.picc.modules.common.utils.SMSUtil;
 import com.jpsoft.picc.modules.pub.dto.CompanyInfoDTO;
 import com.jpsoft.picc.modules.pub.dto.PersonalInfoDTO;
 import io.swagger.annotations.Api;
@@ -36,15 +37,14 @@ public class CompanyUserController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "phone",value = "注册手机号", required = true, paramType = "form")
     })
-    public MessageResult<Integer> sendVerificationCode(String phone, HttpSession session){
-        MessageResult<Integer> messageResult = new MessageResult<>();
-
+    public MessageResult<String> sendVerificationCode(String phone, HttpSession session){
         int rndInt = RandomUtil.randomInt(100000,1000000);
 
-        messageResult.setResult(true);
-        messageResult.setData(rndInt);
+        MessageResult<String> messageResult = SMSUtil.sendVerificationCode(phone,String.valueOf(rndInt));
 
-        session.setAttribute("valCode",rndInt);
+        if (messageResult.isResult()) {
+            session.setAttribute("valCode", rndInt);
+        }
 
         return messageResult;
     }

pom.xml

@@ -114,5 +114,13 @@
             <version>3.1.0</version>
         </dependency>
         <!-- aliyun oss end -->
+
+        <!-- 阿里大鱼短信jar包 start-->
+        <dependency>
+            <groupId>com.taobao</groupId>
+            <artifactId>taobao-sdk-java</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <!-- 阿里大鱼短信jar包 end-->
     </dependencies>
 </project>