Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of D:\播智教育\2020\benyi with conflicts.

Browse Source
This commit is contained in:
sk1551 2021-01-30 09:04:39 +08:00
parent bccd850ae6
commit 41fa6526c0
5 changed files with 562 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/encodings.xml generated
View File

@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
<component name="Encoding" addBOMForNewFiles="with NO BOM">
<file url="file://$PROJECT_DIR$/ruoyi" charset="UTF-8" />
</component>
</project>

504
.idea/workspace.xml generated
View File

@ -1,39 +1,300 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="67083fd5-67d0-4b58-9beb-0b0decab008a" name="Default Changelist" comment="" />
<list default="true" id="67083fd5-67d0-4b58-9beb-0b0decab008a" name="Default Changelist" comment="修改拖为托">
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/utils/zipdownload.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/utils/zipdownload.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/benyi_train/video_study/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/benyi_train/video_study/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/ruoyi-ui/node_modules/" />
<ignored path="$PROJECT_DIR$/ruoyi/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="91" column="34" lean-forward="true" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTrainVideoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="720">
<caret line="73" column="18" lean-forward="true" selection-start-line="73" selection-start-column="18" selection-end-line="73" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>checkUserNameUnique</find>
<find>222222222222222222222</find>
<find>111111111111111111</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java" />
<option value="$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java" />
<option value="$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTrainVideoController.java" />
</list>
</option>
</component>
<component name="MavenProjectNavigator">
<treeState>
<expand>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="ruoyi" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="ruoyi" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
</expand>
<select />
</treeState>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="295" />
<option name="y" value="160" />
<option name="width" value="1260" />
<option name="height" value="710" />
<option name="x" value="-1275" />
<option name="y" value="649" />
<option name="width" value="1296" />
<option name="height" value="698" />
</component>
<component name="ProjectId" id="1kGjsBAP1kBtqebJLRHtQsEJqkC" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="false" id="Update" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="framework" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="framework" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="project" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="project" type="462c0819:PsiDirectoryNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="project" type="462c0819:PsiDirectoryNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="project" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="project" type="462c0819:PsiDirectoryNode" />
<item name="system" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="project" type="462c0819:PsiDirectoryNode" />
<item name="system" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="mybatis" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="benyi" type="b2602c69:ProjectViewProjectNode" />
<item name="benyi" type="462c0819:PsiDirectoryNode" />
<item name="ruoyi" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
</panes>
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1592562925554" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1611913753523" />
<property name="editor.config.ad.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/ruoyi/pom.xml" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.selected.package.eslint" value="D:\播智教育\2020\benyi\ruoyi-ui\node_modules\eslint" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
<configuration name="RuoYiApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="ruoyi" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.ruoyi.RuoYiApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
@ -49,11 +310,236 @@
<workItem from="1592562689854" duration="303000" />
<workItem from="1593334102655" duration="17000" />
<workItem from="1605334027471" duration="69000" />
<workItem from="1605752186205" duration="122000" />
<workItem from="1606729307242" duration="70000" />
<workItem from="1606786420725" duration="56000" />
<workItem from="1607651373543" duration="32000" />
<workItem from="1608708913929" duration="55000" />
<workItem from="1609164745791" duration="43000" />
<workItem from="1609225845750" duration="613000" />
<workItem from="1610023772768" duration="70000" />
<workItem from="1610699807571" duration="934000" />
<workItem from="1610932624271" duration="1078000" />
<workItem from="1610956869090" duration="26000" />
<workItem from="1610982560889" duration="408000" />
<workItem from="1611023242252" duration="3524000" />
<workItem from="1611201403331" duration="1997000" />
<workItem from="1611218468580" duration="668000" />
<workItem from="1611623911855" duration="1455000" />
<workItem from="1611649472461" duration="633000" />
<workItem from="1611707215682" duration="1807000" />
<workItem from="1611732971090" duration="4643000" />
<workItem from="1611886953630" duration="15365000" />
</task>
<task id="LOCAL-00001" summary="修改拖为托">
<created>1610933089622</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1610933089622</updated>
</task>
<task id="LOCAL-00002" summary="幼儿档案添加预览和打印">
<created>1611718556459</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1611718556459</updated>
</task>
<task id="LOCAL-00003" summary="富文本编辑器bug">
<created>1611823412772</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1611823412772</updated>
</task>
<task id="LOCAL-00004" summary="隐藏未提交状态下的审批按钮">
<created>1611895251217</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1611895251217</updated>
</task>
<task id="LOCAL-00005" summary="优化文件下载">
<created>1611899191826</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1611899191826</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="33599000" />
</component>
<component name="ToolWindowManager">
<frame x="-1088" y="-5" width="1096" height="1896" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28764477" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
<window_info id="UI Designer" order="4" />
<window_info id="Capture Tool" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info id="Web" order="7" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.37173668" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" weight="0.4822064" />
<window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="12" weight="0.2292849" />
<window_info anchor="bottom" id="Spring" order="13" />
<window_info anchor="bottom" id="Java Enterprise" order="14" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Database" order="4" />
<window_info anchor="right" id="Theme Preview" order="5" />
<window_info anchor="right" id="Maven" order="6" weight="0.32955465" />
<window_info anchor="right" id="Capture Analysis" order="7" />
<window_info anchor="right" id="Palette&#9;" order="8" />
<window_info anchor="right" id="Bean Validation" order="9" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="2" />
<option name="version" value="1" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="修改拖为托" />
<MESSAGE value="幼儿档案添加预览和打印" />
<MESSAGE value="富文本编辑器bug" />
<MESSAGE value="隐藏未提交状态下的审批按钮" />
<MESSAGE value="优化文件下载" />
<option name="LAST_COMMIT_MESSAGE" value="优化文件下载" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="10" column="32" lean-forward="true" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="124" column="66" selection-start-line="124" selection-start-column="66" selection-end-line="124" selection-end-column="66" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi-ui/src/views/benyi/checkindetail/index.vue">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi-ui/src/views/benyi/calendarshow/index.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-554" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2640">
<caret line="209" column="71" selection-start-line="209" selection-start-column="71" selection-end-line="209" selection-end-column="71" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="266" column="19" selection-start-line="266" selection-start-column="19" selection-end-line="266" selection-end-column="19" />
<folding>
<element signature="e#5202#5203#0" expanded="true" />
<element signature="e#5229#5230#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDept.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
<caret line="59" column="24" lean-forward="true" selection-start-line="59" selection-start-column="24" selection-end-line="59" selection-end-column="24" />
<folding>
<element signature="e#1213#1214#0" expanded="true" />
<element signature="e#1244#1245#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="36" column="36" lean-forward="true" selection-start-line="36" selection-start-column="36" selection-end-line="36" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2445">
<caret line="194" column="50" lean-forward="true" selection-start-line="194" selection-start-column="50" selection-end-line="194" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="59" column="8" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-668">
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/framework/security/LoginBody.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-232">
<caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="43" column="38" selection-start-line="43" selection-start-column="38" selection-end-line="43" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="91" column="34" lean-forward="true" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTrainVideoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="720">
<caret line="73" column="18" lean-forward="true" selection-start-line="73" selection-start-column="18" selection-end-line="73" selection-end-column="18" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

