Przeglądaj źródła

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Conflicts:
	src/main/java/com/goafanti/user/controller/UserApiController.java
albertshaw 9 lat temu
rodzic
commit
09fba1cbf0
56 zmienionych plików z 3921 dodań i 355 usunięć
  1. 36 26
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  2. 48 0
      src/main/java/com/goafanti/common/controller/PublicController.java
  3. 24 0
      src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java
  4. 21 0
      src/main/java/com/goafanti/common/dao/OrganizationInfoMapper.java
  5. 22 0
      src/main/java/com/goafanti/common/dao/OrganizationTechMapper.java
  6. 22 0
      src/main/java/com/goafanti/common/dao/UserAbilityMapper.java
  7. 21 0
      src/main/java/com/goafanti/common/dao/UserCareerMapper.java
  8. 22 0
      src/main/java/com/goafanti/common/dao/UserEduMapper.java
  9. 25 0
      src/main/java/com/goafanti/common/dao/UserIdentityMapper.java
  10. 26 0
      src/main/java/com/goafanti/common/dao/UserInfoMapper.java
  11. 19 16
      src/main/java/com/goafanti/common/dao/UserMapper.java
  12. 243 0
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  13. 171 0
      src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml
  14. 100 0
      src/main/java/com/goafanti/common/mapper/OrganizationTechMapper.xml
  15. 71 0
      src/main/java/com/goafanti/common/mapper/UserAbilityMapper.xml
  16. 209 0
      src/main/java/com/goafanti/common/mapper/UserCareerMapper.xml
  17. 160 0
      src/main/java/com/goafanti/common/mapper/UserEduMapper.xml
  18. 141 0
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  19. 166 0
      src/main/java/com/goafanti/common/mapper/UserInfoMapper.xml
  20. 141 127
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  21. 88 0
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  22. 140 0
      src/main/java/com/goafanti/common/model/OrganizationInfo.java
  23. 62 0
      src/main/java/com/goafanti/common/model/OrganizationTech.java
  24. 122 106
      src/main/java/com/goafanti/common/model/User.java
  25. 36 0
      src/main/java/com/goafanti/common/model/UserAbility.java
  26. 179 0
      src/main/java/com/goafanti/common/model/UserCareer.java
  27. 127 0
      src/main/java/com/goafanti/common/model/UserEdu.java
  28. 109 0
      src/main/java/com/goafanti/common/model/UserIdentity.java
  29. 127 0
      src/main/java/com/goafanti/common/model/UserInfo.java
  30. 24 0
      src/main/java/com/goafanti/user/bo/OrgIdentityBo.java
  31. 20 0
      src/main/java/com/goafanti/user/bo/UidAndTypeBo.java
  32. 22 0
      src/main/java/com/goafanti/user/bo/UserIdentityBo.java
  33. 31 0
      src/main/java/com/goafanti/user/bo/UserInfoBo.java
  34. 409 47
      src/main/java/com/goafanti/user/controller/UserApiController.java
  35. 51 0
      src/main/java/com/goafanti/user/controller/UserLoginController.java
  36. 66 0
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  37. 16 0
      src/main/java/com/goafanti/user/service/OrganizationIdentityService.java
  38. 13 0
      src/main/java/com/goafanti/user/service/OrganizationInfoService.java
  39. 13 0
      src/main/java/com/goafanti/user/service/OrganizationTechService.java
  40. 14 0
      src/main/java/com/goafanti/user/service/UserAbilityService.java
  41. 13 0
      src/main/java/com/goafanti/user/service/UserCareerService.java
  42. 13 0
      src/main/java/com/goafanti/user/service/UserEduService.java
  43. 17 0
      src/main/java/com/goafanti/user/service/UserIdentityService.java
  44. 16 0
      src/main/java/com/goafanti/user/service/UserInfoService.java
  45. 18 5
      src/main/java/com/goafanti/user/service/UserService.java
  46. 36 0
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  47. 31 0
      src/main/java/com/goafanti/user/service/impl/OrganizationInfoServiceImpl.java
  48. 30 0
      src/main/java/com/goafanti/user/service/impl/OrganizationTechServiceImpl.java
  49. 31 0
      src/main/java/com/goafanti/user/service/impl/UserAbilityServiceImpl.java
  50. 30 0
      src/main/java/com/goafanti/user/service/impl/UserCareerServiceImpl.java
  51. 36 0
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java
  52. 35 0
      src/main/java/com/goafanti/user/service/impl/UserInfoServiceImpl.java
  53. 90 10
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java
  54. 31 0
      src/main/java/com/goafanti/user/service/impl/userEduServiceImpl.java
  55. 119 0
      src/main/webapp/WEB-INF/html/test.html
  56. 18 18
      src/main/webapp/WEB-INF/views/index.jsp

+ 36 - 26
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -1,27 +1,37 @@
-package com.goafanti.common.constant;
-
-public class ErrorConstants {
-
-	public static final String NON_LOGIN = "NON_LOGIN";
-
-	public static final String VCODE_ERROR = "VCODE_ERROR";
-
-	public static final String EMAIL_SIZE_ERROR = "EMAIL_SIZE_ERROR";
-
-	public static final String EMAIL_PATTERN_ERROR = "EMAIL_PATTERN_ERROR";
-
-	public static final String DUNPLICATE_KAY_ERROR = "DUNPLICATE_KAY_ERROR";
-
-	public static final String PARAM_INTEGER_ERROR = "PARAM_INTEGER_ERROR";
-
-	public static final String PARAM_EMPTY_ERROR = "PARAM_EMPTY_ERROR";
-
-	public static final String PARAM_SIZE_ERROR = "PARAM_SIZE_ERROR";
-
-	public static final String PARAM_PATTERN_ERROR = "PARAM_PATTERN_ERROR";
-
-	public static final String DATA_EMPTY_ERROR = "DATA_EMPTY_ERROR";
-
-	public static final String PWD_NOT_MATCH_ERROR = "PWD_NOT_MATCH_ERROR";
-
+package com.goafanti.common.constant;
+
+public class ErrorConstants {
+
+	public static final String NON_LOGIN = "NON_LOGIN";
+
+	public static final String VCODE_ERROR = "VCODE_ERROR";
+
+	public static final String EMAIL_SIZE_ERROR = "EMAIL_SIZE_ERROR";
+
+	public static final String EMAIL_PATTERN_ERROR = "EMAIL_PATTERN_ERROR";
+
+	public static final String DUNPLICATE_KAY_ERROR = "DUNPLICATE_KAY_ERROR";
+
+	public static final String PARAM_INTEGER_ERROR = "PARAM_INTEGER_ERROR";
+
+	public static final String PARAM_EMPTY_ERROR = "PARAM_EMPTY_ERROR";
+
+	public static final String PARAM_SIZE_ERROR = "PARAM_SIZE_ERROR";
+
+	public static final String PARAM_PATTERN_ERROR = "PARAM_PATTERN_ERROR";
+
+	public static final String DATA_EMPTY_ERROR = "DATA_EMPTY_ERROR";
+
+	public static final String PWD_NOT_MATCH_ERROR = "PWD_NOT_MATCH_ERROR";
+	
+	public static final String USER_ALREADY_EXIST = "USER_ALREADY_EXIST";
+	
+	public static final String MOBILE_PATTERN_ERROR = "MOBILE_PATTERN_ERROR";
+	
+	public static final String MOBILE_SIZE_ERROR = "MOBILE_SIZE_ERROR";
+	
+	public static final String IDNUMBER_SIZE_ERROR = "IDNUMBER_SIZE_ERROR";
+	
+	public static final String IDNUMBER_PATTERN_ERROR = "IDNUMBER_PATTERN_ERROR";
+
 }

+ 48 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -0,0 +1,48 @@
+package com.goafanti.common.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.VerifyCodeUtils;
+import com.goafanti.core.shiro.token.TokenManager;
+
+
+
+@Controller
+@Scope(value = "prototype")
+@RequestMapping("/open")
+public class PublicController extends BaseController {
+	
+
+	/**
+	 * 获取验证码
+	 * 
+	 * @param response
+	 */
+	@RequestMapping(value = "/getVCode", method = RequestMethod.GET)
+	public void getVCode(HttpServletResponse response, HttpServletRequest request) {
+		try {
+			response.setHeader("Pragma", "No-cache");
+			response.setHeader("Cache-Control", "no-cache");
+			response.setDateHeader("Expires", 0);
+			response.setContentType("image/jpg");
+
+			// 生成随机字串
+			String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
+			// 存入Shiro会话session
+			TokenManager.setVal2Session(VerifyCodeUtils.V_CODE, verifyCode.toLowerCase());
+			// 生成图片
+			int w = 146, h = 33;
+			VerifyCodeUtils.outputImage(w, h, response.getOutputStream(), verifyCode);
+		} catch (Exception e) {
+			LoggerUtils.fmtError(getClass(), e, "获取验证码异常:%s", e.getMessage());
+		}
+	}
+
+}

+ 24 - 0
src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java

@@ -0,0 +1,24 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.user.bo.OrgIdentityBo;
+
+public interface OrganizationIdentityMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(OrganizationIdentity record);
+
+    int insertSelective(OrganizationIdentity record);
+
+    OrganizationIdentity selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(OrganizationIdentity record);
+
+    int updateByPrimaryKey(OrganizationIdentity record);
+    
+    
+
+	OrganizationIdentity selectOrgIdentityByUserId(String userId);
+
+	OrgIdentityBo selectOrgIdentityBoByUserId(String uid);
+}

+ 21 - 0
src/main/java/com/goafanti/common/dao/OrganizationInfoMapper.java

@@ -0,0 +1,21 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrganizationInfo;
+
+public interface OrganizationInfoMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(OrganizationInfo record);
+
+    int insertSelective(OrganizationInfo record);
+
+    OrganizationInfo selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(OrganizationInfo record);
+
+    int updateByPrimaryKey(OrganizationInfo record);
+    
+    
+
+	OrganizationInfo selectOrgInfoByUserId(String uid);
+}

+ 22 - 0
src/main/java/com/goafanti/common/dao/OrganizationTechMapper.java

@@ -0,0 +1,22 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrganizationTech;
+
+public interface OrganizationTechMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(OrganizationTech record);
+
+    int insertSelective(OrganizationTech record);
+
+    OrganizationTech selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(OrganizationTech record);
+
+    int updateByPrimaryKey(OrganizationTech record);
+    
+    
+    
+
+	OrganizationTech selectOrgTechByUserId(String uid);
+}

+ 22 - 0
src/main/java/com/goafanti/common/dao/UserAbilityMapper.java

@@ -0,0 +1,22 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.UserAbility;
+import com.goafanti.common.model.UserCareer;
+
+public interface UserAbilityMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(UserAbility record);
+
+    int insertSelective(UserAbility record);
+
+    UserAbility selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(UserAbility record);
+
+    int updateByPrimaryKey(UserAbility record);
+    
+    
+
+	UserCareer selectUserAbilityByUserId(String userId);
+}

+ 21 - 0
src/main/java/com/goafanti/common/dao/UserCareerMapper.java

@@ -0,0 +1,21 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.UserCareer;
+
+public interface UserCareerMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(UserCareer record);
+
+    int insertSelective(UserCareer record);
+
+    UserCareer selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(UserCareer record);
+
+    int updateByPrimaryKey(UserCareer record);
+    
+    
+
+	UserCareer selectUserCareerByUserId(String userId);
+}

+ 22 - 0
src/main/java/com/goafanti/common/dao/UserEduMapper.java

@@ -0,0 +1,22 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.UserEdu;
+
+public interface UserEduMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(UserEdu record);
+
+    int insertSelective(UserEdu record);
+
+    UserEdu selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(UserEdu record);
+
+    int updateByPrimaryKey(UserEdu record);
+    
+    
+    
+
+	UserEdu selectUserEduByUserId(String userId);
+}

+ 25 - 0
src/main/java/com/goafanti/common/dao/UserIdentityMapper.java

@@ -0,0 +1,25 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.UserIdentity;
+import com.goafanti.user.bo.UserIdentityBo;
+
+public interface UserIdentityMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(UserIdentity record);
+
+    int insertSelective(UserIdentity record);
+
+    UserIdentity selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(UserIdentity record);
+
+    int updateByPrimaryKey(UserIdentity record);
+
+    
+    
+    
+	UserIdentity selectUserIdentityByUserId(String uid);
+
+	UserIdentityBo selectUserIdentityBoByUserId(String uid);
+}

+ 26 - 0
src/main/java/com/goafanti/common/dao/UserInfoMapper.java

@@ -0,0 +1,26 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.UserInfo;
+import com.goafanti.user.bo.UserInfoBo;
+
+public interface UserInfoMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(UserInfo record);
+
+    int insertSelective(UserInfo record);
+
+    UserInfo selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(UserInfo record);
+
+    int updateByPrimaryKey(UserInfo record);
+    
+    
+    
+    
+
+	UserInfo selectUserInfoByUserId(String uid);
+
+	UserInfoBo selectUserInfoBoByUserId(String uid);
+}

