付智勇 / koa2_Sequelize_project

转到一个项目
Toggle navigation Toggle navigation pinning
付智勇
6fcbe51b 1 parent 43f0509c master ... 20171113 nows revert-2a1f6481

no message

内嵌 并排对比
正在显示 8 个修改的文件 包含 335 行增加 和 2 行删除
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<module type="WEB_MODULE" version="4">
  3 + <component name="NewModuleRootManager">
  4 + <content url="file://$MODULE_DIR$">
  5 + <excludeFolder url="file://$MODULE_DIR$/.tmp" />
  6 + <excludeFolder url="file://$MODULE_DIR$/temp" />
  7 + <excludeFolder url="file://$MODULE_DIR$/tmp" />
  8 + </content>
  9 + <orderEntry type="inheritedJdk" />
  10 + <orderEntry type="sourceFolder" forTests="false" />
  11 + </component>
  12 +</module>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="JavaScriptSettings">
  4 + <option name="languageLevel" value="ES6" />
  5 + </component>
  6 +</project>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="ProjectModuleManager">
  4 + <modules>
  5 + <module fileurl="file://$PROJECT_DIR$/.idea/koa2_Sequelize_project.iml" filepath="$PROJECT_DIR$/.idea/koa2_Sequelize_project.iml" />
  6 + </modules>
  7 + </component>
  8 +</project>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="VcsDirectoryMappings">
  4 + <mapping directory="$PROJECT_DIR$" vcs="Git" />
  5 + </component>
  6 +</project>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="ProjectTasksOptions" suppressed-tasks="Babel" />
  4 +</project>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="ChangeListManager">
  4 + <list default="true" id="1f99ef43-e532-4660-89b7-4ae33b7591e2" name="Default" comment="">
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/meeting.js" afterPath="$PROJECT_DIR$/routes/meeting.js" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/util/filterUrl.js" afterPath="$PROJECT_DIR$/util/filterUrl.js" />
  7 + </list>
  8 + <ignored path="$PROJECT_DIR$/.tmp/" />
  9 + <ignored path="$PROJECT_DIR$/temp/" />
  10 + <ignored path="$PROJECT_DIR$/tmp/" />
  11 + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
  12 + <option name="TRACKING_ENABLED" value="true" />
  13 + <option name="SHOW_DIALOG" value="false" />
  14 + <option name="HIGHLIGHT_CONFLICTS" value="true" />
  15 + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
  16 + <option name="LAST_RESOLUTION" value="IGNORE" />
  17 + </component>
  18 + <component name="FileEditorManager">
  19 + <leaf>
  20 + <file leaf-file-name="meetingController.js" pinned="false" current-in-tab="false">
  21 + <entry file="file://$PROJECT_DIR$/controller/meetingController.js">
  22 + <provider selected="true" editor-type-id="text-editor">
  23 + <state relative-caret-position="18">
  24 + <caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
  25 + <folding>
  26 + <marker date="1504079255000" expanded="true" signature="620:624" ph="{...}" />
  27 + <marker date="1504079255000" expanded="true" signature="688:4396" ph="{...}" />
  28 + <marker date="1504079255000" expanded="true" signature="698:4351" ph="{...}" />
  29 + <marker date="1504079255000" expanded="true" signature="786:850" ph="{...}" />
  30 + <marker date="1504079255000" expanded="true" signature="883:962" ph="{...}" />
  31 + <marker date="1504079255000" expanded="true" signature="1278:3808" ph="{&quot;siteId&quot;: meetingbody.siteId...}" />
  32 + <marker date="1504079255000" expanded="true" signature="2559:2636" ph="//..." />
  33 + <marker date="1504079255000" expanded="true" signature="2689:2827" ph="//..." />
  34 + <marker date="1504079255000" expanded="true" signature="3024:3375" ph="//..." />
  35 + <marker date="1504079255000" expanded="true" signature="3686:3754" ph="//..." />
  36 + <marker date="1504079255000" expanded="true" signature="4178:4313" ph="{&quot;code&quot;: jsonXml.result.errorCode...}" />
  37 + <marker date="1504079255000" expanded="true" signature="4366:4394" ph="{...}" />
  38 + <marker date="1504079255000" expanded="true" signature="4457:4801" ph="{...}" />
  39 + <marker date="1504079255000" expanded="true" signature="4467:4756" ph="{...}" />
  40 + <marker date="1504079255000" expanded="true" signature="4771:4799" ph="{...}" />
  41 + <marker date="1504079255000" expanded="true" signature="4862:5084" ph="{...}" />
  42 + <marker date="1504079255000" expanded="true" signature="4872:5039" ph="{...}" />
  43 + <marker date="1504079255000" expanded="true" signature="5054:5082" ph="{...}" />
  44 + <marker date="1504079255000" expanded="true" signature="5147:5436" ph="{...}" />
  45 + <marker date="1504079255000" expanded="true" signature="5157:5365" ph="{...}" />
  46 + <marker date="1504079255000" expanded="true" signature="5380:5434" ph="{...}" />
  47 + </folding>
  48 + </state>
  49 + </provider>
  50 + </entry>
  51 + </file>
  52 + <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
  53 + <entry file="file://$PROJECT_DIR$/controller/index.js">
  54 + <provider selected="true" editor-type-id="text-editor">
  55 + <state relative-caret-position="0">
  56 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  57 + <folding />
  58 + </state>
  59 + </provider>
  60 + </entry>
  61 + </file>
  62 + <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
  63 + <entry file="file://$PROJECT_DIR$/routes/index.js">
  64 + <provider selected="true" editor-type-id="text-editor">
  65 + <state relative-caret-position="361">
  66 + <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
  67 + <folding />
  68 + </state>
  69 + </provider>
  70 + </entry>
  71 + </file>
  72 + <file leaf-file-name="saltMD5.js" pinned="false" current-in-tab="false">
  73 + <entry file="file://$PROJECT_DIR$/util/saltMD5.js">
  74 + <provider selected="true" editor-type-id="text-editor">
  75 + <state relative-caret-position="0">
  76 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  77 + <folding>
  78 + <marker date="1504092255000" expanded="true" signature="68:634" ph="{...}" />
  79 + <marker date="1504092255000" expanded="true" signature="101:314" ph="{...}" />
  80 + <marker date="1504092255000" expanded="true" signature="268:309" ph="{&quot;salt&quot;: salt...}" />
  81 + <marker date="1504092255000" expanded="true" signature="340:437" ph="{...}" />
  82 + <marker date="1504092255000" expanded="true" signature="472:632" ph="{...}" />
  83 + <marker date="1504092255000" expanded="true" signature="496:524" ph="{...}" />
  84 + </folding>
  85 + </state>
  86 + </provider>
  87 + </entry>
  88 + </file>
  89 + </leaf>
  90 + </component>
  91 + <component name="Git.Settings">
  92 + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  93 + </component>
  94 + <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  95 + <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER">
  96 + <package-json value="$PROJECT_DIR$/package.json" />
  97 + </component>
  98 + <component name="JsFlowSettings">
  99 + <service-enabled>true</service-enabled>
  100 + <exe-path />
  101 + <annotation-enable>false</annotation-enable>
  102 + <other-services-enabled>true</other-services-enabled>
  103 + <auto-save>true</auto-save>
  104 + </component>
  105 + <component name="JsGulpfileManager">
  106 + <detection-done>true</detection-done>
  107 + <sorting>DEFINITION_ORDER</sorting>
  108 + </component>
  109 + <component name="NodeModulesDirectoryManager">
  110 + <handled-path value="$PROJECT_DIR$/node_modules" />
  111 + </component>
  112 + <component name="ProjectFrameBounds" fullScreen="true">
  113 + <option name="width" value="1280" />
  114 + <option name="height" value="800" />
  115 + </component>
  116 + <component name="ProjectView">
  117 + <navigator currentView="ProjectPane" proportions="" version="1">
  118 + <flattenPackages />
  119 + <showMembers />
  120 + <showModules />
  121 + <showLibraryContents />
  122 + <hideEmptyPackages />
  123 + <abbreviatePackageNames />
  124 + <autoscrollToSource />
  125 + <autoscrollFromSource />
  126 + <sortByType />
  127 + <manualOrder />
  128 + <foldersAlwaysOnTop value="true" />
  129 + </navigator>
  130 + <panes>
  131 + <pane id="Scope" />
  132 + <pane id="Scratches" />
  133 + <pane id="ProjectPane">
  134 + <subPane>
  135 + <expand>
  136 + <path>
  137 + <item name="koa2_Sequelize_project" type="b2602c69:ProjectViewProjectNode" />
  138 + <item name="koa2_Sequelize_project" type="462c0819:PsiDirectoryNode" />
  139 + </path>
  140 + <path>
  141 + <item name="koa2_Sequelize_project" type="b2602c69:ProjectViewProjectNode" />
  142 + <item name="koa2_Sequelize_project" type="462c0819:PsiDirectoryNode" />
  143 + <item name="bin" type="462c0819:PsiDirectoryNode" />
  144 + </path>
  145 + <path>
  146 + <item name="koa2_Sequelize_project" type="b2602c69:ProjectViewProjectNode" />
  147 + <item name="koa2_Sequelize_project" type="462c0819:PsiDirectoryNode" />
  148 + <item name="routes" type="462c0819:PsiDirectoryNode" />
  149 + </path>
  150 + </expand>
  151 + <select />
  152 + </subPane>
  153 + </pane>
  154 + </panes>
  155 + </component>
  156 + <component name="PropertiesComponent">
  157 + <property name="WebServerToolWindowFactoryState" value="false" />
  158 + <property name="nodejs_interpreter_path" value="/usr/local/bin/node" />
  159 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
  160 + <property name="HbShouldOpenHtmlAsHb" value="" />
  161 + <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
  162 + <property name="JavaScriptPreferStrict" value="false" />
  163 + <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
  164 + </component>
  165 + <component name="RunDashboard">
  166 + <option name="ruleStates">
  167 + <list>
  168 + <RuleState>
  169 + <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
  170 + </RuleState>
  171 + <RuleState>
  172 + <option name="name" value="StatusDashboardGroupingRule" />
  173 + </RuleState>
  174 + </list>
  175 + </option>
  176 + </component>
  177 + <component name="RunManager" selected="Node.js.app.js">
  178 + <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$" />
  179 + <recent_temporary>
  180 + <list size="1">
  181 + <item index="0" class="java.lang.String" itemvalue="Node.js.app.js" />
  182 + </list>
  183 + </recent_temporary>
  184 + </component>
  185 + <component name="ShelveChangesManager" show_recycled="false">
  186 + <option name="remove_strategy" value="false" />
  187 + </component>
  188 + <component name="TaskManager">
  189 + <task active="true" id="Default" summary="Default task">
  190 + <changelist id="1f99ef43-e532-4660-89b7-4ae33b7591e2" name="Default" comment="" />
  191 + <created>1504092369793</created>
  192 + <option name="number" value="Default" />
  193 + <option name="presentableId" value="Default" />
  194 + <updated>1504092369793</updated>
  195 + <workItem from="1504092372283" duration="567000" />
  196 + </task>
  197 + <servers />
  198 + </component>
  199 + <component name="TimeTrackingManager">
  200 + <option name="totallyTimeSpent" value="567000" />
  201 + </component>
  202 + <component name="ToolWindowManager">
  203 + <frame x="0" y="0" width="1280" height="800" extended-state="0" />
  204 + <layout>
  205 + <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" />
  206 + <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" />
  207 + <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" />
  208 + <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" />
  209 + <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" />
  210 + <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" />
  211 + <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" />
  212 + <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" />
  213 + <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" />
  214 + <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" />
  215 + <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" />
  216 + <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" />
  217 + <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" />
  218 + <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" />
  219 + <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" />
  220 + <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" />
  221 + <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" />
  222 + </layout>
  223 + </component>
  224 + <component name="TypeScriptGeneratedFilesManager">
  225 + <option name="version" value="1" />
  226 + </component>
  227 + <component name="VcsContentAnnotationSettings">
  228 + <option name="myLimit" value="2678400000" />
  229 + </component>
  230 + <component name="XDebuggerManager">
  231 + <breakpoint-manager />
  232 + <watches-manager />
  233 + </component>
  234 + <component name="editorHistoryManager">
  235 + <entry file="file://$PROJECT_DIR$/util/saltMD5.js">
  236 + <provider selected="true" editor-type-id="text-editor">
  237 + <state relative-caret-position="0">
  238 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  239 + <folding>
  240 + <marker date="1504092255000" expanded="true" signature="68:634" ph="{...}" />
  241 + <marker date="1504092255000" expanded="true" signature="101:314" ph="{...}" />
  242 + <marker date="1504092255000" expanded="true" signature="268:309" ph="{&quot;salt&quot;: salt...}" />
  243 + <marker date="1504092255000" expanded="true" signature="340:437" ph="{...}" />
  244 + <marker date="1504092255000" expanded="true" signature="472:632" ph="{...}" />
  245 + <marker date="1504092255000" expanded="true" signature="496:524" ph="{...}" />
  246 + </folding>
  247 + </state>
  248 + </provider>
  249 + </entry>
  250 + <entry file="file://$PROJECT_DIR$/controller/meetingController.js">
  251 + <provider selected="true" editor-type-id="text-editor">
  252 + <state relative-caret-position="18">
  253 + <caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
  254 + <folding>
  255 + <marker date="1504079255000" expanded="true" signature="620:624" ph="{...}" />
  256 + <marker date="1504079255000" expanded="true" signature="688:4396" ph="{...}" />
  257 + <marker date="1504079255000" expanded="true" signature="698:4351" ph="{...}" />
  258 + <marker date="1504079255000" expanded="true" signature="786:850" ph="{...}" />
  259 + <marker date="1504079255000" expanded="true" signature="883:962" ph="{...}" />
  260 + <marker date="1504079255000" expanded="true" signature="1278:3808" ph="{&quot;siteId&quot;: meetingbody.siteId...}" />
  261 + <marker date="1504079255000" expanded="true" signature="2559:2636" ph="//..." />
  262 + <marker date="1504079255000" expanded="true" signature="2689:2827" ph="//..." />
  263 + <marker date="1504079255000" expanded="true" signature="3024:3375" ph="//..." />
  264 + <marker date="1504079255000" expanded="true" signature="3686:3754" ph="//..." />
  265 + <marker date="1504079255000" expanded="true" signature="4178:4313" ph="{&quot;code&quot;: jsonXml.result.errorCode...}" />
  266 + <marker date="1504079255000" expanded="true" signature="4366:4394" ph="{...}" />
  267 + <marker date="1504079255000" expanded="true" signature="4457:4801" ph="{...}" />
  268 + <marker date="1504079255000" expanded="true" signature="4467:4756" ph="{...}" />
  269 + <marker date="1504079255000" expanded="true" signature="4771:4799" ph="{...}" />
  270 + <marker date="1504079255000" expanded="true" signature="4862:5084" ph="{...}" />
  271 + <marker date="1504079255000" expanded="true" signature="4872:5039" ph="{...}" />
  272 + <marker date="1504079255000" expanded="true" signature="5054:5082" ph="{...}" />
  273 + <marker date="1504079255000" expanded="true" signature="5147:5436" ph="{...}" />
  274 + <marker date="1504079255000" expanded="true" signature="5157:5365" ph="{...}" />
  275 + <marker date="1504079255000" expanded="true" signature="5380:5434" ph="{...}" />
  276 + </folding>
  277 + </state>
  278 + </provider>
  279 + </entry>
  280 + <entry file="file://$PROJECT_DIR$/controller/index.js">
  281 + <provider selected="true" editor-type-id="text-editor">
  282 + <state relative-caret-position="0">
  283 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  284 + <folding />
  285 + </state>
  286 + </provider>
  287 + </entry>
  288 + <entry file="file://$PROJECT_DIR$/routes/index.js">
  289 + <provider selected="true" editor-type-id="text-editor">
  290 + <state relative-caret-position="361">
  291 + <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
  292 + <folding />
  293 + </state>
  294 + </provider>
  295 + </entry>
  296 + </component>
  297 +</project>
@@ -16,7 +16,7 @@ router.post('/createMeeting', async (ctx, next) => { @@ -16,7 +16,7 @@ router.post('/createMeeting', async (ctx, next) => {
16 } 16 }
17 }) 17 })
18 18
19 - router.put('/getMeeting', async (ctx, next) => { 19 + router.post('/getMeeting', async (ctx, next) => {
20 try{ 20 try{
21 var data = await meetingContoller.getMeeting(ctx, next); 21 var data = await meetingContoller.getMeeting(ctx, next);
22 status.successTemp(ctx,200,data); 22 status.successTemp(ctx,200,data);
1 -module.exports = ["/users/addUser","/users/login",'/users/addUser?time=1']  
  1 +module.exports = ["/users/addUser","/users/login",'/users/addUser?time=1',]