From d013a35ef5bb3b45b46362c67d6f3ca52a54e96d Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 01 七月 2024 16:07:55 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/wobject/xaserver.hpp | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/jrj/xframe/wobject/xaserver.hpp b/jrj/xframe/wobject/xaserver.hpp
index d309054..154845d 100644
--- a/jrj/xframe/wobject/xaserver.hpp
+++ b/jrj/xframe/wobject/xaserver.hpp
@@ -170,9 +170,9 @@
return kxaserver::UploadEx((LPTSTR)pUri, (LPTSTR)pName,m_hWnd, (LPTSTR)pSource,bCompress);
}
- static int Upload(LPTSTR pUri,LPTSTR pName,HWND m_hWnd,LPTSTR pSource=NULL,BOOL bCompress=false)
+ static int Upload(LPCTSTR pUri,LPCTSTR pName,HWND m_hWnd,LPCTSTR pSource=NULL,BOOL bCompress=false)
{
- return kxaserver::Upload(pUri,pName,m_hWnd,pSource,bCompress);
+ return kxaserver::Upload((LPTSTR)pUri,(LPTSTR)pName,m_hWnd, (LPTSTR)pSource,bCompress);
}
static int Upload(LPCTSTR pUri,LPCTSTR pName,LPCTSTR pPath,HWND m_hWnd,LPCTSTR pSource=NULL,BOOL bCompress=false)
@@ -188,21 +188,25 @@
{
return kxaserver::UploadFile((LPTSTR)pUri,(LPTSTR)pName,m_hWnd,(LPTSTR)pSource,bCompress);
}
- static int __DeleteFile(LPTSTR pName)
+ static int DeleteFile(LPTSTR pName)
{
return kxaserver::__DeleteFile(pName);
}
- static int __CreateDirectory(LPCTSTR pName)
+ static int CreateDirectory(LPCTSTR pName)
{
return kxaserver::__CreateDirectory((LPTSTR)pName);
}
- static int DownLoadFile(LPCTSTR pStrServer,LPCTSTR pUrl,LPCTSTR pExt,LPTSTR pName=NULL)
+ static int DownLoadFile(LPCTSTR pStrServer,LPCTSTR pUrl,LPCTSTR pExt,LPCTSTR pName=NULL)
{
- return kxaserver::DownLoadFile(pStrServer,pUrl,pExt,pName);
+ return kxaserver::DownLoadFile(pStrServer,pUrl,pExt,(LPTSTR)pName);
}
static int UploadData(LPCTSTR pUri,LPCTSTR pName,LPCTSTR pData)
{
return kxaserver::UploadData((LPTSTR)pUri, (LPTSTR)pName, (LPTSTR)pData);
}
+ static xstring GetUserId()
+ {
+ return GetUID();
+ }
};
\ No newline at end of file
--
Gitblit v1.9.3