+ 19 - 16
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -1,17 +1,20 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.User;
-
-public interface UserMapper {
-    int deleteByPrimaryKey(String id);
-
-    int insert(User record);
-
-    int insertSelective(User record);
-
-    User selectByPrimaryKey(String id);
-
-    int updateByPrimaryKeySelective(User record);
-
-    int updateByPrimaryKey(User record);
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.User;
+
+
+public interface UserMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(User record);
+
+    int insertSelective(User record);
+
+    User selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(User record);
+
+    int updateByPrimaryKey(User record);
+
+	User selectByMobieAndType(java.lang.String mobile, Integer type);
 }

+ 243 - 0
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.OrganizationIdentityMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrganizationIdentity">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="contacts" jdbcType="VARCHAR" property="contacts" />
+    <result column="fixed_tel" jdbcType="VARCHAR" property="fixedTel" />
+    <result column="qq" jdbcType="VARCHAR" property="qq" />
+    <result column="postal_address" jdbcType="VARCHAR" property="postalAddress" />
+    <result column="postcode" jdbcType="VARCHAR" property="postcode" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, uid, contacts, fixed_tel, qq, postal_address, postcode
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from organization_identity
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from organization_identity
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrganizationIdentity">
+    insert into organization_identity (id, uid, contacts, 
+      fixed_tel, qq, postal_address, 
+      postcode)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
+      #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, #{postalAddress,jdbcType=VARCHAR}, 
+      #{postcode,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationIdentity">
+    insert into organization_identity
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="uid != null">
+        uid,
+      </if>
+      <if test="contacts != null">
+        contacts,
+      </if>
+      <if test="fixedTel != null">
+        fixed_tel,
+      </if>
+      <if test="qq != null">
+        qq,
+      </if>
+      <if test="postalAddress != null">
+        postal_address,
+      </if>
+      <if test="postcode != null">
+        postcode,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="contacts != null">
+        #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="fixedTel != null">
+        #{fixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="qq != null">
+        #{qq,jdbcType=VARCHAR},
+      </if>
+      <if test="postalAddress != null">
+        #{postalAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="postcode != null">
+        #{postcode,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationIdentity">
+    update organization_identity
+    <set>
+      <if test="uid != null">
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="contacts != null">
+        contacts = #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="fixedTel != null">
+        fixed_tel = #{fixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="qq != null">
+        qq = #{qq,jdbcType=VARCHAR},
+      </if>
+      <if test="postalAddress != null">
+        postal_address = #{postalAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="postcode != null">
+        postcode = #{postcode,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrganizationIdentity">
+    update organization_identity
+    set uid = #{uid,jdbcType=VARCHAR},
+      contacts = #{contacts,jdbcType=VARCHAR},
+      fixed_tel = #{fixedTel,jdbcType=VARCHAR},
+      qq = #{qq,jdbcType=VARCHAR},
+      postal_address = #{postalAddress,jdbcType=VARCHAR},
+      postcode = #{postcode,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrganizationIdentity">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="contacts" jdbcType="VARCHAR" property="contacts" />
+    <result column="fixed_tel" jdbcType="VARCHAR" property="fixedTel" />
+    <result column="qq" jdbcType="VARCHAR" property="qq" />
+    <result column="postal_address" jdbcType="VARCHAR" property="postalAddress" />
+    <result column="postcode" jdbcType="VARCHAR" property="postcode" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, uid, contacts, fixed_tel, qq, postal_address, postcode
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from organization_identity
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from organization_identity
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrganizationIdentity">
+    insert into organization_identity (id, uid, contacts, 
+      fixed_tel, qq, postal_address, 
+      postcode)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
+      #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, #{postalAddress,jdbcType=VARCHAR}, 
+      #{postcode,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationIdentity">
+    insert into organization_identity
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="uid != null">
+        uid,
+      </if>
+      <if test="contacts != null">
+        contacts,
+      </if>
+      <if test="fixedTel != null">
+        fixed_tel,
+      </if>
+      <if test="qq != null">
+        qq,
+      </if>
+      <if test="postalAddress != null">
+        postal_address,
+      </if>
+      <if test="postcode != null">
+        postcode,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="contacts != null">
+        #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="fixedTel != null">
+        #{fixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="qq != null">
+        #{qq,jdbcType=VARCHAR},
+      </if>
+      <if test="postalAddress != null">
+        #{postalAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="postcode != null">
+        #{postcode,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationIdentity">
+    update organization_identity
+    <set>
+      <if test="uid != null">
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="contacts != null">
+        contacts = #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="fixedTel != null">
+        fixed_tel = #{fixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="qq != null">
+        qq = #{qq,jdbcType=VARCHAR},
+      </if>
+      <if test="postalAddress != null">
+        postal_address = #{postalAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="postcode != null">
+        postcode = #{postcode,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrganizationIdentity">
+    update organization_identity
+    set uid = #{uid,jdbcType=VARCHAR},
+      contacts = #{contacts,jdbcType=VARCHAR},
+      fixed_tel = #{fixedTel,jdbcType=VARCHAR},
+      qq = #{qq,jdbcType=VARCHAR},
+      postal_address = #{postalAddress,jdbcType=VARCHAR},
+      postcode = #{postcode,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+   <select id="selectOrgIdentityByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from organization_identity
+    where uid = #{uid,jdbcType=VARCHAR}
+  </select>
+  
+  <select id="selectOrgIdentityBoByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgIdentityBo">
+  	select t.id,t.uid,t.contacts,t.fixed_tel,t.qq,t.postal_address,t.postcode,
+    u.email from (select email, id from user ) u inner JOIN organization_identity t
+    on t.uid = u.id where t.uid=#{uid,jdbcType=VARCHAR}
+  </select>
+</mapper>

+ 171 - 0
src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.OrganizationInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrganizationInfo" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="identity_type" property="identityType" jdbcType="VARCHAR" />
+    <result column="company_name" property="companyName" jdbcType="VARCHAR" />
+    <result column="location" property="location" jdbcType="VARCHAR" />
+    <result column="unit_size" property="unitSize" jdbcType="VARCHAR" />
+    <result column="company_introduction" property="companyIntroduction" jdbcType="VARCHAR" />
+    <result column="home_unit" property="homeUnit" jdbcType="VARCHAR" />
+    <result column="enterprise qualification" property="enterpriseQualification" jdbcType="VARCHAR" />
+    <result column="logo" property="logo" jdbcType="VARCHAR" />
+    <result column="publicity _picture" property="publicityPicture" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, identity_type, company_name, location, unit_size, company_introduction, 
+    home_unit, "enterprise qualification", logo, "publicity _picture"
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from organization_info
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from organization_info
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrganizationInfo" >
+    insert into organization_info (id, uid, identity_type, 
+      company_name, location, unit_size, 
+      company_introduction, home_unit, "enterprise qualification", 
+      logo, "publicity _picture")
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{identityType,jdbcType=VARCHAR}, 
+      #{companyName,jdbcType=VARCHAR}, #{location,jdbcType=VARCHAR}, #{unitSize,jdbcType=VARCHAR}, 
+      #{companyIntroduction,jdbcType=VARCHAR}, #{homeUnit,jdbcType=VARCHAR}, #{enterpriseQualification,jdbcType=VARCHAR}, 
+      #{logo,jdbcType=VARCHAR}, #{publicityPicture,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
+    insert into organization_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="identityType != null" >
+        identity_type,
+      </if>
+      <if test="companyName != null" >
+        company_name,
+      </if>
+      <if test="location != null" >
+        location,
+      </if>
+      <if test="unitSize != null" >
+        unit_size,
+      </if>
+      <if test="companyIntroduction != null" >
+        company_introduction,
+      </if>
+      <if test="homeUnit != null" >
+        home_unit,
+      </if>
+      <if test="enterpriseQualification != null" >
+        "enterprise qualification",
+      </if>
+      <if test="logo != null" >
+        logo,
+      </if>
+      <if test="publicityPicture != null" >
+        "publicity _picture",
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null" >
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="identityType != null" >
+        #{identityType,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null" >
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="location != null" >
+        #{location,jdbcType=VARCHAR},
+      </if>
+      <if test="unitSize != null" >
+        #{unitSize,jdbcType=VARCHAR},
+      </if>
+      <if test="companyIntroduction != null" >
+        #{companyIntroduction,jdbcType=VARCHAR},
+      </if>
+      <if test="homeUnit != null" >
+        #{homeUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="enterpriseQualification != null" >
+        #{enterpriseQualification,jdbcType=VARCHAR},
+      </if>
+      <if test="logo != null" >
+        #{logo,jdbcType=VARCHAR},
+      </if>
+      <if test="publicityPicture != null" >
+        #{publicityPicture,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
+    update organization_info
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="identityType != null" >
+        identity_type = #{identityType,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null" >
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="location != null" >
+        location = #{location,jdbcType=VARCHAR},
+      </if>
+      <if test="unitSize != null" >
+        unit_size = #{unitSize,jdbcType=VARCHAR},
+      </if>
+      <if test="companyIntroduction != null" >
+        company_introduction = #{companyIntroduction,jdbcType=VARCHAR},
+      </if>
+      <if test="homeUnit != null" >
+        home_unit = #{homeUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="enterpriseQualification != null" >
+        "enterprise qualification" = #{enterpriseQualification,jdbcType=VARCHAR},
+      </if>
+      <if test="logo != null" >
+        logo = #{logo,jdbcType=VARCHAR},
+      </if>
+      <if test="publicityPicture != null" >
+        "publicity _picture" = #{publicityPicture,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrganizationInfo" >
+    update organization_info
+    set uid = #{uid,jdbcType=VARCHAR},
+      identity_type = #{identityType,jdbcType=VARCHAR},
+      company_name = #{companyName,jdbcType=VARCHAR},
+      location = #{location,jdbcType=VARCHAR},
+      unit_size = #{unitSize,jdbcType=VARCHAR},
+      company_introduction = #{companyIntroduction,jdbcType=VARCHAR},
+      home_unit = #{homeUnit,jdbcType=VARCHAR},
+      "enterprise qualification" = #{enterpriseQualification,jdbcType=VARCHAR},
+      logo = #{logo,jdbcType=VARCHAR},
+      "publicity _picture" = #{publicityPicture,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="selectOrgInfoByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from organization_info
+    where uid = #{uid,jdbcType=VARCHAR}
+  </select>
+</mapper>

+ 100 - 0
src/main/java/com/goafanti/common/mapper/OrganizationTechMapper.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.OrganizationTechMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrganizationTech" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="technical_people_num" property="technicalPeopleNum" jdbcType="VARCHAR" />
+    <result column="key_search_area" property="keySearchArea" jdbcType="VARCHAR" />
+    <result column="specialty" property="specialty" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, technical_people_num, key_search_area, specialty
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from organization_tech
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from organization_tech
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrganizationTech" >
+    insert into organization_tech (id, uid, technical_people_num, 
+      key_search_area, specialty)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{technicalPeopleNum,jdbcType=VARCHAR}, 
+      #{keySearchArea,jdbcType=VARCHAR}, #{specialty,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationTech" >
+    insert into organization_tech
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="technicalPeopleNum != null" >
+        technical_people_num,
+      </if>
+      <if test="keySearchArea != null" >
+        key_search_area,
+      </if>
+      <if test="specialty != null" >
+        specialty,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null" >
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="technicalPeopleNum != null" >
+        #{technicalPeopleNum,jdbcType=VARCHAR},
+      </if>
+      <if test="keySearchArea != null" >
+        #{keySearchArea,jdbcType=VARCHAR},
+      </if>
+      <if test="specialty != null" >
+        #{specialty,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationTech" >
+    update organization_tech
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="technicalPeopleNum != null" >
+        technical_people_num = #{technicalPeopleNum,jdbcType=VARCHAR},
+      </if>
+      <if test="keySearchArea != null" >
+        key_search_area = #{keySearchArea,jdbcType=VARCHAR},
+      </if>
+      <if test="specialty != null" >
+        specialty = #{specialty,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrganizationTech" >
+    update organization_tech
+    set uid = #{uid,jdbcType=VARCHAR},
+      technical_people_num = #{technicalPeopleNum,jdbcType=VARCHAR},
+      key_search_area = #{keySearchArea,jdbcType=VARCHAR},
+      specialty = #{specialty,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+   <select id="selectOrgTechByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from organization_tech
+    where uid = #{uid,jdbcType=VARCHAR}
+  </select>
+</mapper>