106
ruoyi-ui/src/utils/zipdownload.js
View File

@ -2,59 +2,57 @@ import axios from 'axios'
import { getToken } from '@/utils/auth'
const mimeMap = {
xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
zip: 'application/zip'
xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
zip: 'application/zip'
}
const baseUrl = process.env.VUE_APP_BASE_API
export function downLoadZip(str, filename) {
var url = baseUrl + str
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(res => {
resolveBlob(res, mimeMap.zip)
})
var url = baseUrl + str
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(res => {
resolveBlob(res, mimeMap.zip)
})
}
export function downLoadVideoUrl(str) {
var url = baseUrl + str
axios({
method: 'get',
url: url,
responseType: 'arraybuffer',
headers: { 'Authorization': 'Bearer ' + getToken() },
}).then(res => {
// console.log(res);
return res.data
})
var url = baseUrl + str
return axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() },
})
}
export function downLoadUrl(str, item) {
var url = baseUrl + str
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() },
}).then(res => {
// console.log(res);
downloadFileFun(res.data, item)
})
var url = baseUrl + str
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() },
}).then(res => {
// console.log(res);
// downloadFileFun(res.data, item)
res.send();
})
}
export function downloadFileFun(data, item) {
if (!data) {
return
}
let url = window.URL.createObjectURL(new Blob([data]))
let link = document.createElement('a')
link.style.display = 'none'
link.href = url
link.setAttribute('download', item.name)
document.body.appendChild(link)
link.click()
if (!data) {
return
}
let url = window.URL.createObjectURL(new Blob([data]))
let link = document.createElement('a')
link.style.display = 'none'
link.href = url
link.setAttribute('download', item.name)
document.body.appendChild(link)
link.click()
}
/**
@ -63,17 +61,17 @@ export function downloadFileFun(data, item) {
* @param {String} mimeType MIME类型
*/
export function resolveBlob(res, mimeType) {
const aLink = document.createElement('a')
var blob = new Blob([res.data], { type: mimeType })
// //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
var contentDisposition = decodeURI(res.headers['content-disposition'])
var result = patt.exec(contentDisposition)
var fileName = result[1]
fileName = fileName.replace(/\"/g, '')
aLink.href = URL.createObjectURL(blob)
aLink.setAttribute('download', fileName) // 设置下载文件名称
document.body.appendChild(aLink)
aLink.click()
document.body.appendChild(aLink)
const aLink = document.createElement('a')
var blob = new Blob([res.data], { type: mimeType })
// //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
var contentDisposition = decodeURI(res.headers['content-disposition'])
var result = patt.exec(contentDisposition)
var fileName = result[1]
fileName = fileName.replace(/\"/g, '')
aLink.href = URL.createObjectURL(blob)
aLink.setAttribute('download', fileName) // 设置下载文件名称
document.body.appendChild(aLink)
aLink.click()
document.body.appendChild(aLink)
}

12
ruoyi-ui/src/views/benyi_train/video_study/index.vue
View File

@ -171,11 +171,17 @@ export default {
return data;
},
/** 查询培训列表 */
getList() {
async getList() {
this.loading = true;
let videobuffer="";
await downLoadVideoUrl("/profile/video/lg4y3idmDCEme_eu6FzAAoOdcyS2.mp4").then((res)=>{
videobuffer=res;
console.log(videobuffer);
})
listVideo(this.queryParams).then((response) => {
this.videoList = response.rows;
this.playerOptions = response.rows.map((ele) => {
console.log(ele.videourl);
return {
autoplay: false,
muted: true,
@ -186,8 +192,8 @@ export default {
{
type: ele.filetype,
// mp4
src: ele.videourl
// src: downLoadVideoUrl(ele.videourl),
// src: ele.videourl
src: videobuffer.request.response,
},
],
notSupportedMessage: "此视频暂无法播放，请稍后再试",

3
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
View File

@ -4,6 +4,8 @@ import java.util.List;
import java.util.Set;
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.project.system.domain.BySchool;
import com.ruoyi.project.system.service.IBySchoolService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -92,6 +94,7 @@ public class SysLoginController
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);