liyuanyuan лет назад: 2
Родитель
Сommit
e7486f366d

+ 4 - 6
CallCenterApi/CallCenterAPI.WechatSDK/CallCenterAPI.WechatSDK.csproj

@@ -31,13 +31,11 @@
31 31
     <WarningLevel>4</WarningLevel>
32 32
   </PropertyGroup>
33 33
   <ItemGroup>
34
-    <Reference Include="Senparc.Weixin, Version=4.12.3.31913, Culture=neutral, processorArchitecture=MSIL">
35
-      <SpecificVersion>False</SpecificVersion>
36
-      <HintPath>Lib\Senparc.Weixin.dll</HintPath>
34
+    <Reference Include="Senparc.Weixin">
35
+      <HintPath>..\..\packages\Senparc.Weixin.6.1.5\lib\net45\Senparc.Weixin.dll</HintPath>
37 36
     </Reference>
38
-    <Reference Include="Senparc.Weixin.MP, Version=14.4.12.16532, Culture=neutral, processorArchitecture=MSIL">
39
-      <SpecificVersion>False</SpecificVersion>
40
-      <HintPath>Lib\Senparc.Weixin.MP.dll</HintPath>
37
+    <Reference Include="Senparc.Weixin.MP">
38
+      <HintPath>..\CallCenterApi.Interface\CallCenterApi.Interface\Lib\Senparc.Weixin.MP.dll</HintPath>
41 39
     </Reference>
42 40
     <Reference Include="System" />
43 41
     <Reference Include="System.Core" />

+ 11 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -55,7 +55,7 @@
55 55
     </Reference>
56 56
     <Reference Include="LumiSoft.Net, Version=2.0.4825.14012, Culture=neutral, processorArchitecture=MSIL">
57 57
       <SpecificVersion>False</SpecificVersion>
58
-      <HintPath>..\..\..\packages\LumiSoft.Net.dll</HintPath>
58
+      <HintPath>Lib\LumiSoft.Net.dll</HintPath>
59 59
     </Reference>
60 60
     <Reference Include="Microsoft.AI.Agent.Intercept, Version=2.0.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61 61
       <HintPath>..\..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.0.6\lib\net45\Microsoft.AI.Agent.Intercept.dll</HintPath>
@@ -90,12 +90,18 @@
90 90
       <Private>True</Private>
91 91
     </Reference>
92 92
     <Reference Include="Microsoft.CSharp" />
93
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
94
-      <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
93
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
94
+      <HintPath>..\..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
95 95
     </Reference>
96 96
     <Reference Include="qcloudsms_csharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
97 97
       <HintPath>..\..\..\packages\qcloud.qcloudsms_csharp.0.1.6\lib\net40\qcloudsms_csharp.dll</HintPath>
98 98
     </Reference>
99
+    <Reference Include="Senparc.CO2NET, Version=0.2.14.0, Culture=neutral, processorArchitecture=MSIL">
100
+      <HintPath>..\..\..\packages\Senparc.CO2NET.0.2.14\lib\net45\Senparc.CO2NET.dll</HintPath>
101
+    </Reference>
102
+    <Reference Include="Senparc.NeuChar, Version=0.2.7.0, Culture=neutral, processorArchitecture=MSIL">
103
+      <HintPath>..\..\..\packages\Senparc.NeuChar.0.2.7\lib\net45\Senparc.NeuChar.dll</HintPath>
104
+    </Reference>
99 105
     <Reference Include="Senparc.Weixin, Version=4.12.3.31913, Culture=neutral, processorArchitecture=MSIL">
100 106
       <SpecificVersion>False</SpecificVersion>
101 107
       <HintPath>Lib\Senparc.Weixin.dll</HintPath>
@@ -109,6 +115,7 @@
109 115
     <Reference Include="System.Net" />
110 116
     <Reference Include="System.Net.Http" />
111 117
     <Reference Include="System.Net.Http.WebRequest" />
118
+    <Reference Include="System.Runtime.Serialization" />
112 119
     <Reference Include="System.Transactions" />
113 120
     <Reference Include="System.Web.DynamicData" />
114 121
     <Reference Include="System.Web.Entity" />
@@ -131,7 +138,7 @@
131 138
     <Reference Include="System.Xml.Linq" />
132 139
     <Reference Include="TopSdk, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
133 140
       <SpecificVersion>False</SpecificVersion>
