【次元EIS接口，获取token接口返回值调整】

src/main/java/com/uas/eis/controller/StepWorkController.java

@@ -34,15 +34,46 @@ public class StepWorkController {
      * @return
      */
     @RequestMapping(value="/blade-auth/oauth/token", method = RequestMethod.POST)
-    public StepWorkApiResult<Map<String,Object>> getToken(HttpServletRequest request,String username,String password){
+    public Map<String,Object> getToken(HttpServletRequest request,String username,String password){
         Map<String,Object> map = new HashMap<>();
         if(!StringUtil.hasText(username) || !StringUtil.hasText(password) ){
-            return StepWorkApiResponse.failRsp(400,"用户名和密码必填!");
+            map.put("error","用户名和密码必填");
+            map.put("error_description","用户名和密码必填");
+            return map;
         }
-        map.put("accessToken",stepWorkService.login(username, password));
-        map.put("tokenType","bearer");
-        //refresh_token
-        return StepWorkApiResponse.successRsp(map);
+        Map<String,Object> map2 = stepWorkService.login(username, password);
+        if(map2.get("success").equals("1")){
+            map.put("access_token",map2.get("token"));
+            map.put("token_type","bearer");
+            map.put("refresh_token","");
+            map.put("expires_in","");
+            map.put("scope","all");
+            map.put("tenant_id","");
+            map.put("login_type","");
+            map.put("user_name",username);
+            map.put("real_name",username);
+            map.put("avatar","");
+            map.put("client_id","");
+            map.put("role_name","");
+            map.put("license","");
+            map.put("post_id","");
+            map.put("user_id","");
+            map.put("role_id","");
+            map.put("nick_name",username);
+            map.put("oauth_id","");
+            Map<String,Object> map1 = new HashMap<>();
+            map1.put("type","web");
+            map.put("detail",map1);
+            map.put("dept_id","");
+            map.put("account",username);
+            map.put("jti",username);
+            //refresh_token
+            return map;
+        }else{
+            map2.remove("success");
+            return map2;
+        }
+
     }
 
     /**

src/main/java/com/uas/eis/service/StepWorkService.java

@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 public interface StepWorkService {
-    String login(String username, String password);
+    Map<String,Object>  login(String username, String password);
 
     StepWorkApiResult<Map<String,Object>> test(HttpServletRequest request,String data);
 

src/main/java/com/uas/eis/serviceImpl/StepWorkServiceImpl.java

@@ -30,17 +30,26 @@ public class StepWorkServiceImpl implements StepWorkService {
     private BaseDao baseDao;
 
     @Override
-    public String login(String username, String password) {
+    public Map<String,Object> login(String username, String password) {
+        Map<String,Object> map = new HashMap<>();
         SqlRowList rs = baseDao.queryForRowSet("select AE_SECRET from APIEMPLOYEE where AE_KEY=?",username);
         if(rs.next()){
             System.out.println("secret:"+MD5Util.encrypt32Up(rs.getString("ae_secret")));
           if(!password.toUpperCase().equals(MD5Util.encrypt32Up(rs.getString("ae_secret")))){
-              throw new ApiStepWorkException(new StepWorkApiResult(ErrorMessage.ACCESSSECRET_ERROR));
+              map.put("success","0");
+              map.put("error","password");
+              map.put("error_description","密码错误");
+              return map;
           }else{
-              return TokenHandler.createToken(username,rs.getString("ae_secret"));
+              map.put("token",TokenHandler.createToken(username,rs.getString("ae_secret")));
+              map.put("success","1");
+              return map;
           }
         }else{
-            throw new ApiStepWorkException(new StepWorkApiResult(ErrorMessage.ACCESSKEY_ERROR));
+            map.put("success","0");
+            map.put("error","username");
+            map.put("error_description","用户名不存在");
+            return map;
         }
     }