Skip to content

Commit 45d39d3

Browse files
siteserverekunsiteserverekun
committed
ekun008
1 parent 5c26c03 commit 45d39d3

1 file changed

Lines changed: 2 additions & 16 deletions

File tree

‎source/SiteServer.Web/Web.config‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,10 @@
22
<configuration>
33
<appSettings>
44
<add key="PageInspector:ServerCodeMappingSupport" value="Disabled" />
5-
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
6-
<<<<<<< HEAD
5+
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
76
<add key="IsProtectData" value="False" />
87
<add key="DatabaseType" value="SqlServer" />
9-
<add key="ConnectionString" value="server=(local);uid=sa;pwd=ekun008;database=cms5.0" />
10-
=======
11-
12-
13-
<add key="IsProtectData" value="False" />
14-
<add key="AdminDirectory" value="SiteServer" />
15-
<add key="SecretKey" value="vEnfkn16t8aeaZKG3a4Gl9UUlzf4vgqU9xwh8ZV5" />
16-
17-
<!-- <add key="DatabaseType" value="MySql" />
18-
<add key="ConnectionString" value="server=localhost;uid=root;pwd=root;database=test3" />-->
19-
20-
<add key="DatabaseType" value="SqlServer" />
21-
<add key="ConnectionString" value="server=(local);uid=sa;pwd=ekun008;database=cms5.0;" />
22-
>>>>>>> upstream/dev
8+
<add key="ConnectionString" value="server=(local);uid=sa;pwd=ekun008;database=cms5.1" />
239
</appSettings>
2410
<system.web>
2511
<httpRuntime targetFramework="4.5" requestValidationMode="2.0" requestPathInvalidCharacters="" maxRequestLength="40960" executionTimeout="2000" useFullyQualifiedRedirectUrl="false" minFreeThreads="8" minLocalRequestFreeThreads="4" appRequestQueueLimit="100" enableVersionHeader="false" />

0 commit comments

Comments
 (0)