+ 71 - 0
src/main/java/com/goafanti/common/mapper/UserAbilityMapper.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.UserAbilityMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserAbility" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="ability_label" property="abilityLabel" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, ability_label
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from user_ability
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from user_ability
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.UserAbility" >
+    insert into user_ability (id, uid, ability_label
+      )
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{abilityLabel,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserAbility" >
+    insert into user_ability
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="abilityLabel != null" >
+        ability_label,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null" >
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="abilityLabel != null" >
+        #{abilityLabel,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserAbility" >
+    update user_ability
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="abilityLabel != null" >
+        ability_label = #{abilityLabel,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserAbility" >
+    update user_ability
+    set uid = #{uid,jdbcType=VARCHAR},
+      ability_label = #{abilityLabel,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 209 - 0
src/main/java/com/goafanti/common/mapper/UserCareerMapper.xml

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.UserCareerMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserCareer" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="engaged_field" property="engagedField" jdbcType="VARCHAR" />
+    <result column="working_age" property="workingAge" jdbcType="VARCHAR" />
+    <result column="professional_title" property="professionalTitle" jdbcType="VARCHAR" />
+    <result column="professional_title_gettime" property="professionalTitleGettime" jdbcType="VARCHAR" />
+    <result column="professional_certificate" property="professionalCertificate" jdbcType="VARCHAR" />
+    <result column="qualification" property="qualification" jdbcType="VARCHAR" />
+    <result column="qualification_gettime" property="qualificationGettime" jdbcType="VARCHAR" />
+    <result column="qualification_certificate" property="qualificationCertificate" jdbcType="VARCHAR" />
+    <result column="work_unit" property="workUnit" jdbcType="VARCHAR" />
+    <result column="position" property="position" jdbcType="VARCHAR" />
+    <result column="experiences" property="experiences" jdbcType="VARCHAR" />
+    <result column="achievement" property="achievement" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, engaged_field, working_age, professional_title, professional_title_gettime, 
+    professional_certificate, qualification, qualification_gettime, qualification_certificate, 
+    work_unit, position, experiences, achievement
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from user_career
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from user_career
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.UserCareer" >
+    insert into user_career (id, uid, engaged_field, 
+      working_age, professional_title, professional_title_gettime, 
+      professional_certificate, qualification, 
+      qualification_gettime, qualification_certificate, 
+      work_unit, position, experiences, 
+      achievement)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{engagedField,jdbcType=VARCHAR}, 
+      #{workingAge,jdbcType=VARCHAR}, #{professionalTitle,jdbcType=VARCHAR}, #{professionalTitleGettime,jdbcType=VARCHAR}, 
+      #{professionalCertificate,jdbcType=VARCHAR}, #{qualification,jdbcType=VARCHAR}, 
+      #{qualificationGettime,jdbcType=VARCHAR}, #{qualificationCertificate,jdbcType=VARCHAR}, 
+      #{workUnit,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, #{experiences,jdbcType=VARCHAR}, 
+      #{achievement,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserCareer" >
+    insert into user_career
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="engagedField != null" >
+        engaged_field,
+      </if>
+      <if test="workingAge != null" >
+        working_age,
+      </if>
+      <if test="professionalTitle != null" >
+        professional_title,
+      </if>
+      <if test="professionalTitleGettime != null" >
+        professional_title_gettime,
+      </if>
+      <if test="professionalCertificate != null" >
+        professional_certificate,
+      </if>
+      <if test="qualification != null" >
+        qualification,
+      </if>
+      <if test="qualificationGettime != null" >
+        qualification_gettime,
+      </if>
+      <if test="qualificationCertificate != null" >
+        qualification_certificate,
+      </if>
+      <if test="workUnit != null" >
+        work_unit,
+      </if>
+      <if test="position != null" >
+        position,
+      </if>
+      <if test="experiences != null" >
+        experiences,
+      </if>
+      <if test="achievement != null" >
+        achievement,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null" >
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="engagedField != null" >
+        #{engagedField,jdbcType=VARCHAR},
+      </if>
+      <if test="workingAge != null" >
+        #{workingAge,jdbcType=VARCHAR},
+      </if>
+      <if test="professionalTitle != null" >
+        #{professionalTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="professionalTitleGettime != null" >
+        #{professionalTitleGettime,jdbcType=VARCHAR},
+      </if>
+      <if test="professionalCertificate != null" >
+        #{professionalCertificate,jdbcType=VARCHAR},
+      </if>
+      <if test="qualification != null" >
+        #{qualification,jdbcType=VARCHAR},
+      </if>
+      <if test="qualificationGettime != null" >
+        #{qualificationGettime,jdbcType=VARCHAR},
+      </if>
+      <if test="qualificationCertificate != null" >
+        #{qualificationCertificate,jdbcType=VARCHAR},
+      </if>
+      <if test="workUnit != null" >
+        #{workUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="position != null" >
+        #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="experiences != null" >
+        #{experiences,jdbcType=VARCHAR},
+      </if>
+      <if test="achievement != null" >
+        #{achievement,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserCareer" >
+    update user_career
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="engagedField != null" >
+        engaged_field = #{engagedField,jdbcType=VARCHAR},
+      </if>
+      <if test="workingAge != null" >
+        working_age = #{workingAge,jdbcType=VARCHAR},
+      </if>
+      <if test="professionalTitle != null" >
+        professional_title = #{professionalTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="professionalTitleGettime != null" >
+        professional_title_gettime = #{professionalTitleGettime,jdbcType=VARCHAR},
+      </if>
+      <if test="professionalCertificate != null" >
+        professional_certificate = #{professionalCertificate,jdbcType=VARCHAR},
+      </if>
+      <if test="qualification != null" >
+        qualification = #{qualification,jdbcType=VARCHAR},
+      </if>
+      <if test="qualificationGettime != null" >
+        qualification_gettime = #{qualificationGettime,jdbcType=VARCHAR},
+      </if>
+      <if test="qualificationCertificate != null" >
+        qualification_certificate = #{qualificationCertificate,jdbcType=VARCHAR},
+      </if>
+      <if test="workUnit != null" >
+        work_unit = #{workUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="position != null" >
+        position = #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="experiences != null" >
+        experiences = #{experiences,jdbcType=VARCHAR},
+      </if>
+      <if test="achievement != null" >
+        achievement = #{achievement,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserCareer" >
+    update user_career
+    set uid = #{uid,jdbcType=VARCHAR},
+      engaged_field = #{engagedField,jdbcType=VARCHAR},
+      working_age = #{workingAge,jdbcType=VARCHAR},
+      professional_title = #{professionalTitle,jdbcType=VARCHAR},
+      professional_title_gettime = #{professionalTitleGettime,jdbcType=VARCHAR},
+      professional_certificate = #{professionalCertificate,jdbcType=VARCHAR},
+      qualification = #{qualification,jdbcType=VARCHAR},
+      qualification_gettime = #{qualificationGettime,jdbcType=VARCHAR},
+      qualification_certificate = #{qualificationCertificate,jdbcType=VARCHAR},
+      work_unit = #{workUnit,jdbcType=VARCHAR},
+      position = #{position,jdbcType=VARCHAR},
+      experiences = #{experiences,jdbcType=VARCHAR},
+      achievement = #{achievement,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+   <select id="selectUserCareerByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from user_career
+    where uid = #{uid,jdbcType=VARCHAR}
+  </select>
+</mapper>

+ 160 - 0
src/main/java/com/goafanti/common/mapper/UserEduMapper.xml

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.UserEduMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserEdu" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="education" property="education" jdbcType="VARCHAR" />
+    <result column="major" property="major" jdbcType="VARCHAR" />
+    <result column="graduate_school" property="graduateSchool" jdbcType="VARCHAR" />
+    <result column="graduation_time" property="graduationTime" jdbcType="VARCHAR" />
+    <result column="diploma" property="diploma" jdbcType="VARCHAR" />
+    <result column="diploma_code" property="diplomaCode" jdbcType="VARCHAR" />
+    <result column="degree_diploma" property="degreeDiploma" jdbcType="VARCHAR" />
+    <result column="degree_code" property="degreeCode" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, education, major, graduate_school, graduation_time, diploma, diploma_code, 
+    degree_diploma, degree_code
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from user_edu
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from user_edu
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.UserEdu" >
+    insert into user_edu (id, uid, education, 
+      major, graduate_school, graduation_time, 
+      diploma, diploma_code, degree_diploma, 
+      degree_code)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{education,jdbcType=VARCHAR}, 
+      #{major,jdbcType=VARCHAR}, #{graduateSchool,jdbcType=VARCHAR}, #{graduationTime,jdbcType=VARCHAR}, 
+      #{diploma,jdbcType=VARCHAR}, #{diplomaCode,jdbcType=VARCHAR}, #{degreeDiploma,jdbcType=VARCHAR}, 
+      #{degreeCode,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserEdu" >
+    insert into user_edu
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="education != null" >
+        education,
+      </if>
+      <if test="major != null" >
+        major,
+      </if>
+      <if test="graduateSchool != null" >
+        graduate_school,
+      </if>
+      <if test="graduationTime != null" >
+        graduation_time,
+      </if>
+      <if test="diploma != null" >
+        diploma,
+      </if>
+      <if test="diplomaCode != null" >
+        diploma_code,
+      </if>
+      <if test="degreeDiploma != null" >
+        degree_diploma,
+      </if>
+      <if test="degreeCode != null" >
+        degree_code,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null" >
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="education != null" >
+        #{education,jdbcType=VARCHAR},
+      </if>
+      <if test="major != null" >
+        #{major,jdbcType=VARCHAR},
+      </if>
+      <if test="graduateSchool != null" >
+        #{graduateSchool,jdbcType=VARCHAR},
+      </if>
+      <if test="graduationTime != null" >
+        #{graduationTime,jdbcType=VARCHAR},
+      </if>
+      <if test="diploma != null" >
+        #{diploma,jdbcType=VARCHAR},
+      </if>
+      <if test="diplomaCode != null" >
+        #{diplomaCode,jdbcType=VARCHAR},
+      </if>
+      <if test="degreeDiploma != null" >
+        #{degreeDiploma,jdbcType=VARCHAR},
+      </if>
+      <if test="degreeCode != null" >
+        #{degreeCode,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserEdu" >
+    update user_edu
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="education != null" >
+        education = #{education,jdbcType=VARCHAR},
+      </if>
+      <if test="major != null" >
+        major = #{major,jdbcType=VARCHAR},
+      </if>
+      <if test="graduateSchool != null" >
+        graduate_school = #{graduateSchool,jdbcType=VARCHAR},
+      </if>
+      <if test="graduationTime != null" >
+        graduation_time = #{graduationTime,jdbcType=VARCHAR},
+      </if>
+      <if test="diploma != null" >
+        diploma = #{diploma,jdbcType=VARCHAR},
+      </if>
+      <if test="diplomaCode != null" >
+        diploma_code = #{diplomaCode,jdbcType=VARCHAR},
+      </if>
+      <if test="degreeDiploma != null" >
+        degree_diploma = #{degreeDiploma,jdbcType=VARCHAR},
+      </if>
+      <if test="degreeCode != null" >
+        degree_code = #{degreeCode,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserEdu" >
+    update user_edu
+    set uid = #{uid,jdbcType=VARCHAR},
+      education = #{education,jdbcType=VARCHAR},
+      major = #{major,jdbcType=VARCHAR},
+      graduate_school = #{graduateSchool,jdbcType=VARCHAR},
+      graduation_time = #{graduationTime,jdbcType=VARCHAR},
+      diploma = #{diploma,jdbcType=VARCHAR},
+      diploma_code = #{diplomaCode,jdbcType=VARCHAR},
+      degree_diploma = #{degreeDiploma,jdbcType=VARCHAR},
+      degree_code = #{degreeCode,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+   <select id="selectUserEduByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from user_edu
+    where uid = #{uid,jdbcType=VARCHAR}
+  </select>
+</mapper>

+ 141 - 0
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.UserIdentityMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserIdentity" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="username" property="username" jdbcType="VARCHAR" />
+    <result column="sex" property="sex" jdbcType="VARCHAR" />
+    <result column="date_of_birth" property="dateOfBirth" jdbcType="VARCHAR" />
+    <result column="id_number" property="idNumber" jdbcType="VARCHAR" />
+    <result column="positive_id" property="positiveId" jdbcType="VARCHAR" />
+    <result column="opposite_id" property="oppositeId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, username, sex, date_of_birth, id_number, positive_id, opposite_id
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from user_identity
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from user_identity
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.UserIdentity" >
+    insert into user_identity (id, uid, username, 
+      sex, date_of_birth, id_number, 
+      positive_id, opposite_id)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 
+      #{sex,jdbcType=VARCHAR}, #{dateOfBirth,jdbcType=VARCHAR}, #{idNumber,jdbcType=VARCHAR}, 
+      #{positiveId,jdbcType=VARCHAR}, #{oppositeId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserIdentity" >
+    insert into user_identity
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="username != null" >
+        username,
+      </if>
+      <if test="sex != null" >
+        sex,
+      </if>
+      <if test="dateOfBirth != null" >
+        date_of_birth,
+      </if>
+      <if test="idNumber != null" >
+        id_number,
+      </if>
+      <if test="positiveId != null" >
+        positive_id,
+      </if>
+      <if test="oppositeId != null" >
+        opposite_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null" >
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="username != null" >
+        #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="sex != null" >
+        #{sex,jdbcType=VARCHAR},
+      </if>
+      <if test="dateOfBirth != null" >
+        #{dateOfBirth,jdbcType=VARCHAR},
+      </if>
+      <if test="idNumber != null" >
+        #{idNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="positiveId != null" >
+        #{positiveId,jdbcType=VARCHAR},
+      </if>
+      <if test="oppositeId != null" >
+        #{oppositeId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserIdentity" >
+    update user_identity
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="username != null" >
+        username = #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="sex != null" >
+        sex = #{sex,jdbcType=VARCHAR},
+      </if>
+      <if test="dateOfBirth != null" >
+        date_of_birth = #{dateOfBirth,jdbcType=VARCHAR},
+      </if>
+      <if test="idNumber != null" >
+        id_number = #{idNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="positiveId != null" >
+        positive_id = #{positiveId,jdbcType=VARCHAR},
+      </if>
+      <if test="oppositeId != null" >
+        opposite_id = #{oppositeId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserIdentity" >
+    update user_identity
+    set uid = #{uid,jdbcType=VARCHAR},
+      username = #{username,jdbcType=VARCHAR},
+      sex = #{sex,jdbcType=VARCHAR},
+      date_of_birth = #{dateOfBirth,jdbcType=VARCHAR},
+      id_number = #{idNumber,jdbcType=VARCHAR},
+      positive_id = #{positiveId,jdbcType=VARCHAR},
+      opposite_id = #{oppositeId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="selectUserIdentityByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from user_identity
+    where uid = #{uid,jdbcType=VARCHAR}
+  </select>
+  
+  <select id="selectUserIdentityBoByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserIdentityBo">
+  	select t.id,t.uid,t.username,t.sex,t.date_of_birth,t.id_number,t.positive_id,t.opposite_id ,
+u.mobile,u.number from (select mobile,number, id from user ) u inner JOIN user_identity t
+on t.uid = u.id where t.uid=#{uid,jdbcType=VARCHAR}
+  </select>
+</mapper>

+ 166 - 0
src/main/java/com/goafanti/common/mapper/UserInfoMapper.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.UserInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserInfo" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="residence" property="residence" jdbcType="VARCHAR" />
+    <result column="person_portrait" property="personPortrait" jdbcType="VARCHAR" />
+    <result column="life_photo" property="lifePhoto" jdbcType="VARCHAR" />
+    <result column="personal_profile" property="personalProfile" jdbcType="VARCHAR" />
+    <result column="fixed_tel" property="fixedTel" jdbcType="VARCHAR" />
+    <result column="qq" property="qq" jdbcType="VARCHAR" />
+    <result column="postal_address" property="postalAddress" jdbcType="VARCHAR" />
+    <result column="postcode" property="postcode" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, residence, person_portrait, life_photo, personal_profile, fixed_tel, qq, 
+    postal_address, postcode
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from user_info
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from user_info
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.UserInfo" >
+    insert into user_info (id, uid, residence, 
+      person_portrait, life_photo, personal_profile, 
+      fixed_tel, qq, postal_address, 
+      postcode)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{residence,jdbcType=VARCHAR}, 
+      #{personPortrait,jdbcType=VARCHAR}, #{lifePhoto,jdbcType=VARCHAR}, #{personalProfile,jdbcType=VARCHAR}, 
+      #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, #{postalAddress,jdbcType=VARCHAR}, 
+      #{postcode,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserInfo" >
+    insert into user_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="residence != null" >
+        residence,
+      </if>
+      <if test="personPortrait != null" >
+        person_portrait,
+      </if>
+      <if test="lifePhoto != null" >
+        life_photo,
+      </if>
+      <if test="personalProfile != null" >
+        personal_profile,
+      </if>
+      <if test="fixedTel != null" >
+        fixed_tel,
+      </if>
+      <if test="qq != null" >
+        qq,
+      </if>
+      <if test="postalAddress != null" >
+        postal_address,
+      </if>
+      <if test="postcode != null" >
+        postcode,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null" >
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="residence != null" >
+        #{residence,jdbcType=VARCHAR},
+      </if>
+      <if test="personPortrait != null" >
+        #{personPortrait,jdbcType=VARCHAR},
+      </if>
+      <if test="lifePhoto != null" >
+        #{lifePhoto,jdbcType=VARCHAR},
+      </if>
+      <if test="personalProfile != null" >
+        #{personalProfile,jdbcType=VARCHAR},
+      </if>
+      <if test="fixedTel != null" >
+        #{fixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="qq != null" >
+        #{qq,jdbcType=VARCHAR},
+      </if>
+      <if test="postalAddress != null" >
+        #{postalAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="postcode != null" >
+        #{postcode,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserInfo" >
+    update user_info
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="residence != null" >
+        residence = #{residence,jdbcType=VARCHAR},
+      </if>
+      <if test="personPortrait != null" >
+        person_portrait = #{personPortrait,jdbcType=VARCHAR},
+      </if>
+      <if test="lifePhoto != null" >
+        life_photo = #{lifePhoto,jdbcType=VARCHAR},
+      </if>
+      <if test="personalProfile != null" >
+        personal_profile = #{personalProfile,jdbcType=VARCHAR},
+      </if>
+      <if test="fixedTel != null" >
+        fixed_tel = #{fixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="qq != null" >
+        qq = #{qq,jdbcType=VARCHAR},
+      </if>
+      <if test="postalAddress != null" >
+        postal_address = #{postalAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="postcode != null" >
+        postcode = #{postcode,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserInfo" >
+    update user_info
+    set uid = #{uid,jdbcType=VARCHAR},
+      residence = #{residence,jdbcType=VARCHAR},
+      person_portrait = #{personPortrait,jdbcType=VARCHAR},
+      life_photo = #{lifePhoto,jdbcType=VARCHAR},
+      personal_profile = #{personalProfile,jdbcType=VARCHAR},
+      fixed_tel = #{fixedTel,jdbcType=VARCHAR},
+      qq = #{qq,jdbcType=VARCHAR},
+      postal_address = #{postalAddress,jdbcType=VARCHAR},
+      postcode = #{postcode,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="selectUserInfoByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from user_info
+    where uid = #{uid,jdbcType=VARCHAR}
+  </select>
+  
+  <select id="selectUserInfoBoByUserId" paramterType="java.lang.String" resultType="com.goafanti.user.bo.UserInfoBo">
+  	select t.id,t.uid,t.residence,t.person_portrait,t.life_photo,t.personal_profile,t.fixed_tel,t.qq,t.postal_address,t.postcode,
+    u.email,u.nickname from (select email, id ,nickname from user ) u inner JOIN user_Info t
+    on t.uid = u.id where t.uid=#{uid,jdbcType=VARCHAR}
+  </select>
+</mapper>

+ 141 - 127
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1,128 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.UserMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.User">
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
-    <result column="password" jdbcType="VARCHAR" property="password" />
-    <result column="nickname" jdbcType="VARCHAR" property="nickname" />
-    <result column="email" jdbcType="VARCHAR" property="email" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="number" jdbcType="BIGINT" property="number" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, mobile, password, nickname, email, create_time, number, type
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from user
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from user
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.User">
-    insert into user (id, mobile, password, 
-      nickname, email, create_time, 
-      number, type)
-    values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
-      #{nickname,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{number,jdbcType=BIGINT}, #{type,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.User">
-    insert into user
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="mobile != null">
-        mobile,
-      </if>
-      <if test="password != null">
-        password,
-      </if>
-      <if test="nickname != null">
-        nickname,
-      </if>
-      <if test="email != null">
-        email,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="number != null">
-        number,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="mobile != null">
-        #{mobile,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="nickname != null">
-        #{nickname,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="number != null">
-        #{number,jdbcType=BIGINT},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.User">
-    update user
-    <set>
-      <if test="mobile != null">
-        mobile = #{mobile,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        password = #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="nickname != null">
-        nickname = #{nickname,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        email = #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="number != null">
-        number = #{number,jdbcType=BIGINT},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.User">
-    update user
-    set mobile = #{mobile,jdbcType=VARCHAR},
-      password = #{password,jdbcType=VARCHAR},
-      nickname = #{nickname,jdbcType=VARCHAR},
-      email = #{email,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      number = #{number,jdbcType=BIGINT},
-      type = #{type,jdbcType=INTEGER}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.UserMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.User">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+    <result column="password" jdbcType="VARCHAR" property="password" />
+    <result column="nickname" jdbcType="VARCHAR" property="nickname" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="number" jdbcType="BIGINT" property="number" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+  </resultMap>
+  
+  
+  
+  <sql id="Base_Column_List">
+    id, mobile, password, nickname, email, create_time, number, type
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from user
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from user
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.User">
+    insert into user (id, mobile, password, 
+      nickname, email, create_time, 
+      number, type)
+    values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
+      #{nickname,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{number,jdbcType=BIGINT}, #{type,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.User">
+    insert into user
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="mobile != null">
+        mobile,
+      </if>
+      <if test="password != null">
+        password,
+      </if>
+      <if test="nickname != null">
+        nickname,
+      </if>
+      <if test="email != null">
+        email,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="number != null">
+        number,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null">
+        #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="nickname != null">
+        #{nickname,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=BIGINT},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.User">
+    update user
+    <set>
+      <if test="mobile != null">
+        mobile = #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        password = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="nickname != null">
+        nickname = #{nickname,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="number != null">
+        number = #{number,jdbcType=BIGINT},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.User">
+    update user
+    set mobile = #{mobile,jdbcType=VARCHAR},
+      password = #{password,jdbcType=VARCHAR},
+      nickname = #{nickname,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      number = #{number,jdbcType=BIGINT},
+      type = #{type,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="selectByMobieAndType" resultMap="BaseResultMap">
+    select
+  <include refid="Base_Column_List" />
+    from user
+    where mobile = #{0} and type=#{1}
+  </select>
+  
+  
+  
+  
 </mapper>

+ 88 - 0
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -0,0 +1,88 @@
+package com.goafanti.common.model;
+
+public class OrganizationIdentity {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 联系人
+    */
+    private String contacts;
+
+    /**
+    * 固定电话
+    */
+    private String fixedTel;
+
+    /**
+    * QQ号
+    */
+    private String qq;
+
+    /**
+    * 通讯地址
+    */
+    private String postalAddress;
+
+    /**
+    * 邮政编码
+    */
+    private String postcode;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(String contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getFixedTel() {
+        return fixedTel;
+    }
+
+    public void setFixedTel(String fixedTel) {
+        this.fixedTel = fixedTel;
+    }
+
+    public String getQq() {
+        return qq;
+    }
+
+    public void setQq(String qq) {
+        this.qq = qq;
+    }
+
+    public String getPostalAddress() {
+        return postalAddress;
+    }
+
+    public void setPostalAddress(String postalAddress) {
+        this.postalAddress = postalAddress;
+    }
+
+    public String getPostcode() {
+        return postcode;
+    }
+
+    public void setPostcode(String postcode) {
+        this.postcode = postcode;
+    }
+}

+ 140 - 0
src/main/java/com/goafanti/common/model/OrganizationInfo.java

@@ -0,0 +1,140 @@
+package com.goafanti.common.model;
+
+public class OrganizationInfo {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 身份类型
+    */
+    private String identityType;
+
+    /**
+    * 公司名称
+    */
+    private String companyName;
+
+    /**
+    * 所在地
+    */
+    private String location;
+
+    /**
+    * 单位规模
+    */
+    private String unitSize;
+
+    /**
+    * 单位简介
+    */
+    private String companyIntroduction;
+
+    /**
+    * 所属单位
+    */
+    private String homeUnit;
+
+    /**
+    * 企业资质
+    */
+    private String enterpriseQualification;
+
+    /**
+    * logo图
+    */
+    private String logo;
+
+    /**
+    * 宣传图片
+    */
+    private String publicityPicture;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getIdentityType() {
+        return identityType;
+    }
+
+    public void setIdentityType(String identityType) {
+        this.identityType = identityType;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getUnitSize() {
+        return unitSize;
+    }
+
+    public void setUnitSize(String unitSize) {
+        this.unitSize = unitSize;
+    }
+
+    public String getCompanyIntroduction() {
+        return companyIntroduction;
+    }
+
+    public void setCompanyIntroduction(String companyIntroduction) {
+        this.companyIntroduction = companyIntroduction;
+    }
+
+    public String getHomeUnit() {
+        return homeUnit;
+    }
+
+    public void setHomeUnit(String homeUnit) {
+        this.homeUnit = homeUnit;
+    }
+
+    public String getEnterpriseQualification() {
+        return enterpriseQualification;
+    }
+
+    public void setEnterpriseQualification(String enterpriseQualification) {
+        this.enterpriseQualification = enterpriseQualification;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public String getPublicityPicture() {
+        return publicityPicture;
+    }
+
+    public void setPublicityPicture(String publicityPicture) {
+        this.publicityPicture = publicityPicture;
+    }
+}

+ 62 - 0
src/main/java/com/goafanti/common/model/OrganizationTech.java

@@ -0,0 +1,62 @@
+package com.goafanti.common.model;
+
+public class OrganizationTech {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 技术人员数量
+    */
+    private String technicalPeopleNum;
+
+    /**
+    * 重点研究领域
+    */
+    private String keySearchArea;
+
+    /**
+    * 擅长领域
+    */
+    private String specialty;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getTechnicalPeopleNum() {
+        return technicalPeopleNum;
+    }
+
+    public void setTechnicalPeopleNum(String technicalPeopleNum) {
+        this.technicalPeopleNum = technicalPeopleNum;
+    }
+
+    public String getKeySearchArea() {
+        return keySearchArea;
+    }
+
+    public void setKeySearchArea(String keySearchArea) {
+        this.keySearchArea = keySearchArea;
+    }
+
+    public String getSpecialty() {
+        return specialty;
+    }
+
+    public void setSpecialty(String specialty) {
+        this.specialty = specialty;
+    }
+}

+ 122 - 106
src/main/java/com/goafanti/common/model/User.java

@@ -1,107 +1,123 @@
-package com.goafanti.common.model;
-
-import java.util.Date;
-
-public class User {
-    private String id;
-
-    /**
-    * 用户注册手机号,作为登录依据
-    */
-    private String mobile;
-
-    /**
-    * 密码,md5+salt
-    */
-    private String password;
-
-    /**
-    * 用户昵称
-    */
-    private String nickname;
-
-    /**
-    * 用户邮箱
-    */
-    private String email;
-
-    /**
-    * 注册时间
-    */
-    private Date createTime;
-
-    /**
-    * 用户编号
-    */
-    private Long number;
-
-    /**
-    * 个人账号还是组织账号
-默认0为个人账号,1为组织账号
-    */
-    private Integer type;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getNumber() {
-        return number;
-    }
-
-    public void setNumber(Long number) {
-        this.number = number;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+
+
+public class User extends BaseModel{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private String id;
+
+    /**
+    * 用户注册手机号,作为登录依据
+    */
+    @Size(min = 0, max = 11, message = "{" + ErrorConstants.MOBILE_SIZE_ERROR + "}")
+	@Pattern(regexp = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$", message = "{"
+			+ ErrorConstants.MOBILE_PATTERN_ERROR + "}")
+    private String mobile;
+
+    /**
+    * 密码,md5+salt
+    */
+    private String password;
+
+    /**
+    * 用户昵称
+    */
+    private String nickname;
+
+    /**
+    * 用户邮箱
+    */
+    private String email;
+
+    /**
+    * 注册时间
+    */
+    private Date createTime;
+
+    /**
+    * 用户编号
+    */
+    private Long number;
+
+    /**
+    * 个人账号还是组织账号
+默认0为个人账号,1为组织账号
+    */
+    private Integer type;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getNumber() {
+        return number;
+    }
+
+    public void setNumber(Long number) {
+        this.number = number;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+    
 }

+ 36 - 0
src/main/java/com/goafanti/common/model/UserAbility.java

@@ -0,0 +1,36 @@
+package com.goafanti.common.model;
+
+public class UserAbility {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 能力标签
+    */
+    private String abilityLabel;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getAbilityLabel() {
+        return abilityLabel;
+    }
+
+    public void setAbilityLabel(String abilityLabel) {
+        this.abilityLabel = abilityLabel;
+    }
+}

+ 179 - 0
src/main/java/com/goafanti/common/model/UserCareer.java

@@ -0,0 +1,179 @@
+package com.goafanti.common.model;
+
+public class UserCareer {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 从事领域
+    */
+    private String engagedField;
+
+    /**
+    * 从业工龄
+    */
+    private String workingAge;
+
+    /**
+    * 职称名字
+    */
+    private String professionalTitle;
+
+    /**
+    * 职称取得时间(年份)
+    */
+    private String professionalTitleGettime;
+
+    /**
+    * 职称证明图
+    */
+    private String professionalCertificate;
+
+    /**
+    * 执业资格
+    */
+    private String qualification;
+
+    /**
+    * 执业资格取得时间(年份)
+    */
+    private String qualificationGettime;
+
+    /**
+    * 执业资格证明图
+    */
+    private String qualificationCertificate;
+
+    /**
+    * 工作单位
+    */
+    private String workUnit;
+
+    /**
+    * 职位/职务/头衔
+    */
+    private String position;
+
+    /**
+    * 从业经历
+    */
+    private String experiences;
+
+    /**
+    * 主要成就
+    */
+    private String achievement;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getEngagedField() {
+        return engagedField;
+    }
+
+    public void setEngagedField(String engagedField) {
+        this.engagedField = engagedField;
+    }
+
+    public String getWorkingAge() {
+        return workingAge;
+    }
+
+    public void setWorkingAge(String workingAge) {
+        this.workingAge = workingAge;
+    }
+
+    public String getProfessionalTitle() {
+        return professionalTitle;
+    }
+
+    public void setProfessionalTitle(String professionalTitle) {
+        this.professionalTitle = professionalTitle;
+    }
+
+    public String getProfessionalTitleGettime() {
+        return professionalTitleGettime;
+    }
+
+    public void setProfessionalTitleGettime(String professionalTitleGettime) {
+        this.professionalTitleGettime = professionalTitleGettime;
+    }
+
+    public String getProfessionalCertificate() {
+        return professionalCertificate;
+    }
+
+    public void setProfessionalCertificate(String professionalCertificate) {
+        this.professionalCertificate = professionalCertificate;
+    }
+
+    public String getQualification() {
+        return qualification;
+    }
+
+    public void setQualification(String qualification) {
+        this.qualification = qualification;
+    }
+
+    public String getQualificationGettime() {
+        return qualificationGettime;
+    }
+
+    public void setQualificationGettime(String qualificationGettime) {
+        this.qualificationGettime = qualificationGettime;
+    }
+
+    public String getQualificationCertificate() {
+        return qualificationCertificate;
+    }
+
+    public void setQualificationCertificate(String qualificationCertificate) {
+        this.qualificationCertificate = qualificationCertificate;
+    }
+
+    public String getWorkUnit() {
+        return workUnit;
+    }
+
+    public void setWorkUnit(String workUnit) {
+        this.workUnit = workUnit;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public String getExperiences() {
+        return experiences;
+    }
+
+    public void setExperiences(String experiences) {
+        this.experiences = experiences;
+    }
+
+    public String getAchievement() {
+        return achievement;
+    }
+
+    public void setAchievement(String achievement) {
+        this.achievement = achievement;
+    }
+}

+ 127 - 0
src/main/java/com/goafanti/common/model/UserEdu.java

@@ -0,0 +1,127 @@
+package com.goafanti.common.model;
+
+public class UserEdu {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 学历
+    */
+    private String education;
+
+    /**
+    * 专业
+    */
+    private String major;
+
+    /**
+    * 毕业学校
+    */
+    private String graduateSchool;
+
+    /**
+    * 毕业时间(年份)
+    */
+    private String graduationTime;
+
+    /**
+    * 毕业证图
+    */
+    private String diploma;
+
+    /**
+    * 毕业证编号
+    */
+    private String diplomaCode;
+
+    /**
+    * 学位证明图
+    */
+    private String degreeDiploma;
+
+    /**
+    * 学位证编号
+    */
+    private String degreeCode;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getEducation() {
+        return education;
+    }
+
+    public void setEducation(String education) {
+        this.education = education;
+    }
+
+    public String getMajor() {
+        return major;
+    }
+
+    public void setMajor(String major) {
+        this.major = major;
+    }
+
+    public String getGraduateSchool() {
+        return graduateSchool;
+    }
+
+    public void setGraduateSchool(String graduateSchool) {
+        this.graduateSchool = graduateSchool;
+    }
+
+    public String getGraduationTime() {
+        return graduationTime;
+    }
+
+    public void setGraduationTime(String graduationTime) {
+        this.graduationTime = graduationTime;
+    }
+
+    public String getDiploma() {
+        return diploma;
+    }
+
+    public void setDiploma(String diploma) {
+        this.diploma = diploma;
+    }
+
+    public String getDiplomaCode() {
+        return diplomaCode;
+    }
+
+    public void setDiplomaCode(String diplomaCode) {
+        this.diplomaCode = diplomaCode;
+    }
+
+    public String getDegreeDiploma() {
+        return degreeDiploma;
+    }
+
+    public void setDegreeDiploma(String degreeDiploma) {
+        this.degreeDiploma = degreeDiploma;
+    }
+
+    public String getDegreeCode() {
+        return degreeCode;
+    }
+
+    public void setDegreeCode(String degreeCode) {
+        this.degreeCode = degreeCode;
+    }
+}

+ 109 - 0
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -0,0 +1,109 @@
+package com.goafanti.common.model;
+
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class UserIdentity {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 姓名
+    */
+    private String username;
+
+    /**
+    * 性别
+    */
+    private String sex;
+
+    /**
+    * 出生年月
+    */
+    private String dateOfBirth;
+
+    /**
+    * 身份证号码
+    */
+    @Size(min = 15, max = 18, message = "{" + ErrorConstants.IDNUMBER_SIZE_ERROR + "}")
+    @Pattern(regexp= "\\d{14}[0-9a-zA-Z])|(\\d{17}[0-9a-zA-Z])" , message = "{"
+			+ ErrorConstants.IDNUMBER_PATTERN_ERROR + "}")
+    private String idNumber;
+
+    /**
+    * 身份证正面照
+    */
+    private String positiveId;
+
+    /**
+    * 身份证反面照
+    */
+    private String oppositeId;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    public void setDateOfBirth(String dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    public String getIdNumber() {
+        return idNumber;
+    }
+
+    public void setIdNumber(String idNumber) {
+        this.idNumber = idNumber;
+    }
+
+    public String getPositiveId() {
+        return positiveId;
+    }
+
+    public void setPositiveId(String positiveId) {
+        this.positiveId = positiveId;
+    }
+
+    public String getOppositeId() {
+        return oppositeId;
+    }
+
+    public void setOppositeId(String oppositeId) {
+        this.oppositeId = oppositeId;
+    }
+}

+ 127 - 0
src/main/java/com/goafanti/common/model/UserInfo.java

@@ -0,0 +1,127 @@
+package com.goafanti.common.model;
+
+public class UserInfo {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 居住地
+    */
+    private String residence;
+
+    /**
+    * 个人头像
+    */
+    private String personPortrait;
+
+    /**
+    * 生活照
+    */
+    private String lifePhoto;
+
+    /**
+    * 个人简介
+    */
+    private String personalProfile;
+
+    /**
+    * 固定电话
+    */
+    private String fixedTel;
+
+    /**
+    * QQ号码
+    */
+    private String qq;
+
+    /**
+    * 通讯地址
+    */
+    private String postalAddress;
+
+    /**
+    * 邮政编码
+    */
+    private String postcode;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getResidence() {
+        return residence;
+    }
+
+    public void setResidence(String residence) {
+        this.residence = residence;
+    }
+
+    public String getPersonPortrait() {
+        return personPortrait;
+    }
+
+    public void setPersonPortrait(String personPortrait) {
+        this.personPortrait = personPortrait;
+    }
+
+    public String getLifePhoto() {
+        return lifePhoto;
+    }
+
+    public void setLifePhoto(String lifePhoto) {
+        this.lifePhoto = lifePhoto;
+    }
+
+    public String getPersonalProfile() {
+        return personalProfile;
+    }
+
+    public void setPersonalProfile(String personalProfile) {
+        this.personalProfile = personalProfile;
+    }
+
+    public String getFixedTel() {
+        return fixedTel;
+    }
+
+    public void setFixedTel(String fixedTel) {
+        this.fixedTel = fixedTel;
+    }
+
+    public String getQq() {
+        return qq;
+    }
+
+    public void setQq(String qq) {
+        this.qq = qq;
+    }
+
+    public String getPostalAddress() {
+        return postalAddress;
+    }
+
+    public void setPostalAddress(String postalAddress) {
+        this.postalAddress = postalAddress;
+    }
+
+    public String getPostcode() {
+        return postcode;
+    }
+
+    public void setPostcode(String postcode) {
+        this.postcode = postcode;
+    }
+}

+ 24 - 0
src/main/java/com/goafanti/user/bo/OrgIdentityBo.java

@@ -0,0 +1,24 @@
+package com.goafanti.user.bo;
+
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.model.OrganizationIdentity;
+
+public class OrgIdentityBo extends OrganizationIdentity{@Size(min = 0, max = 127, message = "{" + ErrorConstants.EMAIL_SIZE_ERROR + "}")
+    @Pattern(regexp = "^[0-9a-zA-Z]+([0-9a-zA-Z]*[-._+])*[0-9a-zA-Z]+@[0-9a-zA-Z]+([-.][0-9a-zA-Z]+)*([0-9a-zA-Z]*[.])[a-zA-Z]{2,6}$", message = "{"
+		+ ErrorConstants.EMAIL_PATTERN_ERROR + "}")
+	private String email;
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+	
+	
+
+}

+ 20 - 0
src/main/java/com/goafanti/user/bo/UidAndTypeBo.java

@@ -0,0 +1,20 @@
+package com.goafanti.user.bo;
+
+public class UidAndTypeBo {
+	private String uid;
+	private Integer type;
+	public String getUid() {
+		return uid;
+	}
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	
+
+}

+ 22 - 0
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -0,0 +1,22 @@
+package com.goafanti.user.bo;
+
+import com.goafanti.common.model.UserIdentity;
+
+public class UserIdentityBo extends UserIdentity{
+	private Long number;
+	private String mobile;
+	public Long getNumber() {
+		return number;
+	}
+	public void setNumber(Long number) {
+		this.number = number;
+	}
+	public String getMobile() {
+		return mobile;
+	}
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+	
+
+}

+ 31 - 0
src/main/java/com/goafanti/user/bo/UserInfoBo.java

@@ -0,0 +1,31 @@
+package com.goafanti.user.bo;
+
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.model.UserInfo;
+
+
+public class UserInfoBo extends UserInfo{
+	private String nickname;
+	
+	@Size(min = 0, max = 127, message = "{" + ErrorConstants.EMAIL_SIZE_ERROR + "}")
+	@Pattern(regexp = "^[0-9a-zA-Z]+([0-9a-zA-Z]*[-._+])*[0-9a-zA-Z]+@[0-9a-zA-Z]+([-.][0-9a-zA-Z]+)*([0-9a-zA-Z]*[.])[a-zA-Z]{2,6}$", message = "{"
+			+ ErrorConstants.EMAIL_PATTERN_ERROR + "}")
+	private String email;
+	
+	public String getEmail() {
+		return email;
+	}
+	public void setEmail(String email) {
+		this.email = email;
+	}
+	public String getNickname() {
+		return nickname;
+	}
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+
+}

+ 409 - 47
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -1,30 +1,140 @@
-package com.goafanti.user.controller;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.PasswordUtil;
-import com.goafanti.user.service.UserService;
-
-@Controller
-@RequestMapping(value = "/api/user")
-public class UserApiController extends BaseApiController {
-	@Resource
-	private UserService userService;
-	@Resource(name = "passwordUtil")
-	private PasswordUtil passwordUtil;
-
+package com.goafanti.user.controller;
+
+
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.common.model.OrganizationInfo;
+import com.goafanti.common.model.OrganizationTech;
+import com.goafanti.common.model.User;
+import com.goafanti.common.model.UserAbility;
+import com.goafanti.common.model.UserCareer;
+import com.goafanti.common.model.UserEdu;
+import com.goafanti.common.model.UserIdentity;
+import com.goafanti.common.model.UserInfo;
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.PasswordUtil;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.bo.UidAndTypeBo;
+import com.goafanti.user.bo.UserIdentityBo;
+import com.goafanti.user.bo.UserInfoBo;
+import com.goafanti.user.service.OrganizationIdentityService;
+import com.goafanti.user.service.OrganizationInfoService;
+import com.goafanti.user.service.OrganizationTechService;
+import com.goafanti.user.service.UserAbilityService;
+import com.goafanti.user.service.UserCareerService;
+import com.goafanti.user.service.UserEduService;
+import com.goafanti.user.service.UserIdentityService;
+import com.goafanti.user.service.UserInfoService;
+import com.goafanti.user.service.UserService;
+
+
+
+@Controller
+@RequestMapping(value = "/api/user")
+public class UserApiController extends BaseApiController {
+	@Resource
+	private UserService userService;
+	@Resource(name = "passwordUtil")
+	private PasswordUtil passwordUtil;
+	
+	@Resource
+	private UserIdentityService userIdentityService;
+	@Resource
+	private UserInfoService userInfoService;
+	@Resource
+	private UserEduService userEduService;
+	@Resource
+	private UserCareerService userCareerService;
+	@Resource
+	private UserAbilityService userAbilityService;
+	@Resource
+	private OrganizationIdentityService organizationIdentityService;
+	@Resource
+	private OrganizationInfoService organizationInfoService;
+	@Resource
+	private OrganizationTechService organizationTechService;
+	
+	@RequestMapping(value = "/pwd", method = RequestMethod.POST)
+	public Result updatePwd(String password, String newPassword) {
+		Result res = new Result();
+		if (password == null || newPassword == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "必须指定", "密码"));
+		}
+		if (res.getError().isEmpty() && TokenManager.isLogin()) {
+			User u = new User();
+			User user = userService.selectByPrimaryKey(TokenManager.getUserId());
+			u.setId(user.getId());
+			u.setCreateTime(user.getCreateTime());
+			u.setPassword(newPassword);
+			u.setPassword(passwordUtil.getEncryptPwd(u));
+			if (!user.getPassword().equals(passwordUtil.getEncryptPwd(password, user.getCreateTime()))) {
+				res.getError().add(buildError(ErrorConstants.PWD_NOT_MATCH_ERROR));
+			} else {
+				res.setData(userService.updateByPrimaryKeySelective(u));
+			}
+		}
+		return res;
+	}
+	
+	/**
+	 * 个人会员基本信息
+	 * @param userIdentityBo
+	 * @param bindingResult
+	 * @return
+	 */
+	@RequestMapping(value = "/basicinfo", method = RequestMethod.POST)
+	public Result basicInfo(@Valid UserIdentityBo userIdentityBo,BindingResult bindingResult){
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					bindingResult.getFieldError().getField()));
+			return res;
+		}
+		if(res.getError().isEmpty()){
+			UserIdentity userIdentity = new UserIdentity();
+			UserIdentity identity= userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
+			userIdentity.setUsername(userIdentityBo.getUsername());
+			userIdentity.setIdNumber(userIdentityBo.getIdNumber());
+			userIdentity.setSex(userIdentityBo.getSex());
+			userIdentity.setDateOfBirth(userIdentityBo.getDateOfBirth());
+			userIdentity.setPositiveId(userIdentityBo.getPositiveId());
+			userIdentity.setOppositeId(userIdentityBo.getOppositeId());
+			if(identity == null){
+				userIdentity.setId(UUID.randomUUID().toString());
+				userIdentity.setUid(TokenManager.getUserId());
+				userIdentityService.insert(userIdentity);
+			}else{
+				userIdentity.setId(identity.getId());
+				userIdentityService.updateByPrimaryKeySelective(userIdentity);
+			}
+		}
+		res.setData(userIdentityBo);
+		return res;
+	}
+	
+	/**
+	 * 个人资料
+	 * @param userInfoBo
+	 * @param bindingResult
+	 * @return
+	 */
 	@RequestMapping(value = "/avatar/upload", method = RequestMethod.POST)
 	public Result avatar(HttpServletRequest req) {
 		Result res = new Result();
@@ -37,25 +147,277 @@ public class UserApiController extends BaseApiController {
 		Result res = new Result();
 		res.setData(handleFile(res, "/identity/", true, req));
 		return res;
+	}
+	
+	private String handleFile(Result res, String path, boolean isPrivate, HttpServletRequest req) {
+		List<MultipartFile> files = getFiles(req);
+		String fileName = path + System.nanoTime() + ".jpg";
+		if (!files.isEmpty()) {
+			try {
+				MultipartFile mf = files.get(0);
+				mf.transferTo(isPrivate ? toPrivateFile(fileName) : toFile(fileName));
+				LoggerUtils.debug(getClass(), fileName + " 文件上传成功");
+			} catch (IllegalStateException | IOException e) {
+				LoggerUtils.error(getClass(), "文件上传失败", e);
+				res.getError().add(buildError("", "文件上传失败!"));
+				return "";
+			}
+		} else {
+			res.getError().add(buildError("", "文件上传失败!"));
+			return "";
+		}
+		return fileName;
 	}
+	
+	@RequestMapping(value = "/personaldata", method = RequestMethod.POST)
+	public Result personalData(@Valid UserInfoBo userInfoBo,BindingResult bindingResult){
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					bindingResult.getFieldError().getField()));
+			return res;
 
-	private String handleFile(Result res, String path, boolean isPrivate, HttpServletRequest req) {
-		List<MultipartFile> files = getFiles(req);
-		String fileName = path + System.nanoTime() + ".jpg";
-		if (!files.isEmpty()) {
-			try {
-				MultipartFile mf = files.get(0);
-				mf.transferTo(isPrivate ? toPrivateFile(fileName) : toFile(fileName));
-				LoggerUtils.debug(getClass(), fileName + " 文件上传成功");
-			} catch (IllegalStateException | IOException e) {
-				LoggerUtils.error(getClass(), "文件上传失败", e);
-				res.getError().add(buildError("", "文件上传失败!"));
-				return "";
-			}
-		} else {
-			res.getError().add(buildError("", "文件上传失败!"));
-			return "";
-		}
-		return fileName;
-	}
-}
+		}
+		if(res.getError().isEmpty()){
+		    UserInfo info= userInfoService.selectUserInfoByUserId(TokenManager.getUserId());
+		    User u =userService.selectByPrimaryKey(TokenManager.getUserId());
+		    u.setNickname(userInfoBo.getNickname());
+		    u.setEmail(userInfoBo.getEmail());
+		    userService.updateByPrimaryKeySelective(u);
+		    UserInfo userInfo = new UserInfo();
+		    userInfo.setResidence(userInfoBo.getResidence());
+		    userInfo.setPersonPortrait(userInfoBo.getPersonPortrait());
+		    userInfo.setPersonalProfile(userInfoBo.getPersonalProfile());
+		    userInfo.setLifePhoto(userInfoBo.getLifePhoto());
+		    userInfo.setFixedTel(userInfoBo.getFixedTel());
+		    userInfo.setQq(userInfoBo.getQq());
+		    userInfo.setPostalAddress(userInfoBo.getPostalAddress());
+		    userInfo.setPostcode(userInfoBo.getPostcode());
+			if(info == null){
+				userInfo.setId(UUID.randomUUID().toString());
+				userInfo.setUid(TokenManager.getUserId());
+				userInfoService.insert(userInfo);
+			}else{
+				userInfo.setId(info.getId());
+				userInfoService.updateByPrimaryKeySelective(userInfo);
+			}
+		
+	  }
+		res.setData(userInfoBo);
+		return res;
+	}
+	
+	/**
+	 * 个人会员教育信息
+	 * @param userEdu
+	 * @return
+	 */
+	@RequestMapping(value = "/eduinfo", method = RequestMethod.POST)
+	public Result educationInfo(UserEdu userEdu){
+		Result res = new Result();
+		UserEdu edu = userEduService.selectUserEduByUserId(TokenManager.getUserId());
+		
+		if(edu == null){
+			userEdu.setId(UUID.randomUUID().toString());
+			userEdu.setUid(TokenManager.getUserId());
+			userEduService.insert(userEdu);
+		}else{
+			userEduService.updateByPrimaryKeySelective(userEdu);
+		}
+		res.setData(userEdu);
+		return res;
+	}
+	
+	/**
+	 * 个人会员职业信息
+	 * @param userCareer
+	 * @return
+	 */
+	
+	@RequestMapping(value = "/careerinfo", method = RequestMethod.POST)
+	public Result careerInfo(UserCareer userCareer){
+		Result res = new Result();
+		UserCareer career = userCareerService.selectUserCareerByUserId(TokenManager.getUserId());
+		
+		if(career == null){
+			userCareer.setId(UUID.randomUUID().toString());
+			userCareer.setUid(TokenManager.getUserId());
+			userCareerService.insert(userCareer);
+		}else{
+			userCareer.setId(career.getId());
+			userCareerService.updateByPrimaryKeySelective(userCareer);
+		}
+		res.setData(userCareer);
+		return res;
+	}
+	
+	/**
+	 * 会员能力标签
+	 * @param userAbility
+	 * @return
+	 */
+	
+	@RequestMapping(value = "/abilitylabel", method = RequestMethod.POST)
+	public Result abilityLabel(UserAbility userAbility){
+		Result res = new Result();
+		UserCareer ability = userAbilityService.selectUserAbilityByUserId(TokenManager.getUserId());
+				if(ability == null){
+					userAbility.setId(UUID.randomUUID().toString());
+					userAbility.setUid(TokenManager.getUserId());
+					userAbilityService.insert(userAbility);
+				}else{
+					userAbility.setId(ability.getId());
+					userAbilityService.updateByPrimaryKeySelective(userAbility);
+				}
+		return res;
+	}
+	
+	/**
+	 * 团体会员基本信息
+	 * @param orgIdentityBo
+	 * @return
+	 */
+	@RequestMapping(value="/groupbasicinfo",method = RequestMethod.POST)
+	public Result groupBasicInfo(OrgIdentityBo orgIdentityBo){
+		Result res = new Result();
+		OrganizationIdentity organizationIdentity = new OrganizationIdentity();
+		OrganizationIdentity identity = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
+		User u =userService.selectByPrimaryKey(TokenManager.getUserId());
+	    u.setEmail(orgIdentityBo.getEmail());
+	    userService.updateByPrimaryKeySelective(u);
+		organizationIdentity.setContacts(orgIdentityBo.getContacts());
+		organizationIdentity.setFixedTel(orgIdentityBo.getFixedTel());
+		organizationIdentity.setQq(orgIdentityBo.getQq());
+		organizationIdentity.setPostalAddress(orgIdentityBo.getPostalAddress());
+		organizationIdentity.setPostcode(orgIdentityBo.getPostcode());
+		if(identity==null){
+			organizationIdentity.setId(UUID.randomUUID().toString());
+			organizationIdentity.setUid(TokenManager.getUserId());
+			organizationIdentityService.insert(organizationIdentity);
+		}else{
+			organizationIdentity.setId(identity.getId());
+			organizationIdentityService.updateByPrimaryKeySelective(organizationIdentity);
+		}
+		res.setData(orgIdentityBo);
+		return res;
+	}
+	
+	/**
+	 * 团体会员单位资料
+	 * @param orgInfo
+	 * @return
+	 */
+	@RequestMapping(value="/unitdata",method = RequestMethod.POST)
+	public Result groupBasicInfo(OrganizationInfo orgInfo){
+		Result res = new Result();
+		OrganizationInfo info = organizationInfoService.selectOrgInfoByUserId(TokenManager.getUserId());
+		if(info == null){
+			orgInfo.setId(UUID.randomUUID().toString());
+			orgInfo.setUid(TokenManager.getUserId());
+			organizationInfoService.insert(orgInfo);
+		}else{
+			orgInfo.setId(info.getId());
+			organizationInfoService.updateByPrimaryKeySelective(orgInfo);
+		}
+		res.setData(orgInfo);
+		return res;
+	}
+	
+	/**
+	 * 团体会员技术能力
+	 * @param orgTech
+	 * @return
+	 */
+	@RequestMapping(value="/tech",method = RequestMethod.POST)
+	public Result tech(OrganizationTech orgTech){
+		Result res = new Result();
+		OrganizationTech tech = organizationTechService.selectOrgTechByUserId(TokenManager.getUserId());
+		if(tech == null){
+			orgTech.setId(UUID.randomUUID().toString());
+			orgTech.setUid(TokenManager.getUserId());
+			organizationTechService.insert(orgTech);
+		}else{
+			orgTech.setId(tech.getId());
+			organizationTechService.updateByPrimaryKeySelective(orgTech);
+		}
+		return res;
+	}
+	
+	
+	@RequestMapping(value="/base",method = RequestMethod.POST)
+	public Result basic(){
+		Result res = new Result();
+		UidAndTypeBo ub =basicInfo(userService);
+		if(ub.getType()==0){
+			UserIdentityBo  u = userIdentityService.selectUserIdentityBoByUserId(ub.getUid());
+			res.setData(u);
+		}else{
+			OrgIdentityBo o = organizationIdentityService.selectOrgIdentityBoByUserId(ub.getUid());
+			res.setData(o);
+		}
+		return res;
+	}
+	
+	@RequestMapping(value="/member",method = RequestMethod.POST)
+	public Result member(){
+		Result res = new Result();
+		UidAndTypeBo ub =basicInfo(userService);
+		if(ub.getType()==0){
+			UserInfoBo u=userInfoService.selectUserInfoBoByUserId(ub.getUid());
+			res.setData(u);
+		}else{
+			OrganizationInfo o = organizationInfoService.selectOrgInfoByUserId(ub.getUid());
+			res.setData(o);
+		}
+		return res;
+	}
+	
+	@RequestMapping(value="/educate",method = RequestMethod.POST)
+	public Result educate(){
+		Result res = new Result();
+		UidAndTypeBo ub =basicInfo(userService);
+			UserEdu  u = userEduService.selectUserEduByUserId(ub.getUid());
+			res.setData(u);
+		return res;
+	}
+	
+	@RequestMapping(value="/job",method = RequestMethod.POST)
+	public Result job(){
+		Result res = new Result();
+		UidAndTypeBo ub =basicInfo(userService);
+		if(ub.getType()==0){
+			UserCareer u = userCareerService.selectUserCareerByUserId(ub.getUid());
+			res.setData(u);
+		}else{
+			OrganizationTech o = organizationTechService.selectOrgTechByUserId(ub.getUid());
+			res.setData(o);
+		}
+		return res;
+	}
+	
+	@RequestMapping(value="/ability",method = RequestMethod.POST)
+	public Result ability(){
+		Result res = new Result();
+		UidAndTypeBo ub =basicInfo(userService);
+		
+		UserCareer u = userAbilityService.selectUserAbilityByUserId(ub.getUid());
+		res.setData(u);
+		return res;
+	}
+	
+	
+	
+	private static  UidAndTypeBo basicInfo(UserService userService){
+		User u = userService.selectByPrimaryKey(TokenManager.getUserId());
+		UidAndTypeBo ub = new UidAndTypeBo();
+		
+		ub.setType(u.getType());
+		ub.setUid(u.getId());
+		return ub;
+	}
+	
+	
+	
+		
+}
+

+ 51 - 0
src/main/java/com/goafanti/user/controller/UserLoginController.java

@@ -0,0 +1,51 @@
+package com.goafanti.user.controller;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.User;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.user.service.UserService;
+
+
+
+@Controller
+public class UserLoginController extends BaseController {
+	@Resource
+	private UserService userService;
+	
+	@RequestMapping(value = "/login", method = RequestMethod.GET)
+	public String login(HttpServletRequest request, Model model) {
+		TokenManager.logout();
+		return "login";
+	}
+
+	@RequestMapping(value = "/login", method = RequestMethod.POST)
+	public ModelAndView doLogin(User user, Boolean rememberMe, HttpServletRequest request, ModelAndView modelview) {
+		TokenManager.login(user, rememberMe);
+		RedirectView rv = new RedirectView();
+		rv.setUrl(request.getContextPath() + "/index");
+		rv.setExposeModelAttributes(false);
+		modelview.setView(rv);
+		return modelview;
+	}
+
+	@RequestMapping(value = "/signin", method = RequestMethod.POST)
+	@ResponseBody
+	public Result signin(User user,Boolean remember, HttpServletRequest request) {
+		Result res = new Result();
+		res.setData(TokenManager.login(user, false));
+		return res;
+	}
+
+}

+ 66 - 0
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -0,0 +1,66 @@
+package com.goafanti.user.controller;
+
+import java.util.UUID;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.User;
+import com.goafanti.common.utils.PasswordUtil;
+import com.goafanti.common.utils.VerifyCodeUtils;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.user.service.UserService;
+
+
+@Controller
+public class UserRegisterController extends BaseController{
+	@Resource
+	private UserService userService;
+	@Resource(name = "passwordUtil")
+	private PasswordUtil passwordUtil;
+	/**
+	 * 用户注册
+	 * @param user
+	 * @return
+	 */
+	@RequestMapping(value = "/register", method = RequestMethod.POST)
+	public Result register(@Valid User user,
+			String companyName,String verificationCode,String contacts,BindingResult bindingResult){
+		Result res = new Result();
+		if(!TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE).equals(verificationCode)){
+			res.getError().add(buildError(ErrorConstants.VCODE_ERROR,"验证码错误"));
+			return res;
+		}
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					bindingResult.getFieldError().getField()));
+			return res;
+		}
+		if(StringUtils.isBlank(user.getMobile())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"必须指定","用户名"));
+		}else if(StringUtils.isBlank(user.getPassword())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "必须指定", "密码"));
+		}else{
+		    User u = userService.selectByMobieAndType(user.getMobile(),user.getType());
+				if(u.getMobile().equals(user.getMobile())&&u.getType() == user.getType()){
+					res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "用户名", "已存在"));
+				}
+			}
+		if(res.getError().isEmpty()){
+			user.setId(UUID.randomUUID().toString());
+			user.setPassword(passwordUtil.getEncryptPwd(user));
+			userService.insertRegister(user,contacts,companyName,TokenManager.getUserId());
+			}
+			
+		return res;
+	}
+}

