提交 7b746a06 authored 作者: vipcxj's avatar vipcxj

clean ignored file

上级 2e8374a7
......@@ -30,6 +30,7 @@
"padded-blocks": "off",
"function-paren-newline": "off",
"jsx-a11y/anchor-is-valid": "off",
"jsx-a11y/click-events-have-key-events": "off",
"no-multi-assign": "off",
"no-await-in-loop": "off",
"prefer-destructuring": "off",
......
<?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
<component name="ProjectDictionaryState">
<dictionary name="yaohx_169" />
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="JSX" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/app-manage-console.iml" filepath="$PROJECT_DIR$/.idea/app-manage-console.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RTProjectComponent">
<option name="nodeInterpreter" value="" />
</component>
</project>
\ No newline at end of file
<?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
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f3473cde-6bad-431d-8195-0b704f7cfba4" name="Default" comment="Merge remote-tracking branch 'scaffold/master'&#10;&#10;# Conflicts:&#10;#&#9;.roadhogrc.js&#10;#&#9;package.json&#10;#&#9;src/models/domain.js&#10;#&#9;src/models/main/index.js&#10;#&#9;src/router.js&#10;#&#9;src/routes/domain/index.js&#10;#&#9;src/routes/main/header.js&#10;&#10;更新到最新的脚手架">
<change afterPath="$PROJECT_DIR$/.babelrc" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/postcss.config.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/proxy.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/components/hoc/size.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/components/table/dstable2/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/models/main/modules/api-doc/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/polyfill.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/auth.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/code.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/domain.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/addFamily.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/addHouse.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/addPeople.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/approveXieYi.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/getClerks.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/getXieYiPdf.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/importFangYuan.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/index.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/isLiangQingLocked.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/isXieYiApproved.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/isXieYiLocked.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/lockLiangQing.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/lockXieYi.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/removeFamily.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/removeFangYuan.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/removeHouse.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/removePeople.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/requestCancelXieYi.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/requestUnLockLiangQing.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/updateFamily.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/updateHouse.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/updatePeople.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/updateXieYi.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/whetherCancelXieYi.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/whetherUnLockLiangQing.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/error.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/file.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/index.less" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/index.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/main.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/markdown.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/markdown.less" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/services/tools/envers.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/async.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/datasource.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/layout.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/meta.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/model.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/stories/lib/dva.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/stories/lib/lazy.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/stories/lib/login.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/stories/test.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/theme.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/tools/applyMock.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/tools/babel-preset.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webpack.common.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webpack.dev.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webpack.prod.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.eslintrc" beforeDir="false" afterPath="$PROJECT_DIR$/.eslintrc" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.roadhogrc.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.roadhogrc.mock.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.storybook/.babelrc" beforeDir="false" afterPath="$PROJECT_DIR$/.storybook/.babelrc" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.storybook/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/.storybook/config.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.storybook/middleware.js" beforeDir="false" afterPath="$PROJECT_DIR$/.storybook/middleware.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.storybook/webpack.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/.storybook/webpack.config.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/babel-register.js" beforeDir="false" afterPath="$PROJECT_DIR$/babel-register.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cache.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock.js" beforeDir="false" afterPath="$PROJECT_DIR$/mock/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/my-babel-register.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/hoc/routes.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/hoc/routes.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/hoc/stateful.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/hoc/stateful.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/table/dstable/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/table/dstable/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/table/dstable/model.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/table/dstable/model.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/table/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/table/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/table/input-table/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/table/input-table/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/table/search/enum.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/table/search/enum.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/data/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/data/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/data/modules.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/data/modules.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ejs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/mock/tasks.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/mock/tasks.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/models/login.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/models/login.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/models/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/models/main/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/models/main/modules/appManagement/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/models/main/modules/appManagement/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/models/main/modules/task/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/models/main/modules/task/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/register/modules/empty.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/register/modules/empty.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/router.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/login/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/login/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/header.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/header.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/header.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/header.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/add.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/add.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/addDeploy.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/addDeploy.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/deploy.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/deploy.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/edit.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/edit.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/editDeploy.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/editDeploy.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/list.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/list.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/task/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/task/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/task/list.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/task/list.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/monk.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/monk.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/datasource.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/datasource.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/domain.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/domain.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/interfaces.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/interfaces.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/modules.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/modules.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/resource.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/resource.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/route.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/route.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/template.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/template.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/user.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/user.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/auth.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/auth.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/config.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/db.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/db.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/delete.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/delete.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/error.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/error.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/helper.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/helper.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/http-helper.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/http-helper.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/math.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/math.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/middleware.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/middleware.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/polyfill.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/polyfill.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/post.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/post.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/request.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/request.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/stories/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/stories/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test_setup.js" beforeDir="false" afterPath="$PROJECT_DIR$/test_setup.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webpack.config.js" beforeDir="false" />
</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 SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="list.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/list.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="26" selection-start-column="26" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/main/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1155">
<caret line="77" selection-start-line="77" selection-end-line="77" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/main/modules/appManagement/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="42" column="41" selection-start-line="42" selection-start-column="41" selection-end-line="42" selection-end-column="41" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="41" column="27" selection-start-line="41" selection-start-column="27" selection-end-line="41" selection-end-column="27" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="config.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils/config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="65" column="34" lean-forward="true" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/services/login/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-618">
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="router.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1603">
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#2916#5517#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="login.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1026">
<caret line="41" selection-start-line="41" selection-end-line="41" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/services/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" selection-start-line="2" selection-end-line="4" selection-end-column="39" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#20#59#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>normRoutes</find>
<find>routes</find>
<find>values</find>
<find>isNumber</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="ROOT_SYNC" value="DONT_SYNC" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/.eslintrc" />
<option value="$PROJECT_DIR$/src/routes/main/header.js" />
<option value="$PROJECT_DIR$/src/routes/main/modules/appManagement/index.js" />
<option value="$PROJECT_DIR$/src/routes/main/modules/appManagement/add.js" />
<option value="$PROJECT_DIR$/src/routes/main/modules/appManagement/addDeploy.js" />
<option value="$PROJECT_DIR$/src/routes/main/modules/appManagement/deploy.js" />
<option value="$PROJECT_DIR$/src/routes/main/modules/appManagement/edit.js" />
<option value="$PROJECT_DIR$/src/routes/main/modules/appManagement/editDeploy.js" />
<option value="$PROJECT_DIR$/src/routes/main/modules/appManagement/list.js" />
<option value="$PROJECT_DIR$/src/models/main/modules/appManagement/index.js" />
<option value="$PROJECT_DIR$/src/utils/config.js" />
<option value="$PROJECT_DIR$/src/models/login.js" />
<option value="$PROJECT_DIR$/src/services/app.js" />
</list>
</option>
</component>
<component name="JsBowerSettings">
<node-interpreter value="project" />
<exe-path />
<config-path />
</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>
</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="NodePackageJsonFileManager">
<packageJsonPaths>
<path value="$PROJECT_DIR$/package.json" />
</packageJsonPaths>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-16" />
<option name="y" value="26" />
<option name="width" value="1440" />
<option name="height" value="806" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
<State>
<id>JavaScript</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>DOM issuesJavaScript</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="app-manage-console" type="b2602c69:ProjectViewProjectNode" />
<item name="app-manage-console" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="app-manage-console" type="b2602c69:ProjectViewProjectNode" />
<item name="app-manage-console" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="app-manage-console" type="b2602c69:ProjectViewProjectNode" />
<item name="app-manage-console" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="models" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="app-manage-console" type="b2602c69:ProjectViewProjectNode" />
<item name="app-manage-console" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="models" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="app-manage-console" type="b2602c69:ProjectViewProjectNode" />
<item name="app-manage-console" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="services" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="app-manage-console" type="b2602c69:ProjectViewProjectNode" />
<item name="app-manage-console" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="utils" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="HbShouldOpenHtmlAsHb" value="" />
<property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.standard" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.path.for.package.standard" value="project" />
<property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.eslint" value="$PROJECT_DIR$/node_modules/eslint" />
<property name="node.js.selected.package.standard" value="$PROJECT_DIR$/node_modules/eslint" />
<property name="node.js.selected.package.tslint" value="" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="/usr/local/bin/node" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="settings.javascript.linters.eslint" />
</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="npm.start">
<configuration name="lint" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="lint" />
</scripts>
<node-interpreter value="project" />
<envs />
</configuration>
<configuration name="start" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="start" />
</scripts>
<node-interpreter value="project" />
<envs />
</configuration>
<list>
<item itemvalue="npm.start" />
<item itemvalue="npm.lint" />
</list>
<recent_temporary>
<list>
<item itemvalue="npm.start" />
<item itemvalue="npm.lint" />
</list>
</recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="f3473cde-6bad-431d-8195-0b704f7cfba4" name="Default" comment="" />
<created>1544071389238</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1544071389238</updated>
<workItem from="1544071391093" duration="3544000" />
<workItem from="1544074982030" duration="1028000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="4572000" />
</component>
<component name="ToolWindowManager">
<frame x="-16" y="26" width="1440" height="806" extended-state="0" />
<layout>
<window_info anchor="right" id="GfmBrowser" order="3" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info active="true" anchor="bottom" id="Messages" visible="true" weight="0.32900432" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.2496474" />
<window_info id="npm" order="2" sideWeight="0.5032258" side_tool="true" visible="true" weight="0.24964234" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32756132" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32756132" />
<window_info anchor="bottom" id="RNConsole" order="7" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4967742" visible="true" weight="0.24964234" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection>
<UserGroup>
<option name="users">
<list>
<option value="scaffold/master" />
</list>
</option>
</UserGroup>
</collection>
</option>
<option name="FILTERS">
<map>
<entry key="branch">
<value>
<list>
<option value="scaffold/master" />
</list>
</value>
</entry>
</map>
</option>
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="1" />
<option value="2" />
<option value="3" />
</list>
</option>
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Merge remote-tracking branch 'scaffold/master'&#10;&#10;# Conflicts:&#10;#&#9;.roadhogrc.js&#10;#&#9;package.json&#10;#&#9;src/models/domain.js&#10;#&#9;src/models/main/index.js&#10;#&#9;src/router.js&#10;#&#9;src/routes/domain/index.js&#10;#&#9;src/routes/main/header.js&#10;&#10;更新到最新的脚手架" />
<option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'scaffold/master'&#10;&#10;# Conflicts:&#10;#&#9;.roadhogrc.js&#10;#&#9;package.json&#10;#&#9;src/models/domain.js&#10;#&#9;src/models/main/index.js&#10;#&#9;src/router.js&#10;#&#9;src/routes/domain/index.js&#10;#&#9;src/routes/main/header.js&#10;&#10;更新到最新的脚手架" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/deploy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="26" selection-start-line="4" selection-start-column="26" selection-end-line="4" selection-end-column="26" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/edit.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="43" selection-start-line="1" selection-start-column="43" selection-end-line="1" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="15" column="16" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="16" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/list.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="26" selection-start-column="26" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/main/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1155">
<caret line="77" selection-start-line="77" selection-end-line="77" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/main/modules/appManagement/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="42" column="41" selection-start-line="42" selection-start-column="41" selection-end-line="42" selection-end-column="41" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/add.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="43" selection-start-line="1" selection-start-column="43" selection-end-line="1" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/editDeploy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="51" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/addDeploy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="80" selection-start-line="5" selection-start-column="80" selection-end-line="5" selection-end-column="80" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="735">
<caret line="49" column="26" selection-start-line="49" selection-start-column="26" selection-end-line="49" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.roadhogrc.js" />
<entry file="file://$PROJECT_DIR$/.eslintrc">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40">
<caret line="32" column="51" selection-start-line="32" selection-start-column="51" selection-end-line="32" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/header.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="100" column="17" lean-forward="true" selection-start-line="100" selection-start-column="17" selection-end-line="100" selection-end-column="17" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/add.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="43" selection-start-line="1" selection-start-column="43" selection-end-line="1" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/addDeploy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="80" selection-start-line="5" selection-start-column="80" selection-end-line="5" selection-end-column="80" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/deploy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="26" selection-start-line="4" selection-start-column="26" selection-end-line="4" selection-end-column="26" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/edit.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="43" selection-start-line="1" selection-start-column="43" selection-end-line="1" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/editDeploy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="51" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="15" column="16" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="16" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/main/modules/appManagement/list.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="26" selection-start-column="26" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/main/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1155">
<caret line="77" selection-start-line="77" selection-end-line="77" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/main/modules/appManagement/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="42" column="41" selection-start-line="42" selection-start-column="41" selection-end-line="42" selection-end-column="41" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="41" column="27" selection-start-line="41" selection-start-column="27" selection-end-line="41" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="65" column="34" lean-forward="true" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/login/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-618">
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1603">
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#2916#5517#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1026">
<caret line="41" selection-start-line="41" selection-end-line="41" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/auth.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="7" lean-forward="true" selection-start-line="4" selection-start-column="7" selection-end-line="4" selection-end-column="7" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#84#126#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/helper.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="7" lean-forward="true" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#39#67#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/webpack.dev.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="15" selection-start-column="15" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" selection-start-line="2" selection-end-line="4" selection-end-column="39" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#20#59#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
......@@ -3,8 +3,7 @@ import { authorize, login, userInfo } from '../services/login';
import { validate as passValidate } from '../services/login/password';
import { requestCode, validate as ucaValidate } from '../services/login/uca';
import { encrypt } from '../utils/helper';
import { setToken, setUser, setDomain, histories } from '../utils/auth';
import { switchDomain, currentDomain } from '../services/domain';
import { setToken, setUser, histories } from '../utils/auth';
import { errors } from '../utils/error';
import config from '../utils/config';
import { getStore } from '../data/app';
......@@ -14,23 +13,11 @@ const successAuthed = async (tokenId, userName, remember) => {
await setToken(tokenId);
const uInfo = await userInfo();
await setUser(uInfo.id, uInfo.name);
const path = await histories.getLatest('domain', uInfo.id);
if (!path) {
getStore().dispatch(routerRedux.push('/domain'));
const latest = await histories.getLatest('module', uInfo.id);
if (latest && config.fastNavigationPage) {
getStore().dispatch(routerRedux.push('/fastNav'));
} else {
await switchDomain(path);
const domain = await currentDomain();
if (domain) {
await setDomain(domain.name, path);
const latest = await histories.getLatest('module', uInfo.id);
if (latest && config.fastNavigationPage) {
getStore().dispatch(routerRedux.push('/fastNav'));
} else {
getStore().dispatch(routerRedux.push('/main'));
}
} else {
getStore().dispatch(routerRedux.push('/domain'));
}
getStore().dispatch(routerRedux.push('/main'));
}
};
......
......@@ -41,11 +41,9 @@ export default {
throw new Error(response.message);
}
const uploadURL = response.data[0];
console.log(uploadURL);
yield put({ type: 'queryUploadURL', payload: uploadURL });
},
*addDeployApp({ payload: { values } }, { call, put }) {
console.log(values);
yield call(deployApp, values.idOrName, values.uri, values.description, values.release);
const name = values.idOrName;
yield put({ type: 'getAppInfo', payload: { name } });
......@@ -55,7 +53,6 @@ export default {
yield put({ type: 'getAppInfo', payload: { name } });
},
*editSaveDeploy({ payload: { values, name } }, { call, put }) {
console.log(values);
yield call(editDeployment, values.id, values.description, values.status);
yield put({ type: 'getAppInfo', payload: { name } });
},
......
......@@ -81,6 +81,7 @@ class HeaderPane extends React.Component {
}
render() {
const { dispatch, user, routes, params } = this.props;
const nRoutes = normRoutes(routes);
const userTitle = (
<span>
<Icon type="user" />
......
import React from 'react';
import { Button, Input, Form } from 'antd';
import { connect } from 'dva';
import styles from './add.less';
import { thisPush } from '../../../../services/route';
......@@ -74,4 +73,4 @@ class Add extends React.Component {
);
}
}
export default connect(({ appInfo, loading }) => ({ appInfo, loading }))(Form.create()(Add));
export default Form.create()(Add);
......@@ -4,7 +4,6 @@
import React from 'react';
import { uniqBy } from 'lodash';
import { Button, Input, Upload, Form, message, Icon, Modal, Radio } from 'antd';
import { connect } from 'dva';
import { encrypt } from '../../../../utils/helper';
import config from '../../../../utils/config';
import styles from './add.less';
......@@ -17,26 +16,24 @@ class AddDeploy extends React.Component {
state = {
descriptionInfo: '',
radioValue: false,
}
};
componentDidMount() {
this.props.dispatch({ type: 'appInfo/getTokens' });
}
onChangeInfo = (e) => {
this.setState({ descriptionInfo: e.target.value });
}
};
onCancel = () => {
const { value } = this.props.location.state;
console.log(value);
thisPush(this, { pathname: '../deploy', state: { value } });
}
};
onChange = (e) => {
this.setState({
radioValue: e.target.value,
});
}
};
onSubmit = () => {
const { descriptionInfo, radioValue } = this.state;
console.log(radioValue);
const { value } = this.props.location.state;
const { uploadURL } = this.props.appInfo;
const name = value.name;
......@@ -128,7 +125,7 @@ class AddDeploy extends React.Component {
<Button type="primary" icon="check" onClick={this.onSubmit}>提交</Button>
<Button type="primary" icon="close" onClick={this.onCancel}>取消</Button>
<Upload {...props}>
<Button type="primary" >
<Button type="primary">
<Icon type="upload" /> 选择上传
</Button>
</Upload>
......@@ -138,4 +135,4 @@ class AddDeploy extends React.Component {
);
}
}
export default connect(({ appInfo, loading }) => ({ appInfo, loading }))(Form.create()(AddDeploy));
export default Form.create()(AddDeploy);
......@@ -3,7 +3,6 @@
* Created by zhouhuan on 2017/11/21.
*/
import React from 'react';
import { connect } from 'dva';
import QRcode from 'qrcode';
import { Button, Table, Popconfirm, Modal } from 'antd';
import config from '../../../../utils/config';
......@@ -12,12 +11,47 @@ import styles from './list.less';
import { thisPush } from '../../../../services/route';
class Deploy extends React.Component {
static makeColumns() {
return [{
title: 'ID',
dataIndex: 'id',
}, {
title: '更新时间',
dataIndex: 'updateTime',
}, {
title: '状态',
dataIndex: 'status',
}, {
title: '版本号',
dataIndex: 'versionNumber',
}, {
title: '描述',
dataIndex: 'description',
}, {
title: 'uri',
dataIndex: 'uri',
}, {
title: '操作',
dataIndex: 'operation',
render: (text, record, index) => (
<span>
<span className="ant-divider" />
<a onClick={() => this.onEdit(record, index)}>Edit</a>
<span className="ant-divider" />
<Popconfirm title="确定删除?" okText="Yes" cancelText="No" onConfirm={() => this.onDelete(record, index)}>
<a>Delete</a>
</Popconfirm>
<span className="ant-divider" />
<a onClick={() => this.onQrcode(record, index)}>qrcode</a>
</span>
),
}];
}
state = {
values: '',
urls: '',
visible: false,
completeUrl: '',
}
};
componentDidMount() {
this.props.dispatch({ type: 'appInfo/getTokens' });
const { value } = this.props.location.state;
......@@ -25,7 +59,6 @@ class Deploy extends React.Component {
this.props.dispatch({ type: 'appInfo/getAppInfo', payload: { name: value.name } });
}
onDelete = (record) => {
console.log(record);
const id = record.id;
const { value } = this.props.location.state;
this.props.dispatch({ type: 'appInfo/removeDeployApp', payload: { id, name: value.name } });
......@@ -45,64 +78,25 @@ class Deploy extends React.Component {
this.setState({ completeUrl });
// console.log(completeUrl);
QRcode.toDataURL(completeUrl, (err, url) => {
const qrcodeUrl = url;
this.setState({ urls: qrcodeUrl, visible: true });
this.setState({ urls: url, visible: true });
});
// const w = window.open('about:blank');
// w.location.href = URL;
};
onClick = () => {
const { value } = this.props.location.state;
console.log(value);
thisPush(this, { pathname: '../addDeploy', state: { value } });
};
handleOk = () => {
this.setState({
visible: false,
});
}
};
handleCancel = () => {
this.setState({
visible: false,
});
}
makeColumns() {
const columns = [{
title: 'ID',
dataIndex: 'id',
}, {
title: '更新时间',
dataIndex: 'updateTime',
}, {
title: '状态',
dataIndex: 'status',
}, {
title: '版本号',
dataIndex: 'versionNumber',
}, {
title: '描述',
dataIndex: 'description',
}, {
title: 'uri',
dataIndex: 'uri',
}, {
title: '操作',
dataIndex: 'operation',
render: (text, record, index) => (
<span>
<span className="ant-divider" />
<a onClick={() => this.onEdit(record, index)}>Edit</a>
<span className="ant-divider" />
<Popconfirm title="确定删除?" okText="Yes" cancelText="No"onConfirm={() => this.onDelete(record, index)}>
<a>Delete</a>
</Popconfirm>
<span className="ant-divider" />
<a onClick={() => this.onQrcode(record, index)}>qrcode</a>
</span>
),
}];
return columns;
}
};
render() {
const { allAppInfo } = this.props.appInfo;
const { urls, visible, completeUrl } = this.state;
......@@ -111,7 +105,7 @@ class Deploy extends React.Component {
allAppInfo.map(({ history }) => {
data = history.map(({ id, updateTime, status, versionNumber, description, uri }) => {
const date = (new Date(updateTime)).toLocaleString();
const info = {
return {
key: updateTime,
id,
updateTime: date,
......@@ -120,7 +114,6 @@ class Deploy extends React.Component {
description,
uri,
};
return info;
});
return data;
});
......@@ -132,7 +125,7 @@ class Deploy extends React.Component {
<Button type="primary" icon="plus" onClick={this.onClick}>新增</Button>
</div>
<div className={styles.divTable}>
<Table columns={this.makeColumns()} dataSource={data} />
<Table columns={Deploy.makeColumns()} dataSource={data} />
</div>
<div>
<Modal
......@@ -143,7 +136,7 @@ class Deploy extends React.Component {
footer={null}
>
<div style={{ textAlign: 'center' }}>
<img src={urls} />
<img src={urls} alt="二维码" />
<div>
<a href={completeUrl} className={styles.a}>{completeUrl}</a>
</div>
......@@ -156,5 +149,5 @@ class Deploy extends React.Component {
}
}
export default connect(({ appInfo, loading }) => ({ appInfo, loading }))(Deploy);
export default Deploy;
import React from 'react';
import { Button, Input, Form } from 'antd';
import { connect } from 'dva';
import styles from './add.less';
import { thisPush } from '../../../../services/route';
......@@ -87,4 +86,4 @@ class Edit extends React.Component {
);
}
}
export default connect(({ appInfo, loading }) => ({ appInfo, loading }))(Form.create()(Edit));
export default Form.create()(Edit);
......@@ -3,7 +3,6 @@
*/
import React from 'react';
import { Button, Input, Select, Form } from 'antd';
import { connect } from 'dva';
import styles from './add.less';
import { thisPush } from '../../../../services/route';
......@@ -11,19 +10,13 @@ const FormItem = Form.Item;
const { TextArea } = Input;
const Option = Select.Option;
class EditDeploy extends React.Component {
state = {
descriptionInfo: '',
}
componentDidMount() {
// this.props.dispatch({ type: 'appInfo/getTokens' });
}
onChangeInfo = (e) => {
this.setState({ descriptionInfo: e.target.value });
}
onCancel = () => {
const { value } = this.props.location.state;
thisPush(this, { pathname: '../deploy', state: { value } });
}
};
handleSubmit = (e) => {
e.preventDefault();
this.props.form.validateFields((err, values) => {
......@@ -33,7 +26,7 @@ class EditDeploy extends React.Component {
thisPush(this, { pathname: '../deploy', state: { value } });
}
});
}
};
render() {
const { getFieldDecorator } = this.props.form;
const { record } = this.props.location.state;
......@@ -98,4 +91,4 @@ class EditDeploy extends React.Component {
);
}
}
export default connect(({ appInfo, loading }) => ({ appInfo, loading }))(Form.create()(EditDeploy));
export default Form.create()(EditDeploy);
/**
* Created by zhouhuan on 2017/11/20.
*/
import { connect } from 'dva';
import { withRouter } from 'dva/router';
import List from './list';
import Add from './add';
import Edit from './edit';
......@@ -10,38 +8,43 @@ import Deploy from './deploy';
import AddDeploy from './addDeploy';
import EditDeploy from './editDeploy';
import route from '../../../../components/hoc/routes';
import model from '../../../../models/main/modules/appManagement';
export default connect(({ appManagement }) => ({ appManagement }))(route({
childRoutes: [
{
path: 'list',
name: '列表',
component: withRouter(List, { withRef: true }),
},
{
path: 'add',
name: '新增',
component: withRouter(Add, { withRef: true }),
},
{
path: 'edit',
name: '新增',
component: withRouter(Edit, { withRef: true }),
},
{
path: 'deploy',
name: '部署',
component: withRouter(Deploy, { withRef: true }),
},
{
path: 'addDeploy',
name: '新增部署信息',
component: withRouter(AddDeploy, { withRef: true }),
},
{
path: 'editDeploy',
name: '编辑部署信息',
component: withRouter(EditDeploy, { withRef: true }),
},
],
}));
// noinspection JSUnusedGlobalSymbols
export default (binder) => {
const connect = binder(model);
return route({
childRoutes: [
{
path: 'list',
name: '列表',
component: connect(({ appInfo, loading }) => ({ appInfo, loading }))(List),
},
{
path: 'add',
name: '新增',
component: connect(({ appInfo, loading }) => ({ appInfo, loading }))(Add),
},
{
path: 'edit',
name: '新增',
component: connect(({ appInfo, loading }) => ({ appInfo, loading }))(Edit),
},
{
path: 'deploy',
name: '部署',
component: connect(({ appInfo, loading }) => ({ appInfo, loading }))(Deploy),
},
{
path: 'addDeploy',
name: '新增部署信息',
component: connect(({ appInfo, loading }) => ({ appInfo, loading }))(AddDeploy),
},
{
path: 'editDeploy',
name: '编辑部署信息',
component: connect(({ appInfo, loading }) => ({ appInfo, loading }))(EditDeploy),
},
],
});
};
import React from 'react';
import { connect } from 'dva';
import { Button, Table, Popconfirm } from 'antd';
import styles from './list.less';
import { thisPush } from '../../../../services/route';
class List extends React.Component {
state = {
values: '',
}
componentDidMount() {
this.props.dispatch({ type: 'appInfo/getAppInfo', payload: { name: '' } });
}
onDelete = (record) => {
const name = record.name;
this.props.dispatch({ type: 'appInfo/delAppInfo', payload: { name } });
};
onEdit = (record) => {
console.log(record);
thisPush(this, { pathname: '../edit', state: { value: record } });
};
onDeploy = (record) => {
thisPush(this, { pathname: '../deploy', state: { value: record } });
this.props.dispatch({ type: 'appInfo/saveRecord', payload: { record } });
};
onClick = () => {
thisPush(this, { pathname: '../add', state: { value: '' } });
};
makeColumns() {
const columns = [{
static makeColumns() {
return [{
title: '创建时间',
dataIndex: 'createTime',
}, {
......@@ -47,7 +25,7 @@ class List extends React.Component {
<span className="ant-divider" />
<a onClick={() => this.onEdit(record, index)}>Edit</a>
<span className="ant-divider" />
<Popconfirm title="确定删除?" okText="Yes" cancelText="No"onConfirm={() => this.onDelete(record, index)}>
<Popconfirm title="确定删除?" okText="Yes" cancelText="No" onConfirm={() => this.onDelete(record, index)}>
<a>Delete</a>
</Popconfirm>
<span className="ant-divider" />
......@@ -55,20 +33,35 @@ class List extends React.Component {
</span>
),
}];
return columns;
}
componentDidMount() {
this.props.dispatch({ type: 'appInfo/getAppInfo', payload: { name: '' } });
}
onDelete = (record) => {
const name = record.name;
this.props.dispatch({ type: 'appInfo/delAppInfo', payload: { name } });
};
onEdit = (record) => {
thisPush(this, { pathname: '../edit', state: { value: record } });
};
onDeploy = (record) => {
thisPush(this, { pathname: '../deploy', state: { value: record } });
this.props.dispatch({ type: 'appInfo/saveRecord', payload: { record } });
};
onClick = () => {
thisPush(this, { pathname: '../add', state: { value: '' } });
};
render() {
const { allAppInfo } = this.props.appInfo;
const data = allAppInfo.map(({ createTime, name, packageName, description }) => {
const date = (new Date(createTime)).toLocaleString();
const info = {
return {
key: createTime,
createTime: date,
name,
packageName,
description,
};
return info;
});
return (
<div className={styles.wrapper}>
......@@ -77,7 +70,7 @@ class List extends React.Component {
<Button type="primary" icon="plus" onClick={this.onClick}>添加</Button>
</div>
<div className={styles.divTable}>
<Table columns={this.makeColumns()} dataSource={data} />
<Table columns={List.makeColumns()} dataSource={data} />
</div>
</div>
</div>
......@@ -85,5 +78,5 @@ class List extends React.Component {
}
}
export default connect(({ appInfo, loading }) => ({ appInfo, loading }))(List);
export default List;
/** @module app */
import _ from 'lodash';
import isNumber from 'lodash/isNumber';
import isFinite from 'lodash/isFinite';
import isString from 'lodash/isString';
import request from '../utils/request';
import post from '../utils/post';
import config from '../utils/config';
const { isNumber, isFinite, isString } = _;
/**
* @typedef {Object} RestResponse
* @template T
......
......@@ -63,7 +63,7 @@ const config = {
basename,
contextPath,
apiContextPath,
productId: 'big-machine-web-front',
productId: 'app-manage-console',
fastNavigationPage: '',
defaultDateFormat,
defaultTimeFormat,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论