From 59abbe4785268a10ec9390b8373cce3939c1d24b Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期一, 02 九月 2024 15:42:22 +0800
Subject: [PATCH] 打印测试
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index f0fb38a..2b078be 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -7,8 +7,6 @@
using System.Net;
using System.Reflection;
using System.Text;
-using System.Threading.Tasks;
-using Gs.DevApp.ToolBox;
using System.Resources;
using System.Drawing;
using Newtonsoft.Json;
@@ -100,12 +98,14 @@
return image2;
}
/// <summary>
- /// 璇诲彇token
+ /// 鐢熸垚token
/// </summary>
/// <returns></returns>
public static string GetBasicAuthTicket()
{
- string token = Guid.NewGuid().ToString();
+ string userGuid = string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginUserGuid) ? Guid.NewGuid().ToString() : LoginInfoModel.CurrentUser.LoginUserGuid;
+ string orgGuid = string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginOrgGuid) ? Guid.NewGuid().ToString() : LoginInfoModel.CurrentUser.LoginOrgGuid;
+ string token = (userGuid + "~" + orgGuid);
return token;
}
/// <summary>
@@ -117,7 +117,7 @@
{
ReturnModel<PageListModel> rto = new ReturnModel<PageListModel>();
JObject json = JObject.Parse(strReturn);
- rto.rtnCode =int.Parse( json["rtnCode"].ToString());
+ rto.rtnCode = int.Parse(json["rtnCode"].ToString());
rto.rtnMsg = json["rtnMsg"].ToString();
rto.rtnData = new PageListModel();
rto.rtnData.pages = int.Parse(json["rtnData"]["pages"].ToString());
@@ -133,10 +133,6 @@
rto.rtnData.list = dt;
return rto;
}
-
-
-
-
/// <summary>
/// 鏍囧噯json涓茶繑鍥濺eturnModel->瀛楃涓诧紝
/// </summary>
@@ -146,14 +142,17 @@
{
ReturnModel<dynamic> rto = new ReturnModel<dynamic>();
JObject json = JObject.Parse(strReturn);
- rto.rtnCode =int.Parse( json["rtnCode"].ToString());
+ rto.rtnCode = int.Parse(json["rtnCode"].ToString());
rto.rtnMsg = json["rtnMsg"].ToString();
rto.rtnData = json["rtnData"];
return rto;
}
-
- public static float GetFontSize =10;
- public static void SetFont(Control control) {
+ /// <summary>
+ /// 璁剧疆绯荤粺瀛椾綋澶у皬锛岀洰鍓嶅苟涓嶉�氱敤
+ /// </summary>
+ public static float GetFontSize = 10;
+ public static void SetFont(Control control)
+ {
float size = GetFontSize;
foreach (Control childControl in control.Controls)
{
--
Gitblit v1.9.3