Merge branch 'project-haixin' into project-jmga

# Conflicts:
#	src/main/java/com/fdkankan/openApi/controller/www/ManageController.java

src/main/java/com/fdkankan/openApi/constant/JmgaConstant.java

@@ -34,7 +34,9 @@ public class JmgaConstant {
     public static final String API_POST_MANAGE_LOGIN= "/service/manage/inner/getTokenByRyNo";
     public static final String API_POST_MANAGE_PLATFORMLIST= "/service/manage/inner/platformList";
 
-
+    public static final String API_POST_MANAGE_LOGIN2= "/service/manage/inner/getTokenByProjectId";
+    public static final String API_POST_MANAGE_LOGIN3= "/service/manage/inner/getTokenByKno";
+    public static final String API_POST_MANAGE_UPDATEKNO= "/service/manage/inner/updateKno";
     public static final String API_GET_LIST_CASE = "/fusion/inner/caseList";
     public static final String API_GET_LIST_SCENE = "/fusion/inner/sceneList";
     public static final String API_GET_CHECK_DOWNLOAD_CASE = "/fusion/inner/checkDown";

src/main/java/com/fdkankan/openApi/controller/www/ManageController.java

@@ -51,5 +51,34 @@ public class ManageController {
         return jmgaClient.post(JmgaConstant.API_POST_MANAGE_PLATFORMLIST,param);
     }
 
+    /**
+     * 管理后台登录
+     */
+    @SaIgnore
+    @PostMapping("/getTokenByProjectId")
+    @ValidateApi(method = "manage:getTokenByProjectId")
+    public ResultData getTokenByProjectId(@RequestBody ManageLoginRequest param)  {
 
+        return jmgaClient.post(JmgaConstant.API_POST_MANAGE_LOGIN2,param);
+    }
+
+    /**
+     * 管理后台登录
+     */
+    @SaIgnore
+    @PostMapping("/getTokenByKno")
+    @ValidateApi(method = "manage:getTokenByKno")
+    public ResultData getTokenByKno(@RequestBody ManageLoginRequest param)  {
+
+        return jmgaClient.post(JmgaConstant.API_POST_MANAGE_LOGIN3,param);
+    }
+
+
+    @SaIgnore
+    @PostMapping("/updateKno")
+    @ValidateApi(method = "manage:updateKno")
+    public ResultData updateKno(@RequestBody ManageLoginRequest param)  {
+
+        return jmgaClient.post(JmgaConstant.API_POST_MANAGE_UPDATEKNO,param);
+    }
 }

src/main/java/com/fdkankan/openApi/entity/www/ManageLoginRequest.java

@@ -7,4 +7,8 @@ public class ManageLoginRequest {
 
     private Long time;
     private String ryNo;
+    private String projectId;
+    private String kno;
+    private String caseId;
+    private String visitType;
 }