zhuliang 7 vuotta sitten
vanhempi
commit
5ad62b71e8

frontend/.idea/frontend_resource.iml → .idea/ApiSys.iml


+ 1 - 1
frontend/.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/frontend_resource.iml" filepath="$PROJECT_DIR$/.idea/frontend_resource.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/ApiSys.iml" filepath="$PROJECT_DIR$/.idea/ApiSys.iml" />
     </modules>
   </component>
 </project>

+ 6 - 0
.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>

+ 1 - 1
backend/Server/Web/Module/ProjectModule.class.php

@@ -258,7 +258,7 @@ class ProjectModule
         $dao = new ProjectDao();
         if ($dao->checkProjectPermission($projectID, $_SESSION['userID'])) {
             $dumpJson = json_encode($dao->dumpProject($projectID));
-            $fileName = 'eoLinker_dump_' . $_SESSION['userName'] . '_' . time() . '.export';
+            $fileName = 'apims_dump_' . $_SESSION['userName'] . '_' . time() . '.export';
             if (file_put_contents(realpath('./dump') . DIRECTORY_SEPARATOR . $fileName, $dumpJson)) {
                 //将操作写入日志
                 $log_dao = new ProjectLogDao();

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 2
backend/dump/eoLinker_backup_database_1513583873.sql


+ 0 - 6
frontend/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

+ 0 - 414
frontend/.idea/workspace.xml

@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="822d9b5f-9116-4744-acec-241373bc6cd3" name="Default" comment="" />
-    <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="index.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/app/component/navbar/nav1/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="12" column="17" lean-forward="false" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/app/component/content/index/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="59">
-              <caret line="5" column="103" lean-forward="false" selection-start-line="5" selection-start-column="103" selection-end-line="5" selection-end-column="103" />
-              <folding>
-                <element signature="n#style#0;n#img#0;n#header#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#header#0;n#div#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="config.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gulp/config.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="server.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gulp/server.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="72" column="35" lean-forward="false" selection-start-line="72" selection-start-column="35" selection-end-line="72" selection-end-column="35" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/app/component/navbar/nav2/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="219">
-              <caret line="22" column="50" lean-forward="false" selection-start-line="22" selection-start-column="50" selection-end-line="22" selection-end-column="50" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/app/component/footer/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="38">
-              <caret line="2" column="154" lean-forward="false" selection-start-line="2" selection-start-column="154" selection-end-line="2" selection-end-column="154" />
-              <folding>
-                <element signature="e#360#366#0" expanded="true" />
-                <element signature="e#370#376#0" expanded="true" />
-                <element signature="e#376#382#0" expanded="true" />
-                <element signature="e#402#408#0" expanded="true" />
-                <element signature="e#408#414#0" expanded="true" />
-                <element signature="e#415#421#0" expanded="true" />
-                <element signature="e#421#427#0" expanded="true" />
-                <element signature="e#443#449#0" expanded="true" />
-                <element signature="e#449#455#0" expanded="true" />
-                <element signature="e#456#462#0" expanded="true" />
-                <element signature="e#462#468#0" expanded="true" />
-                <element signature="e#481#487#0" expanded="true" />
-                <element signature="e#487#493#0" expanded="true" />
-                <element signature="e#494#500#0" expanded="true" />
-                <element signature="e#500#506#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="trans.constants.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/app/constant/trans.constants.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="38717">
-              <caret line="2745" column="28" lean-forward="false" selection-start-line="2745" selection-start-column="28" selection-end-line="2745" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/app/modal/branch/common/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="439" column="52" lean-forward="false" selection-start-line="439" selection-start-column="52" selection-end-line="439" selection-end-column="52" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/app/component/sidebar/index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="788">
-              <caret line="69" column="22" lean-forward="false" selection-start-line="69" selection-start-column="22" selection-end-line="69" selection-end-column="22" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>eolinker_sim</find>
-      <find>logo_sim</find>
-      <find>2104</find>
-      <find>2205</find>
-      <find>'2205'|translate</find>
-      <find>eoLinker开源版本</find>
-      <find>'2101'|translate</find>
-      <find>2101</find>
-      <find>版本更新</find>
-      <find>'500'|translate</find>
-      <find>导入数据字典</find>
-      <find>010015</find>
-      <find>&quot;eolinker&quot;</find>
-      <find>eolinker</find>
-      <find>mysql-js</find>
-      <find>&lt;p&gt;eolineker&lt;/p&gt;</find>
-      <find>postman v1</find>
-      <find>该开源网站由</find>
-      <find>'1000'|translate</find>
-      <find>开源版本3</find>
-      <find>'0200'|translate</find>
-      <find>git.xmz</find>
-      <find>eolinker示例</find>
-      <find>www.eoapi.cn/api/demo</find>
-    </findStrings>
-    <dirStrings>
-      <dir>$PROJECT_DIR$</dir>
-    </dirStrings>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/app/constant/trans.constants.js" />
-        <option value="$PROJECT_DIR$/src/app/component/sidebar/index.js" />
-        <option value="$PROJECT_DIR$/src/app/component/navbar/nav2/index.html" />
-        <option value="$PROJECT_DIR$/src/app/modal/branch/common/index.html" />
-        <option value="$PROJECT_DIR$/gulp/server.js" />
-        <option value="$PROJECT_DIR$/src/app/component/footer/index.html" />
-        <option value="$PROJECT_DIR$/src/app/component/content/index/index.html" />
-        <option value="$PROJECT_DIR$/src/app/component/navbar/nav1/index.html" />
-        <option value="$PROJECT_DIR$/eolinker/server/dump/eoLinker_backup_database_1513583873.sql" />
-      </list>
-    </option>
-  </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="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <gulpfiles>
-      <GulpfileState>
-        <gulpfile-path>$PROJECT_DIR$/gulpfile.js</gulpfile-path>
-      </GulpfileState>
-    </gulpfiles>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="NodeModulesDirectoryManager">
-    <handled-path value="$PROJECT_DIR$/node_modules" />
-  </component>
-  <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
-    <option name="width" value="1440" />
-    <option name="height" value="809" />
-  </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="Scratches" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="frontend_resource" type="b2602c69:ProjectViewProjectNode" />
-              <item name="frontend_resource" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-            <path>
-              <item name="frontend_resource" type="b2602c69:ProjectViewProjectNode" />
-              <item name="frontend_resource" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="gulp" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path" value="/usr/local/bin/node" />
-    <property name="HbShouldOpenHtmlAsHb" value="" />
-  </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="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="822d9b5f-9116-4744-acec-241373bc6cd3" name="Default" comment="" />
-      <created>1523685281288</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1523685281288</updated>
-      <workItem from="1523685282842" duration="5181000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="5181000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1440" height="809" extended-state="0" />
-    <layout>
-      <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.33" 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="false" 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="Terminal" 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="Gulp" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Database" active="false" anchor="right" 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="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="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="Debug" 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="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="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$/src/app/iconfont.scss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="13" column="2" lean-forward="false" selection-start-line="13" selection-start-column="2" selection-end-line="13" selection-end-column="2" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/app/component/navbar/nav0/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="6" column="10" lean-forward="false" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/app/component/sidebar/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="788">
-          <caret line="69" column="22" lean-forward="false" selection-start-line="69" selection-start-column="22" selection-end-line="69" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/app/modal/branch/common/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="439" column="52" lean-forward="false" selection-start-line="439" selection-start-column="52" selection-end-line="439" selection-end-column="52" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/app/constant/trans.constants.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38717">
-          <caret line="2745" column="28" lean-forward="false" selection-start-line="2745" selection-start-column="28" selection-end-line="2745" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gulp/config.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$/src/app/component/footer/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="2" column="154" lean-forward="false" selection-start-line="2" selection-start-column="154" selection-end-line="2" selection-end-column="154" />
-          <folding>
-            <element signature="e#360#366#0" expanded="true" />
-            <element signature="e#370#376#0" expanded="true" />
-            <element signature="e#376#382#0" expanded="true" />
-            <element signature="e#402#408#0" expanded="true" />
-            <element signature="e#408#414#0" expanded="true" />
-            <element signature="e#415#421#0" expanded="true" />
-            <element signature="e#421#427#0" expanded="true" />
-            <element signature="e#443#449#0" expanded="true" />
-            <element signature="e#449#455#0" expanded="true" />
-            <element signature="e#456#462#0" expanded="true" />
-            <element signature="e#462#468#0" expanded="true" />
-            <element signature="e#481#487#0" expanded="true" />
-            <element signature="e#487#493#0" expanded="true" />
-            <element signature="e#494#500#0" expanded="true" />
-            <element signature="e#500#506#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gulp/server.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="72" column="35" lean-forward="false" selection-start-line="72" selection-start-column="35" selection-end-line="72" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/app/component/navbar/nav2/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="219">
-          <caret line="22" column="50" lean-forward="false" selection-start-line="22" selection-start-column="50" selection-end-line="22" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/app/component/content/index/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="59">
-          <caret line="5" column="103" lean-forward="false" selection-start-line="5" selection-start-column="103" selection-end-line="5" selection-end-column="103" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#header#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#header#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/eolinker/server/dump/eoLinker_backup_database_1513583873.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="348">
-          <caret line="53" column="31" lean-forward="true" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/app/component/navbar/nav1/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="12" column="17" lean-forward="false" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>

+ 2 - 2
frontend/eolinker/index.html

@@ -2,11 +2,11 @@
     var allowRegister = true;   
     var allowUpdate = true;   
     var language = 'zh-cn';   
-    </script><meta name="renderer" content="webkit"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><link rel="stylesheet" href="styles/app-c4d197f1f2.css"></head><!--[if lt IE 8]>
+    </script><meta name="renderer" content="webkit"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><link rel="stylesheet" href="styles/app-6fe250dcda.css"></head><!--[if lt IE 8]>
  <style>html,body{overflow:hidden;height:100%}</style>
  <div class="tb-ie-updater-layer"></div>
  <div class="tb-ie-updater-box" data-spm="20161112">
  <a href="https://www.google.cn/intl/zh-CN/chrome/browser/desktop/" class="tb-ie-updater-google" target="_blank" data-spm-click="gostr=/tbieupdate;locaid=d1;name=google">谷歌 Chrome</a>
  <a href="http://www.uc.cn/ucbrowser/download/" class="tb-ie-updater-uc" target="_blank" data-spm-click="gostr=/tbieupdate20161112;locaid=d2;name=uc">UC 浏览器</a>"
  </div>
- <![endif]--><body><div ui-view=""></div><eo-modal></eo-modal></body><script src="scripts/app-29096d1ff4.js"></script></html>
+ <![endif]--><body><div ui-view=""></div><eo-modal></eo-modal></body><script src="scripts/app-eefa280d48.js"></script></html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 12 - 13
frontend/eolinker/scripts/app-29096d1ff4.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
frontend/eolinker/styles/app-6fe250dcda.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
frontend/eolinker/styles/app-c4d197f1f2.css


+ 28 - 22
frontend/src/app/component/content/home/content/project/content/inside/content/overview/index.html

@@ -79,24 +79,24 @@
                 </li>
             </ul>
         </div>
-        <p class="item-p" ng-if="$ctrl.data.interaction.response.projectInfo.userType<3">{{'0121428'|translate}}</p>
-        <div class="item-div special-div" ng-if="$ctrl.data.interaction.response.projectInfo.userType<3">
-            <ul>
-                <li class="pull-left first-li" ng-class="{'only-li':$ctrl.data.interaction.response.projectInfo.userType>1}" ng-click="$ctrl.data.service.common.overviewObject.fun.autoGeneration($ctrl.data.interaction.response.projectInfo)" ng-if="$ctrl.data.interaction.response.projectInfo.userType<3">
-                    <p class="title-p">
-                        <label class="iconfont icon-jiqirendaan"></label>
-                        {{'0121429'|translate}}
-                    </p>
-                    <p class="desc-p">{{'0121430'|translate}}</p>
-                </li>
-                <li class="pull-left center-li"  ng-click="$ctrl.data.fun.menu({switch:3})" >
-                    <p class="title-p">
-                        <label class="iconfont icon-shandian"></label>&nbsp;<span>{{'0121431'|translate}}</span>
-                    </p>
-                    <p class="desc-p">{{'0121432'|translate}}</p>
-                </li>
-            </ul>
-        </div>
+        <!--<p class="item-p" ng-if="$ctrl.data.interaction.response.projectInfo.userType<3">{{'0121428'|translate}}</p>-->
+        <!--<div class="item-div special-div" ng-if="$ctrl.data.interaction.response.projectInfo.userType<3">-->
+            <!--<ul>-->
+                <!--<li class="pull-left first-li" ng-class="{'only-li':$ctrl.data.interaction.response.projectInfo.userType>1}" ng-click="$ctrl.data.service.common.overviewObject.fun.autoGeneration($ctrl.data.interaction.response.projectInfo)" ng-if="$ctrl.data.interaction.response.projectInfo.userType<3">-->
+                    <!--<p class="title-p">-->
+                        <!--<label class="iconfont icon-jiqirendaan"></label>-->
+                        <!--{{'0121429'|translate}}-->
+                    <!--</p>-->
+                    <!--<p class="desc-p">{{'0121430'|translate}}</p>-->
+                <!--</li>-->
+                <!--<li class="pull-left center-li"  ng-click="$ctrl.data.fun.menu({switch:3})" >-->
+                    <!--<p class="title-p">-->
+                        <!--<label class="iconfont icon-shandian"></label>&nbsp;<span>{{'0121431'|translate}}</span>-->
+                    <!--</p>-->
+                    <!--<p class="desc-p">{{'0121432'|translate}}</p>-->
+                <!--</li>-->
+            <!--</ul>-->
+        <!--</div>-->
         <p class="item-p" ng-if="$ctrl.data.interaction.response.projectInfo.userType<2">{{'0121415'|translate}}</p>
         <div class="item-div forth-div" ng-if="$ctrl.data.interaction.response.projectInfo.userType<2">
             <ul>
@@ -107,13 +107,19 @@
                     </p>
                     <p class="desc-p">{{'0121417'|translate}}</p>
                 </li>
-                <li class=" pull-left first-li" ng-click="$ctrl.data.fun.backups()">
+                <li class="pull-left center-li"  ng-click="$ctrl.data.fun.menu({switch:3})" >
                     <p class="title-p">
-                        <label class="iconfont icon-xiazai"></label>
-                        {{'0121433'|translate}}
+                        <label class="iconfont icon-shandian"></label>&nbsp;<span>{{'0121431'|translate}}</span>
                     </p>
-                    <p class="desc-p">{{'0121434'|translate}}</p>
+                    <p class="desc-p">{{'0121432'|translate}}</p>
                 </li>
+                <!--<li class=" pull-left first-li" ng-click="$ctrl.data.fun.backups()">-->
+                    <!--<p class="title-p">-->
+                        <!--<label class="iconfont icon-xiazai"></label>-->
+                        <!--{{'0121433'|translate}}-->
+                    <!--</p>-->
+                    <!--<p class="desc-p">{{'0121434'|translate}}</p>-->
+                <!--</li>-->
             </ul>
         </div>
     </div>

+ 39 - 39
frontend/src/app/index.scss

@@ -16,15 +16,19 @@
 
 @import "component/content/index.scss";
 
-@import "component/sidebar/index.scss";
+@import "component/footer/index.scss";
 
 @import "component/navbar/index.scss";
 
-@import "component/footer/index.scss";
+@import "component/sidebar/index.scss";
+
+@import "directive/expressionBuilder/index.scss";
 
 @import "directive/tip/index.scss";
 
-@import "directive/expressionBuilder/index.scss";
+@import "component/common/sidebar/index.scss";
+
+@import "component/common/group/index.scss";
 
 @import "component/ams/autoComplete/index.scss";
 
@@ -34,37 +38,33 @@
 
 @import "component/content/guide/index.scss";
 
+@import "component/content/home/index.scss";
+
+@import "component/content/index/index.scss";
+
 @import "component/navbar/nav0/index.scss";
 
 @import "component/navbar/nav1/index.scss";
 
 @import "component/navbar/nav2/index.scss";
 
-@import "component/content/index/index.scss";
-
-@import "component/content/home/index.scss";
-
 @import "directive/ams/aceEditor/index.scss";
 
-@import "component/common/sidebar/index.scss";
-
-@import "component/common/group/index.scss";
-
 @import "modal/branch/apiManagement/index.scss";
 
 @import "modal/branch/common/index.scss";
 
-@import "component/content/guide/lang/index.scss";
+@import "component/content/guide/error/index.scss";
 
-@import "component/content/guide/second_step/index.scss";
+@import "component/content/guide/finish/index.scss";
 
-@import "component/content/guide/third_step/index.scss";
+@import "component/content/guide/first_step/index.scss";
 
-@import "component/content/guide/error/index.scss";
+@import "component/content/guide/lang/index.scss";
 
-@import "component/content/guide/first_step/index.scss";
+@import "component/content/guide/second_step/index.scss";
 
-@import "component/content/guide/finish/index.scss";
+@import "component/content/guide/third_step/index.scss";
 
 @import "component/content/register/content/default/index.scss";
 
@@ -76,66 +76,66 @@
 
 @import "component/content/home/content/database/content/default/index.scss";
 
+@import "component/content/home/content/database/content/inside/index.scss";
+
 @import "component/content/home/content/project/content/api/import.scss";
 
 @import "component/content/home/content/project/content/api/index.scss";
 
-@import "component/content/home/content/database/content/inside/index.scss";
-
 @import "component/content/home/content/project/content/inside/index.scss";
 
-@import "component/content/home/content/project/content/inside/sidebar/index.scss";
-
 @import "component/content/home/content/database/content/inside/sidebar/index.scss";
 
-@import "component/content/home/content/project/content/api/content/_default/index.scss";
+@import "component/content/home/content/project/content/inside/sidebar/index.scss";
+
+@import "component/content/home/content/database/content/inside/content/table/index.scss";
 
 @import "component/content/home/content/database/content/inside/content/team/index.scss";
 
-@import "component/content/home/content/database/content/inside/content/table/index.scss";
+@import "component/content/home/content/project/content/api/content/_default/index.scss";
 
 @import "component/content/home/content/project/content/inside/content/api/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/env/index.scss";
+@import "component/content/home/content/project/content/inside/content/doc/index.scss";
 
 @import "component/content/home/content/project/content/inside/content/log/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/team/index.scss";
+@import "component/content/home/content/project/content/inside/content/env/index.scss";
 
 @import "component/content/home/content/project/content/inside/content/overview/index.scss";
 
-@import "component/content/home/content/project/content/inside/sidebar/api/index.scss";
+@import "component/content/home/content/project/content/inside/content/team/index.scss";
 
 @import "component/content/home/content/project/content/inside/sidebar/code/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/doc/index.scss";
+@import "component/content/home/content/project/content/inside/sidebar/api/index.scss";
 
 @import "component/content/home/content/database/content/inside/content/table/default/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/api/list/index.scss";
-
-@import "component/content/home/content/project/content/inside/content/api/mock/index.scss";
-
-@import "component/content/home/content/project/content/inside/content/api/test/index.scss";
+@import "component/content/home/content/project/content/inside/content/api/detail/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/test/default/index.scss";
+@import "component/content/home/content/project/content/inside/content/api/edit/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/api/detail/index.scss";
+@import "component/content/home/content/project/content/inside/content/api/history/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/test/api/index.scss";
+@import "component/content/home/content/project/content/inside/content/api/list/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/test/editSingal/index.scss";
+@import "component/content/home/content/project/content/inside/content/api/mock/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/code/list/index.scss";
+@import "component/content/home/content/project/content/inside/content/api/test/index.scss";
 
 @import "component/content/home/content/project/content/inside/content/doc/detail/index.scss";
 
 @import "component/content/home/content/project/content/inside/content/doc/edit/index.scss";
 
+@import "component/content/home/content/project/content/inside/content/code/list/index.scss";
+
 @import "component/content/home/content/project/content/inside/content/doc/list/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/api/history/index.scss";
+@import "component/content/home/content/project/content/inside/content/test/api/index.scss";
 
-@import "component/content/home/content/project/content/inside/content/api/edit/index.scss";
+@import "component/content/home/content/project/content/inside/content/test/default/index.scss";
+
+@import "component/content/home/content/project/content/inside/content/test/editSingal/index.scss";
 
 // endinjector

+ 4 - 4
frontend/src/app/modal/branch/common/index.html

@@ -427,7 +427,7 @@
                                 <li class="pull-left first-li">
                                     <input id="eolinker-js" type="file" name="" onchange="angular.element(this).scope().importFile({status:6,$file:this.files})" required>
                                     <a class="postman-1-a">
-                                        <p>eolinker</p>
+                                        <p>apims</p>
                                     </a>
                                 </li>
                             </ul>
@@ -543,13 +543,13 @@
                     <ul>
                         <li class="modal-export-info" ng-if="data.input.status">
                             <ul class="modal-btn-group-ul">
-                                <li class="pull-left first-li" dump-directive='data.fun.dumpDirective(arg)' interaction='{request:{text:"eolinker",switch:"export-"+data.input.status}}'>
+                                <li class="pull-left first-li" dump-directive='data.fun.dumpDirective(arg)' interaction='{request:{text:"apims",switch:"export-"+data.input.status}}'>
                                 </li>
                             </ul>
                         </li>
                         <li class="modal-export-info" ng-if="!data.input.status">
                             <ul class="modal-btn-group-ul">
-                                <li class="pull-left first-li" dump-directive='data.fun.dumpDirective(arg)' interaction='{request:{text:"eolinker",switch:"0"}}'>
+                                <li class="pull-left first-li" dump-directive='data.fun.dumpDirective(arg)' interaction='{request:{text:"apims",switch:"0"}}'>
                                 </li>
                             </ul>
                         </li>
@@ -578,7 +578,7 @@
                     <ul>
                         <li class="modal-export-info">
                             <ul class="modal-btn-group-ul">
-                                <li class="pull-left first-li" dump-directive='data.fun.dumpDirective(arg)' interaction='{request:{text:"eolinker",switch:"0"}}'>
+                                <li class="pull-left first-li" dump-directive='data.fun.dumpDirective(arg)' interaction='{request:{text:"apims",switch:"0"}}'>
                                 </li>
                             </ul>
                         </li>

+ 3 - 3
webroot/index.php

@@ -3,7 +3,7 @@ if (file_exists(realpath('./server/RTP/config/eo_config.php')))
     include_once('./server/RTP/config/eo_config.php');
 defined('ALLOW_REGISTER') or define('ALLOW_REGISTER', TRUE);
 defined('ALLOW_UPDATE') or define('ALLOW_UPDATE', TRUE);
-defined('WEBSITE_NAME') or define('WEBSITE_NAME', 'Api管理分享平台 | ZhuLiang\'s Shared');
+defined('WEBSITE_NAME') or define('WEBSITE_NAME', 'Api管理分享平台 | ZhuLiangs Shared');
 ?>
 <!DOCTYPE html>
 <html data-ng-app="eolinker">
@@ -19,7 +19,7 @@ defined('WEBSITE_NAME') or define('WEBSITE_NAME', 'Api管理分享平台 | ZhuLi
     <link href="assets/images/favicon.ico" rel="shortcut icon">
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <link rel="stylesheet" href="styles/app-c4d197f1f2.css">
+    <link rel="stylesheet" href="styles/app-6fe250dcda.css">
     <script>
         var allowRegister =<?php echo ALLOW_REGISTER ? 'true' : 'false'; ?>;
         var allowUpdate =<?php echo ALLOW_UPDATE ? 'true' : 'false'; ?>;
@@ -46,5 +46,5 @@ defined('WEBSITE_NAME') or define('WEBSITE_NAME', 'Api管理分享平台 | ZhuLi
 <eo-modal></eo-modal>
 </body>
 <script id="plug-inner-script"></script>
-<script src="scripts/app-29096d1ff4.js"></script>
+<script src="scripts/app-eefa280d48.js"></script>
 </html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 12 - 13
webroot/scripts/app-29096d1ff4.js


+ 1 - 1
webroot/server/Server/Web/Module/ProjectModule.class.php

@@ -258,7 +258,7 @@ class ProjectModule
         $dao = new ProjectDao();
         if ($dao->checkProjectPermission($projectID, $_SESSION['userID'])) {
             $dumpJson = json_encode($dao->dumpProject($projectID));
-            $fileName = 'eoLinker_dump_' . $_SESSION['userName'] . '_' . time() . '.export';
+            $fileName = 'apims_dump_' . $_SESSION['userName'] . '_' . time() . '.export';
             if (file_put_contents(realpath('./dump') . DIRECTORY_SEPARATOR . $fileName, $dumpJson)) {
                 //将操作写入日志
                 $log_dao = new ProjectLogDao();

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
webroot/server/dump/eoLinker_backup_database_1513583873.sql


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
webroot/styles/app-6fe250dcda.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
webroot/styles/app-c4d197f1f2.css