134
-      <HintPath>bin\TopSdk.dll</HintPath>
141
+      <HintPath>Lib\TopSdk.dll</HintPath>
135 142
     </Reference>
136 143
   </ItemGroup>
137 144
   <ItemGroup>

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Properties/PublishProfiles/bb.pubxml

@@ -11,7 +11,7 @@
11 11
     <SiteUrlToLaunchAfterPublish />
12 12
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
13 13
     <ExcludeApp_Data>False</ExcludeApp_Data>
14
-    <publishUrl>D:\项目\巩义12345\websitenew</publishUrl>
14
+    <publishUrl>D:\gongyi</publishUrl>
15 15
     <DeleteExistingFiles>True</DeleteExistingFiles>
16 16
   </PropertyGroup>
17 17
 </Project>

+ 57 - 32
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -1,4 +1,4 @@
1
-<?xml version="1.0"?>
1
+<?xml version="1.0" encoding="utf-8"?>
2 2
 <!--
3 3
   For more information on how to configure your ASP.NET application, please visit
4 4
   http://go.microsoft.com/fwlink/?LinkId=301880
@@ -6,25 +6,27 @@
6 6
 <configuration>
7 7
   <configSections>
8 8
     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
9
-      <section name="CallCenterApi.Interface.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
9
+      <section name="CallCenterApi.Interface.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
10 10
     </sectionGroup>
11 11
   </configSections>
12 12
   <appSettings>
13
-    <add key="webpages:Version" value="3.0.0.0"/>
14
-    <add key="webpages:Enabled" value="false"/>
15
-    <add key="ClientValidationEnabled" value="true"/>
16
-    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
17
-    <add key="DESKey" value="123456789"/>
13
+    <add key="webpages:Version" value="3.0.0.0" />
14
+    <add key="webpages:Enabled" value="false" />
15
+    <add key="ClientValidationEnabled" value="true" />
16
+    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
17
+    <add key="DESKey" value="123456789" />
18 18
     <!--中鑫之宝短信配置-->
19
-    <add key="smsurl" value="http://api.1086sms.com/api/"/>
20
-    <add key="smsusername" value="zxzb"/>
21
-    <add key="smspassword" value="zxzb123"/>
22
-    <add key="smssign" value="中鑫之宝"/>
19
+    <add key="smsurl" value="http://api.1086sms.com/api/" />
20
+    <add key="smsusername" value="zxzb" />
21
+    <add key="smspassword" value="zxzb123" />
22
+    <add key="smssign" value="中鑫之宝" />
23 23
   </appSettings>
24 24
   <connectionStrings>
25 25
     <!--<add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=SQ12345;"/>-->
26 26
     <!--<add name="ConnectionString" connectionString="Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=SQ12345;"/>-->
27
-    <add name="ConnectionString" connectionString="Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=Gongyi_12345;"/>
27
+    <add name="ConnectionString" connectionString="Data Source=192.168.1.36;User ID=sa;pwd=hykj800100;Initial Catalog=Gongyiyq_12345;" />
28
+
29
+
28 30
   </connectionStrings>
29 31
   <!--
30 32
     有关 web.config 更改的说明,请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@@ -37,58 +39,81 @@
37 39
 
38 40
     <runtime>
39 41
       <AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
42
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
43
+            <dependentAssembly>
44
+                <assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral" />
45
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
46
+            </dependentAssembly>
47
+            <dependentAssembly>
48
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
49
+                <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
50
+            </dependentAssembly>
51
+            <dependentAssembly>
52
+                <assemblyIdentity name="SuperSocket.SocketBase" publicKeyToken="6c80000676988ebb" culture="neutral" />
53
+                <bindingRedirect oldVersion="0.0.0.0-1.6.0.4" newVersion="1.6.0.4" />
54
+            </dependentAssembly>
55
+            <dependentAssembly>
56
+                <assemblyIdentity name="SuperSocket.Common" publicKeyToken="6c80000676988ebb" culture="neutral" />
57
+                <bindingRedirect oldVersion="0.0.0.0-1.6.0.4" newVersion="1.6.0.4" />
58
+            </dependentAssembly>
59
+            <dependentAssembly>
60
+                <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
61
+                <bindingRedirect oldVersion="0.0.0.0-2.0.7.0" newVersion="2.0.7.0" />
62
+            </dependentAssembly>
63
+        </assemblyBinding>
64
+
40 65
     </runtime>
41 66
  
42 67
   <system.web>
