优化登录查询条件

Api/src/main/java/com/java110/api/listener/UserLoginServiceListener.java

@@ -26,12 +26,11 @@ import java.util.Map;
  * Created by wuxw on 2018/5/18.
  */
 @Java110Listener("userLoginServiceListener")
-public class UserLoginServiceListener extends AbstractServiceApiDataFlowListener{
+public class UserLoginServiceListener extends AbstractServiceApiDataFlowListener {
 
     private final static Logger logger = LoggerFactory.getLogger(UserLoginServiceListener.class);
 
 
-
     @Override
     public String getServiceCode() {
         return ServiceCodeConstant.SERVICE_CODE_USER_SERVICE_LOGIN;
@@ -52,14 +51,15 @@ public class UserLoginServiceListener extends AbstractServiceApiDataFlowListener
     /**
      * 请求参数格式：
      * {
-        "username":"admin",
-        "passwd":"1234565"
-     }
-     返回报文：
-     {
-        "userId":"",
-        "token":"12dddd"
-     }
+     * "username":"admin",
+     * "passwd":"1234565"
+     * }
+     * 返回报文：
+     * {
+     * "userId":"",
+     * "token":"12dddd"
+     * }
+     *
      * @param event
      */
     @Override
@@ -68,81 +68,79 @@ public class UserLoginServiceListener extends AbstractServiceApiDataFlowListener
         DataFlowContext dataFlowContext = event.getDataFlowContext();
         AppService service = event.getAppService();
         String paramIn = dataFlowContext.getReqData();
-        Assert.isJsonObject(paramIn,"用户注册请求参数有误，不是有效的json格式 "+paramIn);
-        Assert.jsonObjectHaveKey(paramIn,"username","用户登录，未包含username节点，请检查" + paramIn);
-        Assert.jsonObjectHaveKey(paramIn,"passwd","用户登录，未包含passwd节点，请检查" + paramIn);
+        Assert.isJsonObject(paramIn, "用户注册请求参数有误，不是有效的json格式 " + paramIn);
+        Assert.jsonObjectHaveKey(paramIn, "username", "用户登录，未包含username节点，请检查" + paramIn);
+        Assert.jsonObjectHaveKey(paramIn, "passwd", "用户登录，未包含passwd节点，请检查" + paramIn);
         RestTemplate restTemplate = super.getRestTemplate();
-        ResponseEntity responseEntity= null;
+        ResponseEntity responseEntity = null;
         JSONObject paramInJson = JSONObject.parseObject(paramIn);
         //根据AppId 查询 是否有登录的服务，查询登录地址调用
         AppService appService = DataFlowFactory.getService(dataFlowContext.getAppId(), ServiceCodeConstant.SERVICE_CODE_QUERY_USER_LOGIN);
-        if(appService == null){
-            responseEntity = new ResponseEntity<String>("当前没有权限访问"+ServiceCodeConstant.SERVICE_CODE_QUERY_USER_LOGIN,HttpStatus.UNAUTHORIZED);
+        if (appService == null) {
+            responseEntity = new ResponseEntity<String>("当前没有权限访问" + ServiceCodeConstant.SERVICE_CODE_QUERY_USER_LOGIN, HttpStatus.UNAUTHORIZED);
             dataFlowContext.setResponseEntity(responseEntity);
-            return ;
+            return;
         }
-        String requestUrl = appService.getUrl() + "?userCode="+paramInJson.getString("username");
+        String requestUrl = appService.getUrl() + "?userCode=" + paramInJson.getString("username") + "&pwd=" + paramInJson.getString("passwd");
         HttpHeaders header = new HttpHeaders();
-        header.add(CommonConstant.HTTP_SERVICE.toLowerCase(),ServiceCodeConstant.SERVICE_CODE_QUERY_USER_LOGIN);
+        header.add(CommonConstant.HTTP_SERVICE.toLowerCase(), ServiceCodeConstant.SERVICE_CODE_QUERY_USER_LOGIN);
         HttpEntity<String> httpEntity = new HttpEntity<String>("", header);
-        try{
+        try {
             responseEntity = restTemplate.exchange(requestUrl, HttpMethod.GET, httpEntity, String.class);
-        }catch (HttpStatusCodeException e){ //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
-            responseEntity = new ResponseEntity<String>("请求登录查询异常，"+e.getResponseBodyAsString(),e.getStatusCode());
+        } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
+            responseEntity = new ResponseEntity<String>("请求登录查询异常，" + e.getResponseBodyAsString(), e.getStatusCode());
             dataFlowContext.setResponseEntity(responseEntity);
-            return ;
+            return;
         }
 
         String resultBody = responseEntity.getBody().toString();
 
-        Assert.isJsonObject(resultBody,"调用登录查询异常,返回报文有误，不是有效的json格式 "+resultBody);
+        Assert.isJsonObject(resultBody, "调用登录查询异常,返回报文有误，不是有效的json格式 " + resultBody);
 
         JSONObject resultInfo = JSONObject.parseObject(resultBody);
-        if(!resultInfo.containsKey("user") || !resultInfo.getJSONObject("user").containsKey("userPwd")
-                || !resultInfo.getJSONObject("user").containsKey("userId")){
+        if (!resultInfo.containsKey("user") || !resultInfo.getJSONObject("user").containsKey("userPwd")
+                || !resultInfo.getJSONObject("user").containsKey("userId")) {
             responseEntity = new ResponseEntity<String>("用户或密码错误", HttpStatus.UNAUTHORIZED);
             dataFlowContext.setResponseEntity(responseEntity);
-            return ;
+            return;
         }
 
         JSONObject userInfo = resultInfo.getJSONObject("user");
         String userPwd = userInfo.getString("userPwd");
-        if(!userPwd.equals(paramInJson.getString("passwd"))){
+        if (!userPwd.equals(paramInJson.getString("passwd"))) {
             responseEntity = new ResponseEntity<String>("密码错误", HttpStatus.UNAUTHORIZED);
             dataFlowContext.setResponseEntity(responseEntity);
-            return ;
+            return;
         }
 
         try {
             Map userMap = new HashMap();
-            userMap.put(CommonConstant.LOGIN_USER_ID,userInfo.getString("userId"));
-            userMap.put(CommonConstant.LOGIN_USER_NAME,userInfo.getString("userName"));
+            userMap.put(CommonConstant.LOGIN_USER_ID, userInfo.getString("userId"));
+            userMap.put(CommonConstant.LOGIN_USER_NAME, userInfo.getString("userName"));
             String token = AuthenticationFactory.createAndSaveToken(userMap);
             userInfo.remove("userPwd");
-            userInfo.put("token",token);
+            userInfo.put("token", token);
             responseEntity = new ResponseEntity<String>(userInfo.toJSONString(), HttpStatus.OK);
             dataFlowContext.setResponseEntity(responseEntity);
-        }catch (Exception e){
-            logger.error("登录异常：",e);
-            throw new SMOException(ResponseConstant.RESULT_CODE_INNER_ERROR,"系统内部错误，请联系管理员");
+        } catch (Exception e) {
+            logger.error("登录异常：", e);
+            throw new SMOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "系统内部错误，请联系管理员");
         }
     }
 
     /**
      * 对请求报文处理
+     *
      * @param paramIn
      * @return
      */
-    private JSONObject refreshParamIn(String paramIn){
+    private JSONObject refreshParamIn(String paramIn) {
         JSONObject paramObj = JSONObject.parseObject(paramIn);
-        paramObj.put("userId","-1");
-        paramObj.put("levelCd","0");
+        paramObj.put("userId", "-1");
+        paramObj.put("levelCd", "0");
 
         return paramObj;
     }
 
 
-
-
-
 }

java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java

@@ -405,15 +405,17 @@ public class AuthenticationFactory {
 
     /***********************************JWT end***************************************/
     public static void main(String[] args) throws Exception {
-        KeyPair keyPair = genKeyPair(1024);
-
-        //获取公钥，并以base64格式打印出来
-        PublicKey publicKey = keyPair.getPublic();
-        System.out.println("公钥：" + new String(Base64.getEncoder().encode(publicKey.getEncoded())));
-
-        //获取私钥，并以base64格式打印出来
-        PrivateKey privateKey = keyPair.getPrivate();
-        System.out.println("私钥：" + new String(Base64.getEncoder().encode(privateKey.getEncoded())));
+//        KeyPair keyPair = genKeyPair(1024);
+//
+//        //获取公钥，并以base64格式打印出来
+//        PublicKey publicKey = keyPair.getPublic();
+//        System.out.println("公钥：" + new String(Base64.getEncoder().encode(publicKey.getEncoded())));
+//
+//        //获取私钥，并以base64格式打印出来
+//        PrivateKey privateKey = keyPair.getPrivate();
+//        System.out.println("私钥：" + new String(Base64.getEncoder().encode(privateKey.getEncoded())));
+
+        System.out.printf("passwdMd5 " + passwdMd5("wuxw2015"));
 
     }
 }