Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
ef9e24f
修正:视频留言刷新频率
weishakeji May 15, 2020
a7877a3
修正:api接口字符串采用url编码输出
weishakeji May 18, 2020
190ebce
优化:Viewdata中的方法,如果get可以加cache;如果是post,则清除缓存
weishakeji May 27, 2020
9e6f2de
修正:教师组的默认组设置问题
weishakeji May 28, 2020
22e6461
修正:在后台编辑章节时,同步刷新缓存
weishakeji May 28, 2020
3042b7e
优化:章节管理中增加与前台一致的序号
weishakeji May 28, 2020
e19faba
修正:章节相关信息的缓存刷新
weishakeji May 28, 2020
de5a9f7
重构学习证明打印(批量打印)
weishakeji May 31, 2020
8705568
重构学习证明打印(批量打印)
weishakeji Jun 1, 2020
b4e5562
完成批量打印学习证明的重构
weishakeji Jun 2, 2020
da1c823
完成批量打印学习证明的重构
weishakeji Jun 2, 2020
7f51a23
缓存名称增加类名,之前只有方法名,导致数据获取异常
weishakeji Jun 2, 2020
4e36ace
修正细节
weishakeji Jun 2, 2020
499c349
修订细节
weishakeji Jun 3, 2020
71f71e0
修订细节
weishakeji Jun 3, 2020
0712fe7
修订细节
weishakeji Jun 3, 2020
b29d523
Update README.md
weishakeji Jun 3, 2020
6410e26
Update README.md
weishakeji Jun 3, 2020
54af1dc
Update README.md
weishakeji Jun 3, 2020
9fb0f4a
Update README.md
weishakeji Jun 3, 2020
e21a0e4
Update README.md
weishakeji Jun 3, 2020
79deef7
Update README.md
weishakeji Jun 3, 2020
144771f
Update README.md
weishakeji Jun 3, 2020
5a9d66b
Update README.md
weishakeji Jun 3, 2020
42548e5
Update README.md
weishakeji Jun 3, 2020
824469f
Update README.md
weishakeji Jun 3, 2020
4cc83fa
Update README.md
weishakeji Jun 3, 2020
2bc7d59
Update README.md
weishakeji Jun 3, 2020
2f2c5fd
Update README.md
weishakeji Jun 3, 2020
dcfaa06
Update README.md
weishakeji Jun 3, 2020
fe28f0f
Update README.md
weishakeji Jun 3, 2020
4b9339f
Update README.md
weishakeji Jun 3, 2020
9617e60
Update README.md
weishakeji Jun 3, 2020
bdfb5a2
Update README.md
weishakeji Jun 3, 2020
33d3a0d
Update README.md
weishakeji Jun 3, 2020
9379c77
Update README.md
weishakeji Jun 3, 2020
18235fa
Update README.md
weishakeji Jun 3, 2020
821b3ae
修正:课程过期后,无法打印学习证明的问题
weishakeji Jun 3, 2020
19fa469
修订:学员学习证明打印
weishakeji Jun 4, 2020
1191275
修正:视频学习当前章节加载问题
weishakeji Jun 4, 2020
08c58de
api.js增加实体对象的参数提交
weishakeji Jun 15, 2020
6cb75ce
修正:系统菜单编辑的乱码问题
weishakeji Jun 15, 2020
367c930
升级开发工具到vs20019
weishakeji Jun 29, 2020
123c0e4
修订说明信息
weishakeji Jul 7, 2020
d6067d4
升级.net framework到4.6
weishakeji Jul 7, 2020
a92b4f0
修正:学员证明打印时的二维码失效问题
weishakeji Jul 7, 2020
663e7e3
优化:学习卡管理界面,增加学习卡激活时间
weishakeji Jul 7, 2020
195553d
编译方式采用x64位,之前是anycpu
weishakeji Jul 7, 2020
c8ea18e
编译方式仍改用anycpu
weishakeji Jul 9, 2020
d545dd5
修正:去除前端课程附件的缓存,因为涉及购买状态判断
weishakeji Jul 9, 2020
fe35f51
修正:授权信息
weishakeji Jul 9, 2020
b541600
修正:章节数据返回增加异常信息提示
weishakeji Jul 10, 2020
32b6284
优化:如果课程未购买,仅试学状态下,附件资料不允许下载(但可以查看资料列表)
weishakeji Jul 10, 2020
84777d6
修正:手机端课程学习留言问题
weishakeji Jul 10, 2020
8864ec3
修正:学员打印学习证明时,选择指定课程无效的问题
weishakeji Jul 11, 2020
717f418
修正:当视频事件弹出状态下,窗体重获焦点,视频继续播放的问题
weishakeji Jul 12, 2020
9bb6e67
修正:窗体大小变化时,视频播放控制
weishakeji Jul 12, 2020
951cf94
修正:msg.js关闭时遮罩层未取消
weishakeji Jul 12, 2020
7030fec
升级直播dll动态链接库
weishakeji Jul 12, 2020
bafef6d
修正:手机端课程购买时充值返回问题
weishakeji Jul 12, 2020
93a5b46
删除
weishakeji Jul 13, 2020
0487038
修正:课程限制桌面应用中打开的功能
weishakeji Jul 17, 2020
173518f
修正:学习证明扫码后没有按指定课程输出
weishakeji Jul 21, 2020
3c9ab56
修正:学员卡券列表显示所有学员的问题
weishakeji Jul 22, 2020
8fed1d3
修正:学员学习进度显示不统一的问题
weishakeji Jul 23, 2020
66a4197
优化:增加学习完成度的容差值
weishakeji Jul 23, 2020
42fbc38
修正:学习证明打印中的完成度代码
weishakeji Jul 23, 2020
06394e3
修正:课程章节学习进度的容差控制
weishakeji Jul 23, 2020
b021ac7
修正:设置学习完成度容差值
weishakeji Jul 24, 2020
5f74d64
优化:增加浏览器切换时视频正常播放的设置项(机构设置和学员组设置)
weishakeji Jul 24, 2020
de4d9a6
修正:学员未登录状态下,浏览器窗体失去焦点的参数获取错误的问题
weishakeji Jul 27, 2020
2b1be69
修正:留言信息乱码问题
weishakeji Jul 28, 2020
0012ca7
修正:ViewData接口在接收Letter参数时被跳过,导致直播设置失败
weishakeji Jul 28, 2020
ece470c
修正:版本号
weishakeji Jul 28, 2020
1b3822f
新增:数据库升级脚本
weishakeji Jul 28, 2020
2202dae
更新:数据库脚本
weishakeji Jul 28, 2020
8ca2fc6
修正:升级脚本编码改成ANSI
weishakeji Jul 31, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions LearningSystem.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30204.135
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BLL", "BLL", "{33D53385-4C49-4E66-8404-B2C2E169D5E0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4F7FBC48-34CE-428C-B4AD-6A10E7646985}"
Expand All @@ -10,16 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utility", "Utility", "{9E1AA0BC-6525-4FBD-940A-93AEF86188FB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.Entities", "Song.Entities\Song.Entities.csproj", "{985A8268-3A87-46B9-9744-650664719E67}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.ServiceImpls", "Song.ServiceImpls\Song.ServiceImpls.csproj", "{378EF4E2-4ED6-4ED7-89E8-6B40B001E952}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.ServiceInterfaces", "Song.ServiceInterfaces\Song.ServiceInterfaces.csproj", "{7CFB4DC1-8536-44A4-AF1D-2D7BDA8067C1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.Extend", "Song.Extend\Song.Extend.csproj", "{ED063AD3-3B5F-426F-8D6D-5417FF317FFB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.Site", "Song.Site\Song.Site.csproj", "{80FABE19-32B7-4FB3-AE8E-42E0447A9189}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{FDA0AAE6-47E9-4421-9C21-ED4B5C4A9BD0}"
ProjectSection(SolutionItems) = preProject
Lib\Common.Logging.dll = Lib\Common.Logging.dll
Expand Down Expand Up @@ -51,6 +43,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{FDA0AAE6-47E
Lib\WeiSha.WebEditor.XML = Lib\WeiSha.WebEditor.XML
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.Entities", "Song.Entities\Song.Entities.csproj", "{985A8268-3A87-46B9-9744-650664719E67}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.ServiceImpls", "Song.ServiceImpls\Song.ServiceImpls.csproj", "{378EF4E2-4ED6-4ED7-89E8-6B40B001E952}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.ServiceInterfaces", "Song.ServiceInterfaces\Song.ServiceInterfaces.csproj", "{7CFB4DC1-8536-44A4-AF1D-2D7BDA8067C1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.Extend", "Song.Extend\Song.Extend.csproj", "{ED063AD3-3B5F-426F-8D6D-5417FF317FFB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.Site", "Song.Site\Song.Site.csproj", "{80FABE19-32B7-4FB3-AE8E-42E0447A9189}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.Template", "Song.Template\Song.Template.csproj", "{739180BB-2529-485F-867F-28774EB2ACC9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Song.ViewData", "Song.ViewData\Song.ViewData.csproj", "{41D99603-4C27-4075-81D5-F56C553ACDC8}"
Expand Down Expand Up @@ -183,49 +185,56 @@ Global
{80FABE19-32B7-4FB3-AE8E-42E0447A9189}.x64 Debug|x86.Build.0 = Debug|x86
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug x64|Any CPU.ActiveCfg = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug x64|Any CPU.Build.0 = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug x64|x64.ActiveCfg = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug x64|x64.ActiveCfg = Debug|x64
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug x64|x64.Build.0 = Debug|x64
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug x64|x86.ActiveCfg = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug|x64.ActiveCfg = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug|x64.Build.0 = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Debug|x86.ActiveCfg = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Release|Any CPU.Build.0 = Release|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Release|x64.ActiveCfg = Release|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.Release|x86.ActiveCfg = Release|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.x64 Debug|Any CPU.ActiveCfg = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.x64 Debug|Any CPU.Build.0 = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.x64 Debug|x64.ActiveCfg = Debug|Any CPU
{739180BB-2529-485F-867F-28774EB2ACC9}.x64 Debug|x64.ActiveCfg = Debug|x64
{739180BB-2529-485F-867F-28774EB2ACC9}.x64 Debug|x64.Build.0 = Debug|x64
{739180BB-2529-485F-867F-28774EB2ACC9}.x64 Debug|x86.ActiveCfg = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug x64|Any CPU.ActiveCfg = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug x64|Any CPU.Build.0 = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug x64|x64.ActiveCfg = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug x64|x64.ActiveCfg = Debug|x64
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug x64|x64.Build.0 = Debug|x64
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug x64|x86.ActiveCfg = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug|x64.ActiveCfg = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug|x64.Build.0 = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Debug|x86.ActiveCfg = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Release|Any CPU.Build.0 = Release|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Release|x64.ActiveCfg = Release|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.Release|x86.ActiveCfg = Release|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.x64 Debug|Any CPU.ActiveCfg = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.x64 Debug|Any CPU.Build.0 = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.x64 Debug|x64.ActiveCfg = Debug|Any CPU
{41D99603-4C27-4075-81D5-F56C553ACDC8}.x64 Debug|x64.ActiveCfg = Debug|x64
{41D99603-4C27-4075-81D5-F56C553ACDC8}.x64 Debug|x64.Build.0 = Debug|x64
{41D99603-4C27-4075-81D5-F56C553ACDC8}.x64 Debug|x86.ActiveCfg = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{985A8268-3A87-46B9-9744-650664719E67} = {9E1AA0BC-6525-4FBD-940A-93AEF86188FB}
{378EF4E2-4ED6-4ED7-89E8-6B40B001E952} = {33D53385-4C49-4E66-8404-B2C2E169D5E0}
{7CFB4DC1-8536-44A4-AF1D-2D7BDA8067C1} = {33D53385-4C49-4E66-8404-B2C2E169D5E0}
{985A8268-3A87-46B9-9744-650664719E67} = {9E1AA0BC-6525-4FBD-940A-93AEF86188FB}
{ED063AD3-3B5F-426F-8D6D-5417FF317FFB} = {9E1AA0BC-6525-4FBD-940A-93AEF86188FB}
{739180BB-2529-485F-867F-28774EB2ACC9} = {9E1AA0BC-6525-4FBD-940A-93AEF86188FB}
{41D99603-4C27-4075-81D5-F56C553ACDC8} = {9E1AA0BC-6525-4FBD-940A-93AEF86188FB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
VisualSVNWorkingCopyRoot = .
SolutionGuid = {2C42F976-5DC7-4525-AD51-50BB9419A0D5}
EndGlobalSection
EndGlobal
Binary file modified Lib/WeiSha.Common.dll
Binary file not shown.
Binary file modified Lib/WeiSha.Data.Generete.exe
Binary file not shown.
Binary file modified Lib/WeiSha.Data.dll
Binary file not shown.
Binary file modified Lib/WeiSha.Email.dll
Binary file not shown.
Binary file added Lib/WeiSha.License.dll
Binary file not shown.
Binary file modified Lib/WeiSha.SMS.XmlSerializers.dll
Binary file not shown.
Binary file modified Lib/WeiSha.SMS.dll
Binary file not shown.
Binary file modified Lib/WeiSha.Template.Engine.dll
Binary file not shown.
Binary file modified Lib/WeiSha.WebControl.dll
Binary file not shown.
Binary file modified Lib/WeiSha.WebEditor.dll
Binary file not shown.
Binary file modified Lib/pili-sdk-csharp.dll
Binary file not shown.
39 changes: 25 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,31 @@

>适用行业:企业培训、教育机构、高等教育、基础教育

<b>开发环境:</b>
* 1、采用C#;基于.Net 4.0
* 2、数据库采用Sqlserver2005或更高版本
* 3、开发工具是Microsoft Visual Studio 2010
## 产品特点:
* 可私有化部署,对接支付宝支付、微信支付,收益全掌控;
* 多终端支持,电脑、手机、微信、APP、微信小程序,全都有;
* 永久授权,一次购买,终身使用;<a href="http://www.weishakeji.net/price.html" target="_blank" size=12> [ 购买商业授权 ] </a>

<b>升级日志:</b>
## 功能介绍:
* 视频教学,直播、录播
> “直播”可以在线互动,“录播”可以时实记录学习进度

* 试题同步练习
> 支持批量导入,手机随时随地刷题,时实记录练习成果和进度

* 在线考试
> 千人同考,断电、死机不丢题

* 分享、分润、分销
> 学员分享,多级裂变,运营、推广不再难

## 开发环境:
* 采用C#;基于.Net 4.6 <a href="https://www.microsoft.com/zh-CN/download/details.aspx?id=53344" target="_blank" size=12>[下载]</a>
* 数据库采用Sqlserver2008或更高版本
* 开发工具 Microsoft Visual Studio Community 2019

## 升级日志:
<a href="http://www.weishakeji.net/download.html" target="_blank">http://www.weishakeji.net/download.html</a>

![Alt text](https://github.com/weishakeji/LearningSystem/blob/master/Song.Site/Utility/Taobao/2018_07.png?raw=true)
![Alt text](https://github.com/weishakeji/LearningSystem/blob/master/Song.Site/Utility/Taobao/2018_08.png?raw=true)
![Alt text](https://github.com/weishakeji/LearningSystem/blob/master/Song.Site/Utility/Taobao/2018_09.png?raw=true)
![Alt text](https://github.com/weishakeji/LearningSystem/blob/master/Song.Site/Utility/Taobao/2018_10.png?raw=true)
![Alt text](https://github.com/weishakeji/LearningSystem/blob/master/Song.Site/Utility/Taobao/2018_11.png?raw=true)
![Alt text](https://github.com/weishakeji/LearningSystem/blob/master/Song.Site/Utility/Taobao/2018_12.png?raw=true)
![Alt text](https://github.com/weishakeji/LearningSystem/blob/master/Song.Site/Utility/Taobao/2018_13.png?raw=true)
![Alt text](https://github.com/weishakeji/LearningSystem/blob/master/Song.Site/Utility/Taobao/2018_14.png?raw=true)
![Alt text](https://github.com/weishakeji/LearningSystem/blob/master/Song.Site/Utility/Taobao/2018_15.png?raw=true)
## 开发交流:
>QQ交流群:10237400
10 changes: 8 additions & 2 deletions Song.Entities/Song.Entities.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -18,7 +18,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
Expand Down Expand Up @@ -49,6 +49,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -58,6 +59,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -73,6 +75,7 @@
<CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
Expand All @@ -89,6 +92,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -105,6 +109,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
Expand All @@ -119,6 +124,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
27 changes: 24 additions & 3 deletions Song.Entities/StudentSort.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public partial class StudentSort : WeiSha.Data.Entity {

protected Int32 _Dep_Id;

protected Boolean _Sts_SwitchPlay;

public Int32 Sts_ID {
get {
return this._Sts_ID;
Expand Down Expand Up @@ -128,6 +130,16 @@ public Int32 Dep_Id {
}
}

public Boolean Sts_SwitchPlay {
get {
return this._Sts_SwitchPlay;
}
set {
this.OnPropertyValueChange(_.Sts_SwitchPlay, _Sts_SwitchPlay, value);
this._Sts_SwitchPlay = value;
}
}

/// <summary>
/// 获取实体对应的表名
/// </summary>
Expand Down Expand Up @@ -164,7 +176,8 @@ protected override WeiSha.Data.Field[] GetFields() {
_.Org_ID,
_.Org_Name,
_.Dep_CnName,
_.Dep_Id};
_.Dep_Id,
_.Sts_SwitchPlay};
}

/// <summary>
Expand All @@ -181,7 +194,8 @@ protected override object[] GetValues() {
this._Org_ID,
this._Org_Name,
this._Dep_CnName,
this._Dep_Id};
this._Dep_Id,
this._Sts_SwitchPlay};
}

/// <summary>
Expand Down Expand Up @@ -218,6 +232,9 @@ protected override void SetValues(WeiSha.Data.IRowReader reader) {
if ((false == reader.IsDBNull(_.Dep_Id))) {
this._Dep_Id = reader.GetInt32(_.Dep_Id);
}
if ((false == reader.IsDBNull(_.Sts_SwitchPlay))) {
this._Sts_SwitchPlay = reader.GetBoolean(_.Sts_SwitchPlay);
}
}

public override int GetHashCode() {
Expand Down Expand Up @@ -293,7 +310,11 @@ public class _ {
/// 字段名:Dep_Id - 数据类型:Int32
/// </summary>
public static WeiSha.Data.Field Dep_Id = new WeiSha.Data.Field<StudentSort>("Dep_Id");

/// <summary>
/// 字段名:Sts_SwitchPlay - 数据类型:Boolean
/// </summary>
public static WeiSha.Data.Field Sts_SwitchPlay = new WeiSha.Data.Field<StudentSort>("Sts_SwitchPlay");
}
}
}

10 changes: 8 additions & 2 deletions Song.Extend/Song.Extend.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -18,7 +18,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
Expand Down Expand Up @@ -49,6 +49,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -58,6 +59,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -74,6 +76,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
Expand All @@ -90,6 +93,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -104,6 +108,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
Expand All @@ -118,6 +123,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib">
Expand Down
2 changes: 1 addition & 1 deletion Song.ServiceImpls/CourseCom.cs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ public bool IsBuy(int couid, int stid)
/// 学员购买的该课程
/// </summary>
/// <param name="stid">学员Id</param>
/// <param name="sear">用于检索的字符</param>
/// <param name="sear">用于检索课程的字符</param>
/// <param name="state">0不管是否过期,1必须是购买时效内的,2必须是购买时效外的</param>
/// <returns></returns>
public List<Course> CourseForStudent(int stid, string sear, int state, bool? istry, int count)
Expand Down
2 changes: 1 addition & 1 deletion Song.ServiceImpls/OutlineCom.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public void OutlineSave(Outline entity)
}
catch (Exception ex)
{
throw new Exception("直播流创建失败," + ex.Message);
//throw new Exception("直播流创建失败," + ex.Message);
}
if (stream != null) entity.Ol_LiveID = stream.Title;
}
Expand Down
Loading