Browse Source

成果需求录入

wanghui 8 years ago
parent
commit
a7fcdd887f

+ 1 - 1
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -29,7 +29,7 @@ public class InputAchievement {
 	@Size(min = 0, max = 1024, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		summary;
 
-	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 2048, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		introduction;
 
 	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

+ 2 - 3
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -663,14 +663,13 @@
   <select id="selectUserPageHomeBoByUserId" parameterType="java.lang.String" resultMap="UserPageHomeBo">
    select 
    		u.lvl,mg.grade_name , u.nickname, u.email,
-   		u.number, u.type, i.person_portrait_url, 
+   		u.number, u.type, u.person_portrait_url, 
    		o.logo_url , u.id as uid, adc.achievement_count as achievementNum,
    		adc.demand_count as demandNum
    from user u 
-   LEFT JOIN user_info  i on u.id = i.uid 
    LEFT JOIN organization_info o on u.id = o.uid 
    LEFT JOIN achievement_demand_count adc on adc.uid = u.id
-   LEFT JOIN   member_grade mg ON mg.member_rank=u.lvl
+   LEFT JOIN  member_grade mg ON mg.member_rank=u.lvl
    where u.id = #{uid,jdbcType = VARCHAR}
   </select>
   

+ 0 - 9
src/main/java/com/goafanti/common/utils/PasswordUtil.java

@@ -1,6 +1,5 @@
 package com.goafanti.common.utils;
 
-import java.util.Calendar;
 import java.util.Date;
 
 import org.apache.shiro.crypto.hash.SimpleHash;
@@ -57,12 +56,4 @@ public class PasswordUtil {
 	public ByteSource getSalt(Date date) {
 		return ByteSource.Util.bytes(String.valueOf(date.getTime()));
 	}
-	
-	
-	public static void main(String[] args) {
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		String s = String.valueOf(now.getTime());
-		System.out.println(new SimpleHash("md5","123456",s,2));
-	}
 }