+ 16 - 0
src/main/java/com/goafanti/user/service/OrganizationIdentityService.java

@@ -0,0 +1,16 @@
+package com.goafanti.user.service;
+
+import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.user.bo.OrgIdentityBo;
+
+public interface OrganizationIdentityService {
+
+	OrganizationIdentity insert(OrganizationIdentity organizationIdentity);
+
+	OrganizationIdentity selectOrgIdentityByUserId(String userId);
+
+	int updateByPrimaryKeySelective(OrganizationIdentity organizationIdentity);
+
+	OrgIdentityBo selectOrgIdentityBoByUserId(String uid);
+
+}

+ 13 - 0
src/main/java/com/goafanti/user/service/OrganizationInfoService.java

@@ -0,0 +1,13 @@
+package com.goafanti.user.service;
+
+import com.goafanti.common.model.OrganizationInfo;
+
+public interface OrganizationInfoService{
+
+	OrganizationInfo insert(OrganizationInfo organizationInfo);
+
+	OrganizationInfo selectOrgInfoByUserId(String userId);
+
+	int updateByPrimaryKeySelective(OrganizationInfo orgInfo);
+
+}

+ 13 - 0
src/main/java/com/goafanti/user/service/OrganizationTechService.java

@@ -0,0 +1,13 @@
+package com.goafanti.user.service;
+
+import com.goafanti.common.model.OrganizationTech;
+
+public interface OrganizationTechService {
+
+	OrganizationTech selectOrgTechByUserId(String userId);
+
+	OrganizationTech insert(OrganizationTech orgTech);
+
+	int updateByPrimaryKeySelective(OrganizationTech orgTech);
+
+}

