Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-01 a2927467ebfa938a420f392deb6882b35570fd33

 HDL_ON/DAL/Server/NewAPI.cs

@@ -56,15 +56,15 @@
        /// <summary>
        /// 上传头像
        /// </summary>
        public const string API_POST_Head_Upload = "/home-wisdom/head/portrait/upload";
        public const string API_POST_Head_Upload = "/home-wisdom/app/head/portrait/upload";
        /// <summary>
        /// 下载头像
        /// </summary>
        public const string API_POST_Head_Down = "/home-wisdom/head/portrait/down";
        public const string API_POST_Head_Down = "/home-wisdom/app/head/portrait/down";
        /// <summary>
        /// 根据账号下载头像
        /// </summary>
        public const string API_POST_Head_DownWithAccount = "/home-wisdom/head/portrait/downWithAccount";
        public const string API_POST_Head_DownWithAccount = "/home-wisdom/app/head/portrait/downWithAccount";
        /// <summary>
        /// 绑定认证(手机/邮箱)
        /// </summary>
@@ -78,88 +78,84 @@
        #endregion

        #region ■ HomeCluster -- 住宅管理接口___________________________
        ///// <summary>
        ///// 添加住宅
        ///// </summary>
        //public const string API_POST_Addhome = "/HomeCluster/V1/addhome";
        /// <summary>
        /// 获取住宅分页
        /// </summary>
        public const string API_POST_Gethomepager = "/home-wisdom/home/list";
        public const string API_POST_Gethomepager = "/home-wisdom/app/home/list";
        /// <summary>
        /// 删除住宅
        /// </summary>
        public const string API_POST_Home_Delete = "/home-wisdom/home/delete";
        public const string API_POST_Home_Delete = "/home-wisdom/app/home/delete";
        /// <summary>
        /// 更新住宅
        /// </summary>
        public const string API_POST_Home_UpdateHome = "/home-wisdom/home/update";

        public const string API_POST_Home_UpdateHome = "/home-wisdom/app/home/update";
        /// <summary>
        /// 住宅迁移
        /// </summary>
        public const string API_POST_Home_Transfer = "/home-wisdom/app/home/transfer";
        #endregion

        #region ■ 子账号 -- 添加住宅成员___________________________
        /// <summary>
        /// 添加子账户
        /// </summary>
        public const string API_POST_Child_Add = "/home-wisdom/child/account/add";
        public const string API_POST_Child_Add = "/home-wisdom/app/child/account/add";
        /// <summary>
        /// 删除子账户
        /// </summary>
        public const string API_POST_Child_Delete = "/home-wisdom/child/account/delete";
        public const string API_POST_Child_Delete = "/home-wisdom/app/child/account/delete";
        /// <summary>
        /// 根据住宅 id 查询所有的子账户
        /// </summary>
        public const string API_POST_Child_FindAll = "/home-wisdom/child/account/findAll";
        public const string API_POST_Child_FindAll = "/home-wisdom/app/child/account/findAll";
        /// <summary>
        /// 更新远程控制
        /// </summary>
        public const string API_POST_Child_Update = "/home-wisdom/child/account/update";
        public const string API_POST_Child_Update = "/home-wisdom/app/child/account/update";
        /// <summary>
        /// 子账号管理员获取主账号授权Token
        /// </summary>
        public const string API_POST_Child_GetMasterToken = "/home-wisdom/child/account/masterToken/get";
        public const string API_POST_Child_GetMasterToken = "/home-wisdom/app/child/account/masterToken/get";
        /// <summary>
        /// 下载子账号头像
        /// </summary>
        public const string API_POST_Child_DownloadHeadImage = "/home-wisdom/child/account/getHeadPortrait";
        public const string API_POST_Child_DownloadHeadImage = "/home-wisdom/app/child/account/getHeadPortrait";
        #region 数据分享
        /// <summary>
        /// 分享指定文件给指定成员
        /// </summary>
        public const string API_POST_Home_Share_Add = "/home-wisdom/home/share/add";
        public const string API_POST_Home_Share_Add = "/home-wisdom/app/home/share/add";
        /// <summary>
        /// 查询指定成员的所有分享文件
        /// </summary>
        public const string API_POST_Home_Share_FindAll = "/home-wisdom/home/share/findAll";
        public const string API_POST_Home_Share_FindAll = "/home-wisdom/app/home/share/findAll";
        /// <summary>
        /// 下载指定的分享文件
        /// </summary>
        public const string API_POST_Home_Share_DownOne = "/home-wisdom/home/share/downOne";
        public const string API_POST_Home_Share_DownOne = "/home-wisdom/app/home/share/downOne";
        /// <summary>
        /// 删除指定的分享文件
        /// </summary>
        public const string API_POST_Home_Share_Delete = "/home-wisdom/home/share/delete";
        public const string API_POST_Home_Share_Delete = "/home-wisdom/app/home/share/delete";

        #endregion

        #endregion

        #region  ■ GatewayCluster -- 网关___________________________

        /// <summary>
        /// 绑定网关到住宅
        /// </summary>
        public const string API_POST_BindGateway = "/home-wisdom/gateway/bindGateway";

        ///// <summary>
        ///// 绑定网关到住宅
        ///// </summary>
        //public const string API_POST_BindGateway = "/home-wisdom/app/gateway/bindGateway";
        /// <summary>
        /// 获取住宅网关分页
        /// </summary>
        public const string API_POST_GetGatewayList = "/home-wisdom/gateway/getGatewayList";

        public const string API_POST_GetGatewayList = "/home-wisdom/app/gateway/getGatewayList";
        ///// <summary>
        ///// 解绑绑网关到住宅
        ///// </summary>
        public const string API_POST_UntieGateway = "/home-wisdom/gateway/untieGateway";
        public const string API_POST_UntieGateway = "/home-wisdom/app/gateway/untieGateway";

        #endregion

