!133 代码合并

Merge pull request !133 from MAC/develop

src/main/java/com/qiwenshare/file/domain/OperationLogBean.java

@@ -28,7 +28,7 @@ public class OperationLogBean {
     /**
      * 用户id
      */
-    @Column(columnDefinition="bigint(20) comment '用户id'")
+    @Column(columnDefinition="varchar(20) comment '用户id'")
     private String userId;
 
     /**

src/main/java/com/qiwenshare/file/domain/user/UserRole.java

@@ -16,6 +16,6 @@ public class UserRole {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @TableId(type = IdType.AUTO)
     private Long userRoleId;
-    private Long userId;
+    private String userId;
     private Long roleId;
 }

src/main/java/com/qiwenshare/file/mapper/UserMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 public interface UserMapper extends BaseMapper<UserBean> {
     int insertUser(UserBean userBean);
 
-    int insertUserRole(String userId, long roleId);
+    int insertUserRole(@Param("userId") String userId, @Param("roleId") long roleId);
 
     List<Role>  selectRoleListByUserId(@Param("userId") String userId);
 

src/main/resources/mapper/UserMapper.xml

@@ -11,9 +11,9 @@
         VALUES (#{userId}, #{username},#{salt}, #{password}, #{telephone}, #{sex}, #{imageUrl}, #{registerTime}, 1);
     </insert>
 
-    <insert id="insertUserRole" parameterType="Long">
+    <insert id="insertUserRole">
         INSERT INTO user_role (userId, roleId)
-        VALUES (#{param1}, #{param2});
+        VALUES (#{userId}, #{roleId});
     </insert>
 
     <select id="selectRoleListByUserId" resultType="com.qiwenshare.file.domain.user.Role">