+ 14 - 0
src/main/java/com/goafanti/user/service/UserAbilityService.java

@@ -0,0 +1,14 @@
+package com.goafanti.user.service;
+
+import com.goafanti.common.model.UserAbility;
+import com.goafanti.common.model.UserCareer;
+
+public interface UserAbilityService {
+
+	UserCareer selectUserAbilityByUserId(String userId);
+
+	UserAbility insert(UserAbility userAbility);
+
+	int updateByPrimaryKeySelective(UserAbility userAbility);
+
+}

+ 13 - 0
src/main/java/com/goafanti/user/service/UserCareerService.java

@@ -0,0 +1,13 @@
+package com.goafanti.user.service;
+
+import com.goafanti.common.model.UserCareer;
+
+public interface UserCareerService {
+
+	UserCareer selectUserCareerByUserId(String userId);
+
+	UserCareer insert(UserCareer userCareer);
+
+	int updateByPrimaryKeySelective(UserCareer userCareer);
+
+}

+ 13 - 0
src/main/java/com/goafanti/user/service/UserEduService.java

@@ -0,0 +1,13 @@
+package com.goafanti.user.service;
+
+import com.goafanti.common.model.UserEdu;
+
+public interface UserEduService {
+
+	UserEdu selectUserEduByUserId(String userId);
+
+	UserEdu insert(UserEdu userEdu);
+
+	int updateByPrimaryKeySelective(UserEdu userEdu);
+
+}