@@ -175,73 +171,73 @@
        /// <summary>
        /// 获取远程连接
        /// </summary>
        public const string API_POST_GetMqttRemoteInfo = "/home-wisdom/mqtt/getRemoteInfo";
        public const string API_POST_GetMqttRemoteInfo = "/home-wisdom/app/mqtt/getRemoteInfo";
        #endregion

        #region ■ HomebackupCluster -- 住宅备份微服务___________________________
        /// <summary>
        /// 创建文件夹
        /// </summary>
        public const string API_POST_Folder_Create = "/home-wisdom/backup/folder/create";

        /// <summary>
        /// 删除文件夹
        /// </summary>
        public const string API_POST_Folder_Delete = "/home-wisdom/backup/folder/delete";

        /// <summary>
        /// 查找所有文件夹
        /// </summary>
        public const string API_POST_Folder_FindAll = "/home-wisdom/backup/folder/findAll";

        /// <summary>
        /// 更新文件夹
        /// </summary>
        public const string API_POST_Folder_Update = "/home-wisdom/backup/folder/update";

        /// <summary>
        /// 上传文件
        /// </summary>
        public const string API_POST_File_Create = "/home-wisdom/backup/file/create";
        ///// <summary>
        ///// 创建文件夹
        ///// </summary>
        //public const string API_POST_Folder_Create = "/home-wisdom/app/backup/folder/create";

        ///// <summary>
        ///// 删除文件
        ///// 删除文件夹
        ///// </summary>
        //public const string API_DELETE_File_Delete = "/HomebackupCluster/V1/file/delete";
        //public const string API_POST_Folder_Delete = "/home-wisdom/app/backup/folder/delete";

        /// <summary>
        /// 下载备份文件
        /// </summary>
        public const string API_POST_File_Down = "/home-wisdom/backup/file/downOne";
        ///// <summary>
        ///// 查找所有文件夹
        ///// </summary>
        //public const string API_POST_Folder_FindAll = "/home-wisdom/app/backup/folder/findAll";

        /// <summary>
        /// 查询一个文件夹所有文件名
        /// </summary>
        public const string API_POST_File_FindAll = "/home-wisdom/backup/file/findAll";
        ///// <summary>
        ///// 更新文件夹
        ///// </summary>
        //public const string API_POST_Folder_Update = "/home-wisdom/app/backup/folder/update";

        ///// <summary>
        ///// 上传文件
        ///// </summary>
        //public const string API_POST_File_Create = "/home-wisdom/app/backup/file/create";

        /////// <summary>
        /////// 删除文件
        /////// </summary>
        ////public const string API_DELETE_File_Delete = "/HomebackupCluster/V1/file/delete";

        ///// <summary>
        ///// 下载备份文件
        ///// </summary>
        //public const string API_POST_File_Down = "/home-wisdom/app/backup/file/downOne";

        ///// <summary>
        ///// 查询一个文件夹所有文件名
        ///// </summary>
        //public const string API_POST_File_FindAll = "/home-wisdom/app/backup/file/findAll";

        #endregion

        #region ■ zigbeespeakerservice -- 语音控制服务___________________________

        /// <summary>
        /// 获取音箱列表
        /// </summary>
        public const string API_GET_Speaker_Auth = "/speakerservices/Auth";
        ///// <summary>
        ///// 获取音箱列表
        ///// </summary>
        //public const string API_GET_Speaker_Auth = "/speakerservices/Auth";

        /// <summary>
        /// 修改音箱备注
        /// </summary>
        public const string API_PUT_Speaker_Auth_Rename = "/speakerservices/Auth";
        ///// <summary>
        ///// 修改音箱备注
        ///// </summary>
        //public const string API_PUT_Speaker_Auth_Rename = "/speakerservices/Auth";

        /// <summary>
        /// 获取设备和场景列表
        /// </summary>
        public const string API_GET_Speaker_BatchEdit_V2 = "/speakerservices/BatchEdit_V2";
        ///// <summary>
        ///// 获取设备和场景列表
        ///// </summary>
        //public const string API_GET_Speaker_BatchEdit_V2 = "/speakerservices/BatchEdit_V2";

        /// <summary>
        /// 添加设备和场景列表
        /// </summary>
        public const string API_POST_Speaker_BatchEdit_V2 = "/speakerservices/BatchEdit_V2";
        ///// <summary>
        ///// 添加设备和场景列表
        ///// </summary>
        //public const string API_POST_Speaker_BatchEdit_V2 = "/speakerservices/BatchEdit_V2";


        #endregion
@@ -380,6 +376,20 @@



        #region ■  -- 房间、设备、场景分享___________________________
        /// <summary>
        /// 添加分享
        /// </summary>
        public const string API_POST_Share_Add = "/home-wisdom/app/share/add";
        /// <summary>
        /// 删除分享
        /// </summary>
        public const string API_POST_Share_Delete = "/home-wisdom/app/share/delete";
        /// <summary>
        /// 获取分享
        /// </summary>
        public const string API_POST_Share_Get = "/home-wisdom/app/share/get";
        #endregion

        #endregion
    }