Merge branch 'dev' of http://code.pacsonline.cn/zskk_bg/yuanchengpasc into pro

.idea/workspace.xml

@@ -25,7 +25,7 @@
       <file leaf-file-name="Upgrade.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.45913044">
+            <state vertical-scroll-proportion="0.375969">
               <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
               <folding>
                 <element signature="e#36#62#0#PHP" expanded="true" />
@@ -34,36 +34,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="createversion" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/createversion">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="4" column="54" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Db.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Db.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-14.903226">
-              <caret line="30" column="3" selection-start-line="30" selection-start-column="3" selection-end-line="30" selection-end-column="3" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="version1" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/common/versionsql/version1">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="0" column="0" 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="Registerlist.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -326,6 +296,80 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="application" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="common" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="versionsql" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="application" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="common" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="application" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="admin" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="command" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="yczd" />
@@ -766,29 +810,25 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
+    <entry file="file://$USER_HOME$/Desktop/version.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-30.516129">
-          <caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
-          <folding>
-            <marker date="1542944172383" expanded="true" signature="5524:5779" placeholder="SELECT e.id,... exams" />
-            <marker date="1542944172383" expanded="true" signature="5810:6116" placeholder="SELECT e.id,... exams" />
-            <marker date="1542944172383" expanded="true" signature="7040:7168" placeholder="SELECT count... exams" />
-          </folding>
+        <state vertical-scroll-proportion="0.72">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="40" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/Desktop/version.sql">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/createversion">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.72">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="40" />
+        <state vertical-scroll-proportion="0.14521453">
+          <caret line="4" column="54" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Db.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.903226">
+        <state vertical-scroll-proportion="0.80347824">
           <caret line="30" column="3" selection-start-line="30" selection-start-column="3" selection-end-line="30" selection-end-column="3" />
           <folding />
         </state>
@@ -802,17 +842,21 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/createversion">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="4" column="54" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
-          <folding />
+        <state vertical-scroll-proportion="-30.516129">
+          <caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
+          <folding>
+            <marker date="1542944172383" expanded="true" signature="5524:5779" placeholder="SELECT e.id,... exams" />
+            <marker date="1542944172383" expanded="true" signature="5810:6116" placeholder="SELECT e.id,... exams" />
+            <marker date="1542944172383" expanded="true" signature="7040:7168" placeholder="SELECT count... exams" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.45913044">
+        <state vertical-scroll-proportion="0.375969">
           <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
           <folding>
             <element signature="e#36#62#0#PHP" expanded="true" />

application/admin/command/Upgrade.php

@@ -18,7 +18,7 @@ class Upgrade extends Command
     protected function execute(Input $input, Output $output)
     {
         // 没有版本表格的话  读取 创建
-        $ve = file_get_contents(__DIR__."\\..\\..\\common\\versionsql\\createversion");
+        $ve = file_get_contents(__DIR__."/../../common/versionsql/createversion");
         DB::execute($ve);
         // 旧版本号
         $version = DB::table('version')->where('id',1)->field('version')->find();
@@ -37,8 +37,8 @@ class Upgrade extends Command
             for($version['version'];$version['version'] < $oldversion;$version['version']++){
                 $name = "Version".$version['version'];
                 $output->writeln("版本更新中...");
-                if(file_exists(__DIR__."\\..\\..\\common\\versionsql\\".$name)){
-                    $info = file_get_contents(__DIR__."\\..\\..\\common\\versionsql\\".$name);
+                if(file_exists(__DIR__."/../../common/versionsql/".$name)){
+                    $info = file_get_contents(__DIR__."/../../common/versionsql/".$name);
                     if(empty($info)){
                         $output->writeln("找到版本文件");
                         continue;