Commit ae56057f authored by 姜春辉's avatar 姜春辉

发布.版本号:1.0.0(0528)

parent 03e52ebb
......@@ -165,7 +165,7 @@ DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# publish/
# Publish Web Output
*.[Pp]ublish.xml
......
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.Console">
<Dictionaries>
<Dict Name="baseConfig" Caption="基本配置">
<Key Name="WatchPort" Value="18083" Caption="监听端口" Choice="" />
<Key Name="HttpPort" Value="10032" Caption="控制页面端口" Choice="" />
</Dict>
</Dictionaries>
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="终端控制台插件" SymbolicName="GS.Terminal.Console" Version="1.0.0.0" StartLevel="10">
<License>hPnEXlXcHZOUdEa4a8sn56bTmI9lqbfLm/krwT3T7KFeREu3k58r9HCL/9p4ZrbYlrf6a14Bquo70dQN4zVxCEN+OoF9zCU7BCjqD7Z9PpnWv0yEeV/hD4/VvDzchq3sV64XgtxIIuKrI+WjZ/gZcMVQRq2RwCE/hgHbDtcoT6k=</License>
<Activator Type="GS.Terminal.Console.Activator" />
<Runtime>
<Assembly Path="GS.Terminal.Console.dll" Share="true" />
</Runtime>
<Services>
<Service Caption="远程指令服务" TypeAndName="GS.Terminal.Console.Services.RemoteService">
<!--
/// <summary>
/// 开始向远程机发送心跳
/// </summary>
/// <param name="remoteIp">地址</param>
/// <param name="remotePort">端口</param>
/// <param name="interval">间隔</param>
void StartHeart(string remoteIp,int remotePort, int interval)
发送心跳指令$Heart
指令内容通过 TERMINAL_STATUS 公共交互字段填充
/// <summary>
/// 停止发送心跳
/// </summary>
/// <param name="remoteIp">心跳远程地址</param>
void StopHeart(string remoteIp)
/// <summary>
/// 发送ping指令
/// </summary>
/// <param name="serverIP">服务器ip</param>
/// <param name="StatusChangedCallback">ping指令状态变更回调</param>
void StartPing(string serverIP,Action<IPStatus> StatusChangedCallback)
/// <summary>
/// 停止Ping
/// </summary>
/// <param name="serverIP">服务器地址</param>
/// <param name="StatusChangedCallback">移除事件</param>
void StopPing(string serverIP, Action<IPStatus> StatusChangedCallback)
-->
</Service>
</Services>
</Extensibility>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Settings AddonName="GS.Terminal.DeviceManager" xmlns="urn:Chinags-Configuration">
<Dictionaries>
<Dict Caption="基本配置" Name="BaseConfig">
<Key Caption="卡号反转" Choice="0,1" Name="Isrotate" Value="1"/>
<Key Caption="虚拟读卡间隔" Choice="" Name="VirtualReadCardInterval" Value="2000"/>
<Key Caption="开启虚拟读卡" Choice="0,1" Name="IsOpenVirtualReadCard" Value="1"/>
<Key Caption="卡号是否写日志" Choice="0,1" Name="IsWriteCardNoLog" Value="1"/>
<Key Caption="开启读卡缓存" Choice="0,1" Name="IsOpenCache" Value="true"/>
<Key Caption="缓存时长(秒)" Choice="" Name="CacheInterval" Value="15"/>
<!--<Key Caption="串口数据字符串过滤(正则)" Choice="" Name="SerialStringFilter" Value="550064A50D\w{16}(?&lt;SerialNo&gt;\w{8})\w{6}55" />-->
<Key Caption="串口数据字符串过滤(正则)" Choice="" Name="SerialStringFilter" Value="00\w{4}(?&lt;SerialNo&gt;\w{8})\w{4}00" />
</Dict>
</Dictionaries>
<Structures>
<Structure Name="Device" Caption="设备管理">
<Declare>
<Property Name="DisplayName" Caption="设备名称"></Property>
<Property Name="Type" Caption="设备类型"></Property>
<Property Name="Descript" Caption="描述"></Property>
<Property Name="VID" Caption="厂商ID"></Property>
<Property Name="PID" Caption="产品ID"></Property>
<Property Name="MI" Caption="MIN"></Property>
<Property Name="isVirtual" Caption="是否虚拟设备"></Property>
<Property Name="ImplDLLName" Caption="实现类库"></Property>
<Property Name="isWatch" Caption="是否插拔监控"></Property>
<Property Name="isPolling" Caption="是否轮询"></Property>
<Property Name="AllowFind" Caption="是否允许查找"></Property>
<Property Name="Interval" Caption="轮询间隔"></Property>
<Property Name="Tag" Caption="标识"></Property>
</Declare>
<Datas>
<Data DisplayName="DKQ_A16D_Second" Type="Second" Descript="新中新二代证阅读器DKQ-A16D" VID="0316" PID="5020" MI="" isVirtual="false" ImplDLLName="Device.Implement.SecondCardReader.dll" isWatch="true" isPolling="false" AllowFind="true" Interval="300" Tag="" />
</Datas>
</Structure>
</Structures>
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="终端设备管理插件" SymbolicName="GS.Terminal.DeviceManager" Version="1.0.0.0" StartLevel="45">
<License>
ILs+dORy9gG1KRYJYDkpVKeoyw3aXQPF+oAg5XmFQG0Rrli+Axt2xuespPojd7nDCtc5Qucl7w+EE4eRxFlBs/uoR6zEjWofGTNv1ZsmGQgRQzsGOTQyFhvVnmMrw1M13xO0Im2pZcrYT9OnCMnHP3Cr/hgrptaftI8hT+C2XVE=
</License>
<Activator Type="GS.Terminal.DeviceManager.AddonActivator" />
<Runtime>
<Assembly Path="GS.Terminal.DeviceManager.dll" Share="true" />
</Runtime>
<Services>
<Service TypeAndName="GS.Terminal.DeviceManager.Service.DeviceInfoService" Caption="设备信息管理服务">
<Interface>
<![CDATA[
// 获得设备列表 采用JSON方式返回
string GetJsonDevices()
// 获得设备列表 采用XML方式返回
string GetXmlDevices()
// 获取指定类型的设备列表 采用JSON方式返回
string GetJsonDevicesByType(string deviceTypeName)
// 获取指定类型的设备列表 采用XML方式返回
string GetXmlDevicesByType(string deviceTypeName)
// 获取指定名称的设备 采用XML方式返回
string GetXmlDeviceByName(string deviceName)
// 获取指定名称的设备 采用JSON方式返回
string GetJsonDeviceByName(string deviceName)
]]>
</Interface>
</Service>
<Service TypeAndName="GS.Terminal.DeviceManager.Service.DeviceTiggerService" Caption="设备触发器">
<Interface>
<![CDATA[
//扫描仪获取数据 默认第一个未占用扫描仪数据
void doScanner(Action<dynamic, dynamic> de_OnDeviceCall,string strType)
//读卡器获取数据 默认第一个未占用读卡器数据
string SerialReaderTouch(Action<dynamic,dynamic> de_OnDeviceCall)
//调取默认打印机,进行打印
void doPrint(Action<dynamic, dynamic> de_OnDeviceCall,string printInfo)
]]>
</Interface>
</Service>
<Service TypeAndName="GS.Terminal.DeviceManager.Service.DeviceCallControl" Caption="轮询处理服务注册">
<Interface>
<![CDATA[
//二代证设备事件处理注册
void RegistSecondCallback(Action<dynamic> GetCallback)
//扫描设备事件处理注册
void RegistSacnnerCallback(Action<dynamic> GetCallback)
//读卡器设备事件处理注册
void RegistCardCallback(Action<dynamic> GetCallback)
//二代证设备事件处理注销
void RemoveSecondCallback(Action<dynamic> GetCallback)
//扫描设备事件处理注销
void RemoveSacnnerCallback(Action<dynamic> GetCallback)
//读卡器设备事件处理注销
void RemoveCardCallback(Action<dynamic> GetCallback)
]]>
</Interface>
</Service>
<Service TypeAndName="GS.Terminal.DeviceManager.Service.DeviceConfigControl" Caption="设备配置管理">
<Interface>
<![CDATA[
//对打印机模板进行配置
void PrinterTemplateConfig()
]]>
</Interface>
</Service>
</Services>
</Extensibility>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.FaceRecognization">
<Dictionaries>
<Dict Name="baseConfig" Caption="基本配置">
<Key Caption="面部识别SDK版本" Choice="" Name="SDKVersion" Value="4" />
<Key Caption="摄像头输出图像尺寸" Choice="" Name="VideoOutPutSize" Value="640,480" />
<Key Caption="摄像头通道编号" Choice="" Name="VideoPort" Value="0" />
<Key Caption="摄像头启动模式" Choice="" Name="VideoMode" Value="" />
<Key Caption="识别间隔" Choice="" Name="RecognizationInterval" Value="1000" />
<Key Caption="是否开启活体检测,进针对SDKVersion为2时生效" Choice="" Name="EnableAliveness" Value="true" />
<Key Caption="摄像头图像输出间隔(毫秒)" Choice="" Name="VideoOutputSpan" Value="20" />
<Key Caption="摄像头画面旋转" Choice="" Name="VideoOutputRotate" Value="0" />
<Key Caption="面部特征值阀值" Choice="" Name="FaceRecognizationValue" Value="0.8" />
<Key Caption="是否为增值版" Choice="" Name="IsArcFacePro" Value="true" >
<![CDATA[
增值版需将离线激活文件放置到程序根目录下,重命名为ArcFacePro.dat
]]>
</Key>
</Dict>
</Dictionaries>
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0"
Name="提供面部识别服务的插件"
SymbolicName="GS.Terminal.FaceRecognization"
Version="3.1.0.0" StartLevel="10">
<License>Rr+1HM0Sq4Bpkvdel43Ls95HlVj7GKdkBGSBnHLi0a2yCUJBWU/GxD/w4mqHu8AT85wxxV7I0WtxRe8S45zlBYRtd4wEZb0PpAtdcCPzpfwP7ozPI6pHfUMqiF7Evvc08Ech7xSDIu1WW8xUMJiThe1xq61Y2xoaNZWMQWyrGhc=</License>
<Activator Type="GS.Terminal.FaceRecognization.Program" />
<Runtime>
<Assembly Path="GS.Terminal.FaceRecognization.dll" Share="true" />
</Runtime>
<Services>
<Service Caption="面部识别服务"
TypeAndName="GS.Terminal.FaceRecognization.Service"></Service>
<Service Caption="面部识别快速识别引擎服务"
TypeAndName="GS.Terminal.FaceRecognization.ArcFace2FastServices"></Service>
</Services>
</Extensibility>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.LogicShell">
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="终端业务界面插件" SymbolicName="GS.Terminal.LogicShell" Version="2.0.1.0" StartLevel="30">
<License>PQypSf3bqcoeawY+ml/JvhDU784Tc+sIPCMDNb/42vS8AoqOxowMaqfLyPjHuJ1XdGb2rZ0YvlwOyKBVlllR1r+8iGq/4HJ7b9QAyoYbmqDF8gixxRk2PrvV9+lY5eepuUtZ3xi09boITUZ31yz6qtVLaei13YFKAnk5Db2YssY=</License>
<Activator Type="GS.Terminal.LogicShell.Activator" />
<Runtime>
<Assembly Path="GS.Terminal.LogicShell.dll" Share="true" />
<Assembly Path="ViewModels/ViewModels.dll" Share="true" />
</Runtime>
<Services>
<Service Caption="试图控制服务" TypeAndName="GS.Terminal.LogicShell.Interface.IViewHelperService"></Service>
</Services>
</Extensibility>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.MainShell">
<Dictionaries>
<Dict Name="WindowAttribute" Caption="窗体属性">
<Key Caption="窗口头部标题" Name="LogoTitle" Value="" Choice=""/>
<Key Caption="高级设置窗口打开延迟(毫秒)" Name="PasswordWindowDelay" Value="3000" Choice="" />
</Dict>
</Dictionaries>
</Settings>
<?xml version="1.0" encoding="utf-8" ?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="主界面" SymbolicName="GS.Terminal.MainShell" Version="2.0.0.0" StartLevel="20">
<License>iLVGuqCCTy+V0cauDJoMTHmmpAGXpbej0ziJivEZX1sq8Qo/WBXJ5WEiWWtxpkkf45wkKUmkNJi8auJi5y5X1VYSP+D15/TROtR85kiQpdZx7IHQXpodt3tjhVnpWNwr9s4TiJrIiQQsV4QKVL+7ysElGccdwgLNOa56vTwyouk=</License>
<Activator Type="GS.Terminal.MainShell.Program" />
<Runtime>
<Assembly Path="GS.Terminal.MainShell.dll" Share="true" />
</Runtime>
<Services>
<Service Caption="跳转服务" TypeAndName="GS.Terminal.MainShell.Services.NavigateService"></Service>
<Service Caption="界面控制服务" TypeAndName="GS.Terminal.MainShell.Services.UIService"></Service>
</Services>
</Extensibility>
\ No newline at end of file
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!--整屏背景图片-->
<Style x:Key="MainShell_BodyBackground" TargetType="Grid">
<Setter Property="Background" Value="Transparent">
</Setter>
</Style>
<!-- 顶部背景颜色-->
<Style x:Key="MainShell_HeaderBackground" TargetType="Grid">
<Setter Property="Background" Value="#00006766"></Setter>
<Setter Property="Height" Value="180"></Setter>
</Style>
<!-- 底部背景颜色-->
<Style x:Key="MainShell_FootBackground" TargetType="Grid">
<Setter Property="Background" Value="#121212"></Setter>
<Setter Property="Height" Value="45"></Setter>
</Style>
<Style x:Key="MainShell_FullBackground" TargetType="Grid">
<Setter Property="Background" >
<Setter.Value>
<ImageBrush ImageSource="images/bg.png"/>
</Setter.Value>
</Setter>
</Style>
<!-- LOGO图片-->
<Style x:Key="MainShell_LogoImage" TargetType="Image">
<Setter Property="Margin" Value="80,60,0,0"></Setter>
<Setter Property="HorizontalAlignment" Value="Left"></Setter>
<Setter Property="VerticalAlignment" Value="Center"></Setter>
<Setter Property="Stretch" Value="None"></Setter>
</Style>
<!-- 系统名称-->
<Style x:Key="MainShell_LogoText" TargetType="TextBlock">
</Style>
<Style x:Key="MainShell_HeadLeft" TargetType="Grid">
<Setter Property="Width" Value="900"/>
</Style>
<Style x:Key="MainShell_HeadRight" TargetType="Grid">
<Setter Property="Grid.Column" Value="1"/>
</Style>
</ResourceDictionary>
\ No newline at end of file
ThemeName=Common
ThemeDescribe=公共资源
MainShellWindowStyle.xaml
ScrollViewStyle.xaml
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.Theme">
<Dictionaries>
<Dict Name="Theme" Caption="默认主题">
<Key Caption="主题名称" Choice="" Name="ThemeName" Value="Default"/>
</Dict>
</Dictionaries>
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="终端皮肤管理插件" SymbolicName="GS.Terminal.Theme" Version="1.0.0.0" StartLevel="10">
<License>
ULuQdHnvhrvUlZmzA5BCjYAK7Qd9kGYtaWzaNyalfGLllQno+WuOpN02bNnqtZBVy0CMsc5vHdGEC2CKn1Oo5d0/h0pezKKRK8pWwWVOkN42Slqjd15Zh/fIcKo6JYLaAWhUs1/NAGXPzLIp5GddHGaEEB9RuicntOi9fUa06YE=
</License>
<Activator Type="GS.Terminal.Theme.AddonActivator"/>
<Runtime>
<Assembly Path="GS.Terminal.Theme.dll" Share="true"/>
</Runtime>
<Services>
<Service Caption="主题管理服务" TypeAndName="GS.Terminal.Theme.Service"></Service>
</Services>
</Extensibility>
\ No newline at end of file
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:gs="clr-namespace:Develop.Extension.Wpf;assembly=Develop.Extension.Wpf"
xmlns:local="clr-namespace:GS.Terminal.VisitorSelfService.Addons.GS.Terminal.Theme.Themes.Default">
<Style x:Key="NoAppointmentContent" TargetType="ContentControl">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ContentControl">
<Border Background="#CC000000" >
<Border Width="860" Height="560"
Padding="60,0,60,0"
Background="White" CornerRadius="10">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="220"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="关注微信公众号预约"
FontSize="60"
HorizontalAlignment="Left" VerticalAlignment="Center"/>
<gs:IconButton Icon="圆圈叉号" FontSize="100"
Command="{Binding CloseCommand}"
HorizontalAlignment="Right" VerticalAlignment="Center"/>
<Image Source="resources/qrcode.png" VerticalAlignment="Top" Grid.Row="1"/>
</Grid>
</Border>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
ThemeName=Default
ThemeDescribe=默认
NoAppointment.xaml
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.VisitorSelfService.Logic">
<Dictionaries>
<Dict Caption="基础配置" Name="defaultconfig">
<Key Caption="人脸识别阀值" Name="FaceMinValue" Value="0.85"/>
<Key Caption="人证比对阀值" Name="FaceCardMatch" Value="0"/>
<Key Caption="心跳端口" Name="HeartPort" Value="18083"/>
<Key Caption="远程认证地址" Name="FaceWebSocket" Value="ws://192.168.1.7:15056/face/sdk2?persontype=访客"/>
</Dict>
<Dict Caption="识别方式配置" Name="authenticationconfig">
<Key Caption="人脸识别" Name="EnableFace" Value="true"/>
<Key Caption="二代证识别" Name="EnableIdCard" Value="false"/>
<Key Caption="二维码识别" Name="EnableQRCode" Value="false"/>
<!--0是人脸识别 1是二代证识别 2是二维码识别-->
<Key Caption="默认识别方式" Name="DefaultAuthMode" Value="1"/>
</Dict>
</Dictionaries>
<Structures>
<Structure Caption="服务地址配置" Name="ServiceList">
<Declare>
<Property Caption="服务描述" Name="Description"/>
<Property Caption="名称(不可随意修改)" Name="Key"/>
<Property Caption="服务地址" Name="ServiceUri"/>
</Declare>
<Datas>
<Data Description="获取人员有效预约单" Key="VisitorAvailableAppointment" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/VisitorAvailableAppointment" />
<Data Description="提交预约单到访" Key="SubmitVisitInfo" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/SubmitVisitInfo" />
<Data Description="获取历史来访记录" Key="GetHistoryVisitInfo" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/GetHistoryVisitInfo/{idnum}" />
<Data Description="获取历史预约单" Key="GetHistoryAppointment" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/GetHistoryAppointment/{idnum}" />
</Datas>
</Structure>
</Structures>
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="访客自助登记系统业务逻辑" SymbolicName="GS.Terminal.VisitorSelfService.Logic" Version="1.0.0.0" StartLevel="999">
<License>
bMEqk/GMwAEgaoWM+BRZPBKAqfD18j1/zZ4Ge4Kb4NZWYzQVVDJ8Mdd/xhcg9xfuEzyIurQj7yjGJ5+vhbTApnZIGJePDWIcUUgdrFYIGysb1IMLe4Khwl/FddIWmUZzNDXARHZaRFP7w2wI6ns1g5+OwcNlgFACKvaSQYhxHU0=
</License>
<Activator Type="GS.Terminal.VisitorSelfService.Logic.Program"/>
<Runtime>
<Assembly Path="GS.Terminal.VisitorSelfService.Logic.dll" Share="true"/>
<Assembly Path="GS.Terminal.VisitorSelfService.LocalDB.dll" Share="true"/>
</Runtime>
<ObjectSpaces>
<Channel ConnectionName="sqlite" ModelAssembly="GS.Terminal.VisitorSelfService.LocalDB" Name="c1"/>
</ObjectSpaces>
<Services>
<!--<Service TypeAndName="GS.Terminal.VisitorSelfService.Logic.AddonService"/>-->
</Services>
</Extensibility>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<DataSpaces xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Encrypt="false" xmlns="urn:Chinags-DataSpaceConfig">
<Connection Name="sqlite" DBType="SQLITE" Database="visitorselfservice.db" User="" Password="123" />
</DataSpaces>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<appSettings>
<add key="ServerIP" value="192.168.1.7"/>
<add key="WebPath" value="http://192.168.1.7:5017/"/>
<add key="tCode" value="SYL106"/>
</appSettings>
</configuration>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0"?>
<!--
*
* System.Data.SQLite.dll.config -
*
* WARNING: This XML configuration file is intended for use within the NuGet
* package directories only. Please do not copy this file to any of
* the build output directories because it could interfere with the
* native library pre-loading feature.
*
* Written by Joe Mistachkin.
* Released to the public domain, use at your own risk!
*
-->
<configuration>
<appSettings>
<add key="PreLoadSQLite_BaseDirectory"
value="%PreLoadSQLite_AssemblyDirectory%\..\..\build\%PreLoadSQLite_TargetFramework%" />
</appSettings>
<dllmap dll="SQLite.Interop" target="SQLite.Interop.dll" />
</configuration>
This diff is collapsed.
This diff is collapsed.
<log4net>
<!-- 调试日志类-->
<logger name="logdebug">
<level value="OFF" />
<appender-ref ref="DebugAppender" />
</logger>
<!-- 错误日志类-->
<logger name="logerror">
<level value="ALL" />
<appender-ref ref="ErrorAppender" />
</logger>
<!-- 信息日志类 -->
<logger name="loginfo">
<level value="ALL" />
<appender-ref ref="InfoAppender" />
</logger>
<!-- 调试日志附加介质-->
<appender name="DebugAppender" type="log4net.Appender.RollingFileAppender">
<param name="File" value="Log\\LogDebug\\" />
<param name="AppendToFile" value="false" />
<param name="MaxFileSize" value="1024" />
<param name="MaxSizeRollBackups" value="3" />
<param name="StaticLogFileName" value="false" />
<param name="DatePattern" value="yyyyMMdd&quot;.htm&quot;" />
<param name="RollingStyle" value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<Encoding value="UTF-8" />
<!-- 信息日志布局-->
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="&lt;HR COLOR=blue&gt;%n日志时间:%d [%t] &lt;BR&gt;%n日志级别:%-5p &lt;BR&gt;%n日 志 类:%c &lt;BR&gt;%n%m &lt;BR&gt;%n &lt;HR Size=1&gt;" />
</layout>
</appender>
<!-- 错误日志附加介质-->
<appender name="ErrorAppender" type="log4net.Appender.RollingFileAppender">
<param name="File" value="Log\\LogError\\" />
<param name="AppendToFile" value="false" />
<param name="MaxSizeRollBackups" value="5" />
<param name="MaxFileSize" value="1024" />
<param name="StaticLogFileName" value="false" />
<param name="DatePattern" value="yyyyMMdd&quot;.htm&quot;" />
<param name="RollingStyle" value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<Encoding value="UTF-8" />
<!--布局-->
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="&lt;HR COLOR=red&gt;%n【异常时间】:%d [%t] &lt;BR&gt;%n【异常级别】:%-5p &lt;BR&gt;%n【异 常 类】:%c &lt;BR&gt;%n%m &lt;BR&gt;%n &lt;HR Size=1&gt;" />
</layout>
</appender>
<!-- 信息日志附加介质-->
<appender name="InfoAppender" type="log4net.Appender.RollingFileAppender">
<param name="File" value="Log\\LogInfo\\" />
<param name="AppendToFile" value="false" />
<param name="MaxFileSize" value="1024" />
<param name="MaxSizeRollBackups" value="3" />
<param name="StaticLogFileName" value="false" />
<param name="DatePattern" value="&quot;Info&quot;yyyyMMdd&quot;.htm&quot;" />
<param name="RollingStyle" value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<Encoding value="UTF-8" />
<!-- 信息日志布局-->
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="&lt;HR COLOR=blue&gt;%n日志时间:%d [%t] &lt;BR&gt;%n日志级别:%-5p &lt;BR&gt;%n日 志 类:%c &lt;BR&gt;%n%m &lt;BR&gt;%n &lt;HR Size=1&gt;" />
</layout>
</appender>
</log4net>
This diff is collapsed.
......@@ -24,27 +24,38 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Publish|Any CPU = Publish|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{68264374-66DC-49E6-9514-565C02ACB072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{68264374-66DC-49E6-9514-565C02ACB072}.Debug|Any CPU.Build.0 = Debug|Any CPU
{68264374-66DC-49E6-9514-565C02ACB072}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{68264374-66DC-49E6-9514-565C02ACB072}.Publish|Any CPU.Build.0 = Publish|Any CPU
{68264374-66DC-49E6-9514-565C02ACB072}.Release|Any CPU.ActiveCfg = Release|Any CPU
{68264374-66DC-49E6-9514-565C02ACB072}.Release|Any CPU.Build.0 = Release|Any CPU
{B8146415-FD96-4F1A-8627-4E90C55D0A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8146415-FD96-4F1A-8627-4E90C55D0A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B8146415-FD96-4F1A-8627-4E90C55D0A1B}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{B8146415-FD96-4F1A-8627-4E90C55D0A1B}.Publish|Any CPU.Build.0 = Debug|Any CPU
{B8146415-FD96-4F1A-8627-4E90C55D0A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B8146415-FD96-4F1A-8627-4E90C55D0A1B}.Release|Any CPU.Build.0 = Release|Any CPU
{D38C35DE-4988-4648-9FB6-73932AB2E178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D38C35DE-4988-4648-9FB6-73932AB2E178}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D38C35DE-4988-4648-9FB6-73932AB2E178}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{D38C35DE-4988-4648-9FB6-73932AB2E178}.Publish|Any CPU.Build.0 = Debug|Any CPU
{D38C35DE-4988-4648-9FB6-73932AB2E178}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D38C35DE-4988-4648-9FB6-73932AB2E178}.Release|Any CPU.Build.0 = Release|Any CPU
{72A63753-479C-4603-B152-1326A9ABF737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72A63753-479C-4603-B152-1326A9ABF737}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72A63753-479C-4603-B152-1326A9ABF737}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{72A63753-479C-4603-B152-1326A9ABF737}.Publish|Any CPU.Build.0 = Debug|Any CPU
{72A63753-479C-4603-B152-1326A9ABF737}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72A63753-479C-4603-B152-1326A9ABF737}.Release|Any CPU.Build.0 = Release|Any CPU
{2D67CE40-81FB-4C5E-AF60-1B0CDAF4BCE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D67CE40-81FB-4C5E-AF60-1B0CDAF4BCE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D67CE40-81FB-4C5E-AF60-1B0CDAF4BCE5}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{2D67CE40-81FB-4C5E-AF60-1B0CDAF4BCE5}.Publish|Any CPU.Build.0 = Debug|Any CPU
{2D67CE40-81FB-4C5E-AF60-1B0CDAF4BCE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D67CE40-81FB-4C5E-AF60-1B0CDAF4BCE5}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
......
......@@ -38,6 +38,15 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Publish|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\Publish\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
......@@ -126,10 +135,6 @@
<Link>Addons\GS.Terminal.Console\GS.Terminal.Console.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\Addons\GS.Terminal.Console\GS.Terminal.Console.pdb">
<Link>Addons\GS.Terminal.Console\GS.Terminal.Console.pdb</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\Addons\GS.Terminal.Console\Mapper.xml">
<Link>Addons\GS.Terminal.Console\Mapper.xml</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
......@@ -142,10 +147,6 @@
<Link>Addons\GS.Terminal.Console\Terminal.Common.Structs.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\Addons\GS.Terminal.Console\Terminal.Common.Structs.pdb">
<Link>Addons\GS.Terminal.Console\Terminal.Common.Structs.pdb</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\Addons\GS.Terminal.Console\WebSocket4Net.dll">
<Link>Addons\GS.Terminal.Console\WebSocket4Net.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
......
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("GS.Terminal.VisitorSelfService")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyCopyright("Copyright © 青岛通软网络科技有限公司 2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......
......@@ -18,7 +18,7 @@ namespace GS.Terminal.VisitorSelfService.Logic
internal static IAddonContext _Context;
internal static IObjectSpace _ObjectSpace;
internal static Locator vmLocator;
internal static string _logicVersion = "0730";
internal static string _logicVersion = "0528";
public void Start(IAddonContext Context)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment