xiugai

.idea/workspace.xml

@@ -22,11 +22,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Upgrade.php" pinned="false" current-in-tab="false">
+      <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="-3.6451614">
-              <caret line="34" column="37" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
+            <state vertical-scroll-proportion="0.45913044">
+              <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" />
               </folding>
@@ -34,11 +34,31 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="version1" pinned="false" current-in-tab="true">
+      <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.18151815">
-              <caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
+            <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>
@@ -164,9 +184,10 @@
         <option value="$PROJECT_DIR$/application/inter/controller/Reciveremote.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
-        <option value="$PROJECT_DIR$/application/admin/command/Upgrade.php" />
         <option value="$USER_HOME$/Desktop/version.sql" />
         <option value="$PROJECT_DIR$/application/common/versionsql/version1" />
+        <option value="$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/createversion" />
+        <option value="$PROJECT_DIR$/application/admin/command/Upgrade.php" />
       </list>
     </option>
   </component>
@@ -414,13 +435,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/api/controller/Ems.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.22956522">
-          <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/common/library/Ems.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.4156522">
@@ -647,14 +661,6 @@
         </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="0.03826087">
-          <caret line="46" column="53" selection-start-line="46" selection-start-column="53" selection-end-line="46" selection-end-column="53" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Desktop/oss_callbacks.sql">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.17272727">
@@ -760,16 +766,6 @@
         </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="-3.6451614">
-          <caret line="34" column="37" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
-          <folding>
-            <element signature="e#36#62#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-30.516129">
@@ -790,14 +786,40 @@
         </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">
+          <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>
     <entry file="file://$PROJECT_DIR$/application/common/versionsql/version1">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.18151815">
-          <caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
+        <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>
+    <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>
+    <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.45913044">
+          <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" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

application/admin/command/Upgrade.php

@@ -17,8 +17,15 @@ class Upgrade extends Command
 
     protected function execute(Input $input, Output $output)
     {
+        // 没有版本表格的话  读取 创建
+        $ve = file_get_contents(__DIR__."\\..\\..\\common\\versionsql\\createversion");
+        DB::execute($ve);
         // 旧版本号
         $version = DB::table('version')->where('id',1)->field('version')->find();
+        if(empty($version)){
+            $version['version'] = 1;
+            DB::table('version')->insert(['id'=>1,'version'=>1]);
+        }
         // 新版本号
         $oldversion = Version::getVersion();
         $output->writeln($version);

application/common/versionsql/createversion

@@ -0,0 +1,5 @@
+CREATE TABLE if not exists `version` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `version` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;

application/common/versionsql/version1

@@ -1,9 +1,3 @@
-CREATE TABLE if not exists `version` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `version` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-INSERT INTO `version` VALUES ('1', '1');
 CREATE TABLE  if not exists `oss_callbacks`(
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `md5` varchar(255) NOT NULL,