diff --git a/.idea/koa2_Sequelize_project.iml b/.idea/koa2_Sequelize_project.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/.idea/koa2_Sequelize_project.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="WEB_MODULE" version="4"> + <component name="NewModuleRootManager"> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/.tmp" /> + <excludeFolder url="file://$MODULE_DIR$/temp" /> + <excludeFolder url="file://$MODULE_DIR$/tmp" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..28a804d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="JavaScriptSettings"> + <option name="languageLevel" value="ES6" /> + </component> +</project> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..263807b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/koa2_Sequelize_project.iml" filepath="$PROJECT_DIR$/.idea/koa2_Sequelize_project.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml new file mode 100644 index 0000000..9338ba6 --- /dev/null +++ b/.idea/watcherTasks.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectTasksOptions" suppressed-tasks="Babel" /> +</project> \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..3e751a1 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,297 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ChangeListManager"> + <list default="true" id="1f99ef43-e532-4660-89b7-4ae33b7591e2" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/meeting.js" afterPath="$PROJECT_DIR$/routes/meeting.js" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/util/filterUrl.js" afterPath="$PROJECT_DIR$/util/filterUrl.js" /> + </list> + <ignored path="$PROJECT_DIR$/.tmp/" /> + <ignored path="$PROJECT_DIR$/temp/" /> + <ignored path="$PROJECT_DIR$/tmp/" /> + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> + <option name="TRACKING_ENABLED" 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 leaf-file-name="meetingController.js" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/controller/meetingController.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="18"> + <caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" /> + <folding> + <marker date="1504079255000" expanded="true" signature="620:624" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="688:4396" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="698:4351" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="786:850" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="883:962" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="1278:3808" ph="{"siteId": meetingbody.siteId...}" /> + <marker date="1504079255000" expanded="true" signature="2559:2636" ph="//..." /> + <marker date="1504079255000" expanded="true" signature="2689:2827" ph="//..." /> + <marker date="1504079255000" expanded="true" signature="3024:3375" ph="//..." /> + <marker date="1504079255000" expanded="true" signature="3686:3754" ph="//..." /> + <marker date="1504079255000" expanded="true" signature="4178:4313" ph="{"code": jsonXml.result.errorCode...}" /> + <marker date="1504079255000" expanded="true" signature="4366:4394" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="4457:4801" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="4467:4756" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="4771:4799" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="4862:5084" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="4872:5039" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="5054:5082" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="5147:5436" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="5157:5365" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="5380:5434" ph="{...}" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="index.js" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/controller/index.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="index.js" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/routes/index.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="361"> + <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="saltMD5.js" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/util/saltMD5.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding> + <marker date="1504092255000" expanded="true" signature="68:634" ph="{...}" /> + <marker date="1504092255000" expanded="true" signature="101:314" ph="{...}" /> + <marker date="1504092255000" expanded="true" signature="268:309" ph="{"salt": salt...}" /> + <marker date="1504092255000" expanded="true" signature="340:437" ph="{...}" /> + <marker date="1504092255000" expanded="true" signature="472:632" ph="{...}" /> + <marker date="1504092255000" expanded="true" signature="496:524" ph="{...}" /> + </folding> + </state> + </provider> + </entry> + </file> + </leaf> + </component> + <component name="Git.Settings"> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> + </component> + <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> + <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER"> + <package-json value="$PROJECT_DIR$/package.json" /> + </component> + <component name="JsFlowSettings"> + <service-enabled>true</service-enabled> + <exe-path /> + <annotation-enable>false</annotation-enable> + <other-services-enabled>true</other-services-enabled> + <auto-save>true</auto-save> + </component> + <component name="JsGulpfileManager"> + <detection-done>true</detection-done> + <sorting>DEFINITION_ORDER</sorting> + </component> + <component name="NodeModulesDirectoryManager"> + <handled-path value="$PROJECT_DIR$/node_modules" /> + </component> + <component name="ProjectFrameBounds" fullScreen="true"> + <option name="width" value="1280" /> + <option name="height" value="800" /> + </component> + <component name="ProjectView"> + <navigator currentView="ProjectPane" proportions="" version="1"> + <flattenPackages /> + <showMembers /> + <showModules /> + <showLibraryContents /> + <hideEmptyPackages /> + <abbreviatePackageNames /> + <autoscrollToSource /> + <autoscrollFromSource /> + <sortByType /> + <manualOrder /> + <foldersAlwaysOnTop value="true" /> + </navigator> + <panes> + <pane id="Scope" /> + <pane id="Scratches" /> + <pane id="ProjectPane"> + <subPane> + <expand> + <path> + <item name="koa2_Sequelize_project" type="b2602c69:ProjectViewProjectNode" /> + <item name="koa2_Sequelize_project" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="koa2_Sequelize_project" type="b2602c69:ProjectViewProjectNode" /> + <item name="koa2_Sequelize_project" type="462c0819:PsiDirectoryNode" /> + <item name="bin" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="koa2_Sequelize_project" type="b2602c69:ProjectViewProjectNode" /> + <item name="koa2_Sequelize_project" type="462c0819:PsiDirectoryNode" /> + <item name="routes" type="462c0819:PsiDirectoryNode" /> + </path> + </expand> + <select /> + </subPane> + </pane> + </panes> + </component> + <component name="PropertiesComponent"> + <property name="WebServerToolWindowFactoryState" value="false" /> + <property name="nodejs_interpreter_path" value="/usr/local/bin/node" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$" /> + <property name="HbShouldOpenHtmlAsHb" value="" /> + <property name="settings.editor.selected.configurable" value="Settings.JavaScript" /> + <property name="JavaScriptPreferStrict" value="false" /> + <property name="JavaScriptWeakerCompletionTypeGuess" value="true" /> + </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" selected="Node.js.app.js"> + <configuration name="app.js" type="NodeJSConfigurationType" factoryName="Node.js" temporary="true" path-to-node="project" path-to-js-file="app.js" working-dir="$PROJECT_DIR$" /> + <recent_temporary> + <list size="1"> + <item index="0" class="java.lang.String" itemvalue="Node.js.app.js" /> + </list> + </recent_temporary> + </component> + <component name="ShelveChangesManager" show_recycled="false"> + <option name="remove_strategy" value="false" /> + </component> + <component name="TaskManager"> + <task active="true" id="Default" summary="Default task"> + <changelist id="1f99ef43-e532-4660-89b7-4ae33b7591e2" name="Default" comment="" /> + <created>1504092369793</created> + <option name="number" value="Default" /> + <option name="presentableId" value="Default" /> + <updated>1504092369793</updated> + <workItem from="1504092372283" duration="567000" /> + </task> + <servers /> + </component> + <component name="TimeTrackingManager"> + <option name="totallyTimeSpent" value="567000" /> + </component> + <component name="ToolWindowManager"> + <frame x="0" y="0" width="1280" height="800" extended-state="0" /> + <layout> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2494043" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5570839" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21843971" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + </layout> + </component> + <component name="TypeScriptGeneratedFilesManager"> + <option name="version" value="1" /> + </component> + <component name="VcsContentAnnotationSettings"> + <option name="myLimit" value="2678400000" /> + </component> + <component name="XDebuggerManager"> + <breakpoint-manager /> + <watches-manager /> + </component> + <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/util/saltMD5.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding> + <marker date="1504092255000" expanded="true" signature="68:634" ph="{...}" /> + <marker date="1504092255000" expanded="true" signature="101:314" ph="{...}" /> + <marker date="1504092255000" expanded="true" signature="268:309" ph="{"salt": salt...}" /> + <marker date="1504092255000" expanded="true" signature="340:437" ph="{...}" /> + <marker date="1504092255000" expanded="true" signature="472:632" ph="{...}" /> + <marker date="1504092255000" expanded="true" signature="496:524" ph="{...}" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/controller/meetingController.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="18"> + <caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" /> + <folding> + <marker date="1504079255000" expanded="true" signature="620:624" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="688:4396" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="698:4351" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="786:850" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="883:962" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="1278:3808" ph="{"siteId": meetingbody.siteId...}" /> + <marker date="1504079255000" expanded="true" signature="2559:2636" ph="//..." /> + <marker date="1504079255000" expanded="true" signature="2689:2827" ph="//..." /> + <marker date="1504079255000" expanded="true" signature="3024:3375" ph="//..." /> + <marker date="1504079255000" expanded="true" signature="3686:3754" ph="//..." /> + <marker date="1504079255000" expanded="true" signature="4178:4313" ph="{"code": jsonXml.result.errorCode...}" /> + <marker date="1504079255000" expanded="true" signature="4366:4394" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="4457:4801" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="4467:4756" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="4771:4799" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="4862:5084" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="4872:5039" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="5054:5082" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="5147:5436" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="5157:5365" ph="{...}" /> + <marker date="1504079255000" expanded="true" signature="5380:5434" ph="{...}" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/controller/index.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/routes/index.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="361"> + <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </component> +</project> \ No newline at end of file diff --git a/routes/meeting.js b/routes/meeting.js index 4621061..8fc6002 100644 --- a/routes/meeting.js +++ b/routes/meeting.js @@ -16,7 +16,7 @@ router.post('/createMeeting', async (ctx, next) => { } }) - router.put('/getMeeting', async (ctx, next) => { + router.post('/getMeeting', async (ctx, next) => { try{ var data = await meetingContoller.getMeeting(ctx, next); status.successTemp(ctx,200,data); diff --git a/util/filterUrl.js b/util/filterUrl.js index 57788fa..5eb3231 100644 --- a/util/filterUrl.js +++ b/util/filterUrl.js @@ -1 +1 @@ -module.exports = ["/users/addUser","/users/login",'/users/addUser?time=1'] \ No newline at end of file +module.exports = ["/users/addUser","/users/login",'/users/addUser?time=1',] \ No newline at end of file