+ 17 - 0
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -0,0 +1,17 @@
+package com.goafanti.user.service;
+
+import com.goafanti.common.model.UserIdentity;
+import com.goafanti.user.bo.UserIdentityBo;
+
+public interface UserIdentityService {
+
+	UserIdentity selectUserIdentityByUserId(String userId);
+
+	UserIdentity insert(UserIdentity userIdentity);
+
+	int updateByPrimaryKeySelective(UserIdentity userIdentity);
+
+	UserIdentityBo selectUserIdentityBoByUserId(String uid);
+
+
+}

+ 16 - 0
src/main/java/com/goafanti/user/service/UserInfoService.java

@@ -0,0 +1,16 @@
+package com.goafanti.user.service;
+
+import com.goafanti.common.model.UserInfo;
+import com.goafanti.user.bo.UserInfoBo;
+
+public interface UserInfoService {
+
+	UserInfo insert(UserInfo userInfo);
+
+	int updateByPrimaryKeySelective(UserInfo userInfo);
+
+	UserInfo selectUserInfoByUserId(String userId);
+
+	UserInfoBo selectUserInfoBoByUserId(String uid);
+
+}

+ 18 - 5
src/main/java/com/goafanti/user/service/UserService.java

@@ -1,5 +1,18 @@
-package com.goafanti.user.service;
-
-public interface UserService {
-
-}
+package com.goafanti.user.service;
+
+import com.goafanti.common.model.User;
+
+
+public interface UserService {
+
+	User selectByPrimaryKey(String userId);
+
+	Object updateByPrimaryKeySelective(User u);
+
+	User insert(User user);
+
+	User selectByMobieAndType(String mobile, Integer type);
+	
+	User insertRegister(User user,String companyName,String contacts,String uid);
+
+}

