删除System.out.println

member.impl/src/main/java/com/apobates/forum/member/impl/service/MemberServiceImpl.java

@@ -157,7 +157,6 @@ public class MemberServiceImpl implements MemberService{
     @Override
     public Optional<Member> signUp(String memberNames, String unEncryptPswd, String inviteCode, String nickname, MemberActionDescriptor actionDescriptor)throws IllegalArgumentException,IllegalStateException { //ASP-M3
         //--------------------------------------------------------------邀请码检查
-        System.out.println("[SRV]inviteCode:"+inviteCode);
         long inviteCodeId = 0L;
         if (Commons.isNotBlank(inviteCode)) {
             RegisteInviteCode ic = registeInviteCodeDao.findOne(inviteCode).orElseThrow(()->new IllegalArgumentException("邀请码不存在或已经失效"));
@@ -178,10 +177,9 @@ public class MemberServiceImpl implements MemberService{
                 Optional<Member> tmp = securityMember(m);
                 if (tmp.isPresent()) {
                     Member eventMember = tmp.get();
-                    if(inviteCodeId>0){ //丢掉了inviteCode相关信息
-                        eventMember.setInviteCodeId(inviteCodeId);
-                        eventMember.setInviteCode(inviteCode);
-                    }
+                    //丢掉了inviteCode相关信息
+                    eventMember.setInviteCodeId(inviteCodeId);
+                    eventMember.setInviteCode(inviteCode);
                     memberEventPublisher.publishSignUpEvent(new MemberSignUpEvent(this, eventMember));
                 }
                 //
@@ -204,7 +202,6 @@ public class MemberServiceImpl implements MemberService{
         String salt = Commons.randomAlphaNumeric(6);
         String encryptPswd = Commons.sha256(unEncryptPswd, salt);
         Member m = new Member(0, memberNames, encryptPswd, salt, MemberStatusEnum.ACTIVE, MemberGroupEnum.LEADER, role, nickname);
-        //m.setAvatarURI(salt); //注册时若为null,登录时可能出现NPE@已经构造器中加入
         try {
             memberDao.save(m);
             if (m.getId() > 0) {

thrones/src/main/java/com/apobates/forum/thrones/controller/MemberController.java

@@ -300,7 +300,9 @@ public class MemberController {
                 return "redirect:/member/register/success.xhtml";
             }
         }catch(IllegalArgumentException | IllegalStateException e){
-            e.printStackTrace();
+            if(logger.isDebugEnabled()){
+                logger.debug(e.getMessage(), e);
+            }
         }
         form.setNickname(mnick);
         form.setNames(mnames);

thrones/src/main/java/com/apobates/forum/thrones/controller/helper/MemberInviteCodeInterceptorAdapter.java

@@ -2,13 +2,11 @@ package com.apobates.forum.thrones.controller.helper;
 
 import com.apobates.forum.thrones.exception.InviteCodeLostException;
 import com.apobates.forum.utils.Commons;
-import java.util.Map.Entry;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -37,7 +35,6 @@ public class MemberInviteCodeInterceptorAdapter extends HandlerInterceptorAdapte
      */
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        
         if (activeInviteCode == 1 && request.getMethod().equalsIgnoreCase("post")) {
             String key = request.getSession().getAttribute("ICInputKey").toString();
             String val = request.getParameter(key);
@@ -59,45 +56,20 @@ public class MemberInviteCodeInterceptorAdapter extends HandlerInterceptorAdapte
      */
     @Override
     public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-        //若是GET放入input name值
-        //若是POST放入input name值和errors
         if (activeInviteCode == 1) {
             //String rndIN = Commons.randomAlphaNumeric(10);
             request.getSession().setAttribute("ICInputKey", KEY);
-            System.out.println("ICInputKey:" + KEY);
             modelAndView.addObject("ICInputActive", true);
             modelAndView.addObject("ICInputName", KEY);
-            /*
-            if(request.getMethod().equalsIgnoreCase("post")){
-                String key = request.getSession().getAttribute("ICInputKey").toString();
-                String val = request.getParameter(key);
-                if (!Commons.isNotBlank(val)) {
-                    BindingResult br = getBindingResult(modelAndView);
-                    if(null!=br){
-                        br.addError(new ObjectError(key,"邀请码不存在或已经失效"));
-                    }
-                }
-            }*/
         }
     }
     
     /**
      * 整个请求处理完毕回调方法，即在视图渲染完毕时回调，如性能监控中我们可以在此记录结束时间并输出消耗时间，还可以进行一些资源清理，类似于try-catch-finally中的finally，但仅调用处理器执行链中
      *
-     * @Override public void afterCompletion(HttpServletRequest request,
-     * HttpServletResponse response, Object handler, Exception ex) throws
-     * Exception { //request.getSession().removeAttribute("ICInputKey");
-    }*/
-    
-    public static BindingResult getBindingResult(ModelAndView modelAndView) {
-        if(modelAndView == null) {
-            return null;
-        }
-        for (Entry<String,?> key : modelAndView.getModel().entrySet()) {
-            if(key.getKey().startsWith(BindingResult.MODEL_KEY_PREFIX)) {
-                return (BindingResult)key.getValue();
-            }
-        }
-        return null;
-    }
+     * @Override 
+     * public void afterCompletion(HttpServletRequest request,HttpServletResponse response, Object handler, Exception ex) throws Exception { 
+     *   //request.getSession().removeAttribute("ICInputKey");
+     * }
+     */
 }
\ No newline at end of file

thrones/src/main/webapp/WEB-INF/layout/page/default/member/register.jsp

@@ -38,10 +38,10 @@
                     <input type="password" name="pswdConfirm" size="25" value="${form.pswdConfirm}" class="form-control" placeholder="重新输入会员的登录密码" autocomplete="off" data-parsley-required data-parsley-equalto="#newPswd" tabindex="4"/>
                     <form:errors path="form.pswdConfirm" delimiter="," element="div" cssClass="invalid-feedback d-inline"/>
                 </div>
-                <c:if test="${activeInvite}">
+                <c:if test="${ICInputActive}">
                 <div class="form-group">
                     <label for="pswdConfirm">邀请码:</label>
-                    <input type="text" name="inviteCode" size="25" value="${form.inviteCode}" class="form-control" placeholder="输入会员的注册邀请码" required="required" tabindex="5"/>
+                    <input type="text" name="${ICInputName}" size="25" value="${param.invite}" class="form-control" placeholder="输入会员的注册邀请码" tabindex="5"/>
                 </div>
                 </c:if>
                 <div class="checkbox">

utils/src/main/java/com/apobates/forum/utils/Commons.java

@@ -104,7 +104,6 @@ public final class Commons {
     }
     /**
      * 如果目标为空或null使用默认值
-     * 使用org.apache.commons.lang3实现
      *
      * @param target 目标字符串值
      * @param defaultValue 默认的值
@@ -113,6 +112,20 @@ public final class Commons {
     public static String optional(String target, String defaultValue) {
         return Optional.ofNullable(target).orElse(defaultValue);
     }
+    /**
+     * 如果目标为空或null使用默认值
+     * 
+     * @param target 目标可能会为Null的供应函数
+     * @param defaultValue 默认的值
+     * @return 
+     */
+    public static String optional(Supplier<Object> target, String defaultValue){
+        try{
+            return optional(target.get().toString(), defaultValue);
+        }catch(NullPointerException e){
+            return defaultValue;
+        }
+    }
     /**
      * 如果目标为空或null使用默认值
      *