Merge branch 'master' of http://exam.letrd.com:8900/gechengyang/nouiWithSpringMVC into master

src/main/java/cn/com/brilliance/eibs/auth/DatabaseLoginContextForELCS.java

@@ -225,7 +225,10 @@ public class DatabaseLoginContextForELCS extends AbstractLoginContext {
         if (dbPassword != null) {
             dbPassword = dbPassword.trim();
         }
-        String encodedPassword = ContainerUtils.encodeWithSalt ? passwordFilter.encode(password, userName).trim() : passwordFilter.encode(password).trim();
+//        String encodedPassword = ContainerUtils.encodeWithSalt ? passwordFilter.encode(password, userName).trim() : passwordFilter.encode(password).trim();
+//        log.info("password反转回来==="+password+",userName===="+userName);
+        String encodedPassword = passwordFilter.encode(password, userName).trim();
+//        log.info("password国密解析==="+encodedPassword);
         log.debug("password(input/db)" + dbPassword + "\t" + encodedPassword);
         if (!encodedPassword.equals(dbPassword))
             return "[Database: NOT Match.]";

src/main/java/org/sss/presentation/noui/controller/AbstractCommonController.java

 package org.sss.presentation.noui.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import log.Log;
+import log.LogFactory;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
-import org.sss.common.model.EventType;
-import org.sss.common.model.IBaseObject;
-import org.sss.common.model.IDatafield;
-import org.sss.common.model.IModule;
-import org.sss.common.model.IModuleList;
-import org.sss.common.model.IPanel;
-import org.sss.common.model.IStream;
+import org.sss.common.model.*;
 import org.sss.presentation.noui.api.exception.NoUiException;
 import org.sss.presentation.noui.api.model.Alias;
 import org.sss.presentation.noui.api.request.NoUiRequest;
@@ -35,8 +23,12 @@ import org.sss.presentation.noui.util.NoUiPresentationUtil;
 import org.sss.presentation.noui.util.RedisUtil;
 import org.sss.presentation.noui.util.StringUtil;
 
-import log.Log;
-import log.LogFactory;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public abstract class  AbstractCommonController {
 	protected static final Log log = LogFactory.getLog(AbstractCommonController.class);
@@ -142,7 +134,7 @@ public abstract class  AbstractCommonController {
 					NoUiPresentationUtil.handleErrorReturnData(context, alias), NoUiPresentationUtil.handleCodeTableReturnData(context, alias), noUiVersion.getVersion());
 		} catch (Exception e) {
 			log.error("OnClick command error", e);
-			ret = ResultUtil.result(ErrorCodes.ERROR, "hander error", e.getMessage(), noUiVersion.getVersion());
+			ret = ResultUtil.result(ErrorCodes.ERROR, "hander error", "service error", noUiVersion.getVersion());
 		} finally {
 			if (context != null)
 			{

src/main/java/org/sss/presentation/noui/filter/PasswordSM2Filter.java

@@ -3,58 +3,52 @@
  */
 package org.sss.presentation.noui.filter;
 
+import cfca.sadk.util.HashUtil;
 import log.Log;
 import log.LogFactory;
-
-import org.apache.commons.codec.binary.Base64;
 import org.sss.common.model.IFilter;
 import org.sss.util.ContainerUtils;
 
-import cfca.sadk.util.HashUtil;
+import java.nio.charset.StandardCharsets;
 
 /**
  * 密码过滤器实现（国密）
+ *
  * @author Jason.Hoo (latest modification by $Author: hujianxin $)
  * @version $Revision: 1014 $ $Date: 2019-01-03 18:23:23 +0800 (Thu, 03 Jan 2019) $
  */
 public class PasswordSM2Filter
-    implements IFilter
-{
-  static final Log log = LogFactory.getLog(PasswordSM2Filter.class);
+        implements IFilter {
+    static final Log log = LogFactory.getLog(PasswordSM2Filter.class);
 
-  public String decode(String encodedValue)
-  {
-    if (ContainerUtils.isEmpty(encodedValue))
-      return null;
-    return "**********";
-  }
-
-  public String encode(String value)
-  {
-    if (ContainerUtils.isEmpty(value))
-      return value;
-    byte[] result = null;
-    try
-    {
-      result = HashUtil.SM2HashMessageByBCWithoutZValue(value.getBytes());
+    public String decode(String encodedValue) {
+        if (ContainerUtils.isEmpty(encodedValue))
+            return null;
+        return "**********";
     }
-    catch (Exception e)
-    {
-      log.error("encode SM2 error.", e);
-      return null;
+
+    public String encode(String value) {
+        if (ContainerUtils.isEmpty(value))
+            return value;
+        byte[] encodedPassword = null;
+        try {
+            encodedPassword = HashUtil.SM2HashMessageByBCWithoutZValue(value.getBytes(StandardCharsets.UTF_8));
+            StringBuffer buf = new StringBuffer();
+            for (int i = 0; i < encodedPassword.length; i++) {
+                if ((encodedPassword[i] & 0xff) < 0x10) {
+                    buf.append("0");
+                }
+                buf.append(Long.toString(encodedPassword[i] & 0xff, 16));
+            }
+            return buf.toString();
+        } catch (Exception e) {
+            log.error("encode SM2 error.", e);
+            return "";
+        }
     }
-    return new Base64().encodeToString(result).trim();
-  }
 
-  public String encode(String value, String salt)
-  {
-    if (ContainerUtils.isEmpty(value))
-      return value;
-    value = encode(value);
-    if (ContainerUtils.isEmpty(salt) || ContainerUtils.isEmpty(value))
-      return value;
-    else
-      return encode(value + salt);
-  }
+    public String encode(String value, String salt) {
+        return encode(salt+value);
+    }
 
 }
\ No newline at end of file