+ 36 - 0
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -0,0 +1,36 @@
+package com.goafanti.user.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrganizationIdentityMapper;
+import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.service.OrganizationIdentityService;
+@Service
+public class OrganizationIdentityServiceImpl implements OrganizationIdentityService{
+    @Autowired
+    OrganizationIdentityMapper organizationIdentityMapper;
+    
+	@Override
+	public OrganizationIdentity insert(OrganizationIdentity organizationIdentity) {
+		organizationIdentityMapper.insert(organizationIdentity);
+		return organizationIdentity;
+	}
+
+	@Override
+	public OrganizationIdentity selectOrgIdentityByUserId(String userId) {
+		return organizationIdentityMapper.selectOrgIdentityByUserId(userId);
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(OrganizationIdentity organizationIdentity) {
+		return organizationIdentityMapper.updateByPrimaryKeySelective(organizationIdentity);
+	}
+
+	@Override
+	public OrgIdentityBo selectOrgIdentityBoByUserId(String uid) {
+		return organizationIdentityMapper.selectOrgIdentityBoByUserId(uid);
+	}
+
+}

+ 31 - 0
src/main/java/com/goafanti/user/service/impl/OrganizationInfoServiceImpl.java

@@ -0,0 +1,31 @@
+package com.goafanti.user.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrganizationInfoMapper;
+import com.goafanti.common.model.OrganizationInfo;
+import com.goafanti.user.service.OrganizationInfoService;
+@Service
+public class OrganizationInfoServiceImpl implements OrganizationInfoService {
+    @Autowired
+    OrganizationInfoMapper organizationInfoMapper;
+    
+	@Override
+	public OrganizationInfo insert(OrganizationInfo organizationInfo) {
+		organizationInfoMapper.insert(organizationInfo);
+		return organizationInfo;
+	}
+
+	@Override
+	public OrganizationInfo selectOrgInfoByUserId(String uid) {
+		return organizationInfoMapper.selectOrgInfoByUserId(uid);
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(OrganizationInfo orgInfo) {
+		return organizationInfoMapper.updateByPrimaryKeySelective(orgInfo);
+	}
+
+
+}

+ 30 - 0
src/main/java/com/goafanti/user/service/impl/OrganizationTechServiceImpl.java

@@ -0,0 +1,30 @@
+package com.goafanti.user.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrganizationTechMapper;
+import com.goafanti.common.model.OrganizationTech;
+import com.goafanti.user.service.OrganizationTechService;
+@Service
+public class OrganizationTechServiceImpl implements OrganizationTechService{
+    @Autowired
+    OrganizationTechMapper  organizationTechMapper;
+	
+	@Override
+	public OrganizationTech selectOrgTechByUserId(String uid) {
+		return organizationTechMapper.selectOrgTechByUserId(uid);
+	}
+
+	@Override
+	public OrganizationTech insert(OrganizationTech orgTech) {
+		organizationTechMapper.insert(orgTech);
+		return orgTech;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(OrganizationTech orgTech) {
+		return organizationTechMapper.updateByPrimaryKeySelective(orgTech);
+	}
+
+}

+ 31 - 0
src/main/java/com/goafanti/user/service/impl/UserAbilityServiceImpl.java

@@ -0,0 +1,31 @@
+package com.goafanti.user.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.UserAbilityMapper;
+import com.goafanti.common.model.UserAbility;
+import com.goafanti.common.model.UserCareer;
+import com.goafanti.user.service.UserAbilityService;
+@Service
+public class UserAbilityServiceImpl implements UserAbilityService{
+	@Autowired
+	UserAbilityMapper userAbilityMapper;
+
+	@Override
+	public UserCareer selectUserAbilityByUserId(String userId) {
+		return userAbilityMapper.selectUserAbilityByUserId(userId);
+	}
+
+	@Override
+	public UserAbility insert(UserAbility userAbility) {
+		userAbilityMapper.insert(userAbility);
+		return userAbility;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(UserAbility userAbility) {
+		return userAbilityMapper.updateByPrimaryKeySelective(userAbility);
+	}
+
+}

+ 30 - 0
src/main/java/com/goafanti/user/service/impl/UserCareerServiceImpl.java

@@ -0,0 +1,30 @@
+package com.goafanti.user.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.UserCareerMapper;
+import com.goafanti.common.model.UserCareer;
+import com.goafanti.user.service.UserCareerService;
+@Service
+public class UserCareerServiceImpl implements UserCareerService{
+    @Autowired
+    UserCareerMapper userCareerMapper;
+    
+	@Override
+	public UserCareer selectUserCareerByUserId(String userId) {
+		return userCareerMapper.selectUserCareerByUserId(userId);
+	}
+
+	@Override
+	public UserCareer insert(UserCareer userCareer) {
+		userCareerMapper.insert(userCareer);
+		return userCareer;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(UserCareer userCareer) {
+		return userCareerMapper.updateByPrimaryKeySelective(userCareer);
+	}
+
+}

+ 36 - 0
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -0,0 +1,36 @@
+package com.goafanti.user.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.UserIdentityMapper;
+import com.goafanti.common.model.UserIdentity;
+import com.goafanti.user.bo.UserIdentityBo;
+import com.goafanti.user.service.UserIdentityService;
+
+@Service
+public class UserIdentityServiceImpl implements UserIdentityService{
+	@Autowired
+	UserIdentityMapper userIdentityMapper;
+	@Override
+	public UserIdentity selectUserIdentityByUserId(String userId) {
+		return userIdentityMapper.selectUserIdentityByUserId(userId);
+	}
+
+	@Override
+	public UserIdentity insert(UserIdentity userIdentity) {
+		userIdentityMapper.insert(userIdentity);
+		return userIdentity;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(UserIdentity userIdentity) {
+		return userIdentityMapper.updateByPrimaryKeySelective(userIdentity);
+	}
+
+	@Override
+	public UserIdentityBo selectUserIdentityBoByUserId(String uid) {
+		return userIdentityMapper.selectUserIdentityBoByUserId(uid);
+	}
+
+}

+ 35 - 0
src/main/java/com/goafanti/user/service/impl/UserInfoServiceImpl.java

@@ -0,0 +1,35 @@
+package com.goafanti.user.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.UserInfoMapper;
+import com.goafanti.common.model.UserInfo;
+import com.goafanti.user.bo.UserInfoBo;
+import com.goafanti.user.service.UserInfoService;
+@Service
+public class UserInfoServiceImpl implements UserInfoService{
+    @Autowired
+    UserInfoMapper userInfoMapper;
+	@Override
+	public UserInfo insert(UserInfo userInfo) {
+		userInfoMapper.insert(userInfo);
+		return userInfo;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(UserInfo userInfo) {
+		return userInfoMapper.updateByPrimaryKeySelective(userInfo);
+	}
+
+	@Override
+	public UserInfo selectUserInfoByUserId(String uid) {
+		return userInfoMapper.selectUserInfoByUserId(uid);
+	}
+
+	@Override
+	public UserInfoBo selectUserInfoBoByUserId(String uid) {
+		return userInfoMapper.selectUserInfoBoByUserId(uid);
+	}
+
+}

+ 90 - 10
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -1,10 +1,90 @@
-package com.goafanti.user.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.goafanti.user.service.UserService;
-
-@Service
-public class UserServiceImpl implements UserService {
-
-}
+package com.goafanti.user.service.impl;
+
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrganizationIdentityMapper;
+import com.goafanti.common.dao.OrganizationInfoMapper;
+import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.common.model.OrganizationInfo;
+import com.goafanti.common.model.User;
+import com.goafanti.user.service.UserService;
+
+
+
+@Service
+public class UserServiceImpl implements UserService {
+	private static final String String = null;
+	@Autowired
+	UserMapper userMapper;
+	@Autowired
+	OrganizationInfoMapper organizationInfoMapper;
+	@Autowired
+	OrganizationIdentityMapper organizationIdentityMapper;
+	
+	
+	@Override
+	public User insertRegister(User user,String contacts,String companyName,String uid) {
+		userMapper.insert(user);
+		if(user.getType()==1){
+			if(!StringUtils.isBlank(companyName)){
+				OrganizationInfo organizationInfo = new OrganizationInfo();
+				organizationInfo.setUid(uid);
+				organizationInfo.setCompanyName(companyName);
+				organizationInfo.setId(UUID.randomUUID().toString());
+				organizationInfoMapper.insert(organizationInfo);
+			}
+			if(!StringUtils.isBlank(contacts)){
+				OrganizationIdentity organizationIdentity = new OrganizationIdentity();
+				organizationIdentity.setUid(uid);
+				organizationIdentity.setId(UUID.randomUUID().toString());
+				organizationIdentity.setContacts(contacts);
+				organizationIdentityMapper.insert(organizationIdentity);
+			}
+		
+	    }
+		return user;
+	}
+    
+	@Override
+	public User selectByMobieAndType(java.lang.String mobile, Integer type) {
+		return userMapper.selectByMobieAndType(mobile,type);
+	}
+	
+	@Override
+	public User selectByPrimaryKey(String id) {
+		return userMapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public Object updateByPrimaryKeySelective(User u) {
+		return null;
+	}
+
+	@Override
+	public User insert(User user) {
+		userMapper.insert(user);
+		return user;
+	}
+
+
+
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+}

+ 31 - 0
src/main/java/com/goafanti/user/service/impl/userEduServiceImpl.java

@@ -0,0 +1,31 @@
+package com.goafanti.user.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.UserEduMapper;
+import com.goafanti.common.model.UserEdu;
+import com.goafanti.user.service.UserEduService;
+
+@Service
+public class userEduServiceImpl implements UserEduService{
+	@Autowired
+	UserEduMapper userEduMapper;
+
+	@Override
+	public UserEdu selectUserEduByUserId(String userId) {
+		return userEduMapper.selectUserEduByUserId(userId);
+	}
+
+	@Override
+	public UserEdu insert(UserEdu userEdu) {
+		userEduMapper.insert(userEdu);
+		return userEdu;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(UserEdu userEdu) {
+		return userEduMapper.updateByPrimaryKeySelective(userEdu);
+	}
+
+}

+ 119 - 0
src/main/webapp/WEB-INF/html/test.html

@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="format-detection" content="telephone=no">
+  <title>接口测试页面</title>
+  <style>
+    body {
+      font-size: 14px;
+      font-family: "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    }
+    
+    #root {
+      margin: 30px;
+    }
+    
+    label {
+      display: block;
+      margin: 6px 0;
+    }
+    textarea {
+      display: block;
+    }
+    #submit {
+      padding: 6px 30px;
+      border-radius: 3px;
+      background-color: #eee;
+      border: 1px;
+      color: #666;
+    }
+    #submit::hover {
+      padding: 6px 30px;
+      border-radius: 3px;
+      background-color: #ccc;
+      border: 1px;
+      color: #666;
+    }
+    #submit::active {
+      padding: 6px 30px;
+      border-radius: 3px;
+      background-color: #bbb;
+      border: 1px;
+      color: #666;
+    }
+  </style>
+</head>
+
+<body>
+  <div id="root">
+    <label>
+      <span>接口前缀</span>
+      <input type="text" id="context" value="aft">
+    </label>
+    <label>
+      <span>接口地址</span>
+      <input type="text" id="path" value="api/pushwarning">
+    </label>
+    <label>
+      <span>post or get</span>
+      <select id="method">
+      	<option value="post">post</option>
+      	<option value="get">get</option>
+      </select>
+    </label>
+    <br>
+    <label>
+      <span>params json data:</span>
+      <textarea id="data" cols="30" rows="10">
+        {
+"mobile":"13628002797", 
+"password":"123"
+}
+      </textarea>
+    </label>
+    <br>
+    <div>
+      <button id="submit">submit</button>
+    </div>
+    <br>
+    <label>
+      <span>result:</span>
+      <textarea id="result" cols="30" rows="10">
+
+      </textarea>
+    </label>
+  </div>
+  <script src="//cdn.bootcss.com/jquery/3.1.0/jquery.js"></script>
+  <script> 
+    (function ($) {
+      var loading = false;
+      $('#submit').on('click', function () {
+        if (loading) {
+          return;
+        }
+        var url = '/' + $('#context').val() + '/' + $('#path').val();
+        var data = $.trim($('#data').val());
+        data = data ? JSON.parse($('#data').val()) : {};
+        loading = true;
+        $.ajax({
+          url: url,
+          method: $('#method').val() || 'get',
+          data: data
+        }).done(function (res) {
+          $('#result').val(JSON.stringify(res));
+        }).always(function () {
+          loading = false;
+          alert('done');
+        });
+      })
+    })(jQuery);
+  </script>
+</body>
+
+</html>

+ 18 - 18
src/main/webapp/WEB-INF/views/index.jsp

@@ -1,19 +1,19 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags"%>
-<!DOCTYPE HTML>
-<html xmlns=http://www.w3.org/1999/xhtml>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
-	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
-	<!--[if lt IE 9]>
-    <script src="//cdn.bootcss.com/html5shiv/r29/html5.min.js"></script>
-	<script src="//cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
-  	<![endif]-->
-	<title>首页</title>
-</head>
-<body>
-	<div id="root">建设中</div>
-	<script type="text/javascript" src="${staticHost}/test.js"></script>
-</body>
+<%@ page contentType="text/html;charset=UTF-8" language="java"%>
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags"%>
+<!DOCTYPE HTML>
+<html xmlns=http://www.w3.org/1999/xhtml>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
+	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
+	<!--[if lt IE 9]>
+    <script src="//cdn.bootcss.com/html5shiv/r29/html5.min.js"></script>
+	<script src="//cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
+  	<![endif]-->
+	<title>首页</title>
+</head>
+<body>
+	<div id="root">建设中</div>
+	<script type="text/javascript" src="${staticHost}/test.js"></script>
+</body>
 </html>