Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8-25 merge #4

Merged
merged 77 commits into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
编译方式采用x64位,之前是anycpu
  • Loading branch information
weishakeji committed Jul 7, 2020
commit 195553d15c0077b99da5f2e4b105172b5fb42e27
4 changes: 3 additions & 1 deletion LearningSystem.sln
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ Global
{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
Expand All @@ -206,6 +207,7 @@ Global
{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
Expand All @@ -228,7 +230,7 @@ Global
{41D99603-4C27-4075-81D5-F56C553ACDC8} = {9E1AA0BC-6525-4FBD-940A-93AEF86188FB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
VisualSVNWorkingCopyRoot = .
SolutionGuid = {2C42F976-5DC7-4525-AD51-50BB9419A0D5}
VisualSVNWorkingCopyRoot = .
EndGlobalSection
EndGlobal
Binary file modified Lib/WeiSha.Common.dll
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 modified Lib/WeiSha.License.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.
3 changes: 2 additions & 1 deletion Song.Site/Song.Site.csproj.user
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
<Project ToolsVersion="4.0" xmlns="https://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
Expand Down
2 changes: 1 addition & 1 deletion Song.Template/Song.Template.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x64</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Expand Down
1 change: 1 addition & 0 deletions Song.ViewData/Song.ViewData.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\Song.ViewData.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand Down