43
-    <compilation debug="true" targetFramework="4.6.1"/>
44
-    <httpRuntime maxRequestLength="20971520" executionTimeout="3600"/>
68
+    <compilation debug="true" targetFramework="4.5" />
69
+    <httpRuntime maxRequestLength="20971520" executionTimeout="3600" />
45 70
     <httpModules>
46
-      <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"/>
71
+      <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
47 72
     </httpModules>
48 73
     <authentication>
49
-      <forms name=".MyCookie" cookieless="UseCookies" loginUrl="/Login/login" protection="All" timeout="60"/>
74
+      <forms name=".MyCookie" cookieless="UseCookies" loginUrl="/Login/login" protection="All" timeout="60" />
50 75
     </authentication>
51
-    <pages controlRenderingCompatibilityVersion="4.0"/>
76
+    <pages controlRenderingCompatibilityVersion="4.0" />
52 77
   </system.web>
53 78
   <runtime>
54 79
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55 80
       <dependentAssembly>
56
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
57
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
81
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
82
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
58 83
       </dependentAssembly>
59 84
       <dependentAssembly>
60
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
61
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
85
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
86
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
62 87
       </dependentAssembly>
63 88
       <dependentAssembly>
64
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
65
-        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
89
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
90
+        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
66 91
       </dependentAssembly>
67 92
     </assemblyBinding>
68 93
   </runtime>
69 94
   <system.codedom>
70 95
     <compilers>
71
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
72
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
96
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
97
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
73 98
     </compilers>
74 99
   </system.codedom>
75 100
   <system.webServer>
76 101
     <staticContent>
77
-      <mimeMap fileExtension=".apk" mimeType="application/vnd.android.package-archive"/>
102
+      <mimeMap fileExtension=".apk" mimeType="application/vnd.android.package-archive" />
78 103
     </staticContent>
79 104
     <!--cors 支持跨域 clq新增 strat-->
80 105
     <httpProtocol>
81 106
       <customHeaders>
82
-        <add name="Access-Control-Allow-Origin" value="*"/>
83
-        <add name="Access-Control-Allow-Headers" value="Content-Type"/>
84
-        <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS"/>
107
+        <add name="Access-Control-Allow-Origin" value="*" />
108
+        <add name="Access-Control-Allow-Headers" value="Content-Type" />
109
+        <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" />
85 110
       </customHeaders>
86 111
     </httpProtocol>
87 112
     <!--cors 支持跨域 end-->
88
-    <validation validateIntegratedModeConfiguration="false"/>
113
+    <validation validateIntegratedModeConfiguration="false" />
89 114
     <modules>
90
-      <remove name="ApplicationInsightsWebTracking"/>
91
-      <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" preCondition="managedHandler"/>
115
+      <remove name="ApplicationInsightsWebTracking" />
116
+      <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" preCondition="managedHandler" />
92 117
     </modules>
93 118
   </system.webServer>
94 119
   <applicationSettings>

+ 7 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/packages.config

@@ -2,6 +2,7 @@
2 2
 <packages>
3 3
   <package id="Flurl" version="2.8.2" targetFramework="net45" />
4 4
   <package id="log4net" version="2.0.8" targetFramework="net45" />
5
+  <package id="LumiSoft.Net" version="2.0.4492.11923" targetFramework="net461" />
5 6
   <package id="Microsoft.ApplicationInsights" version="2.2.0" targetFramework="net45" />
6 7
   <package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.0.6" targetFramework="net45" />
7 8
   <package id="Microsoft.ApplicationInsights.DependencyCollector" version="2.2.0" targetFramework="net45" />
@@ -19,7 +20,12 @@
19 20
   <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
20 21
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
21 22
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
22
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
23
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
23 24
   <package id="qcloud.qcloudsms_csharp" version="0.1.6" targetFramework="net45" />
25
+  <package id="Senparc.CO2NET" version="0.2.14" targetFramework="net461" />
26
+  <package id="Senparc.NeuChar" version="0.2.7" targetFramework="net461" />
27
+  <package id="Senparc.Weixin" version="6.1.5" targetFramework="net461" />
28
+  <package id="Senparc.Weixin.MP" version="15.3.0" targetFramework="net461" />
24 29
   <package id="System.Net.Http" version="2.0.20710.0" targetFramework="net45" />
30
+  <package id="TopSdk" version="1.0.70603.2" targetFramework="net461" />
25 31
 </packages>