Explorar o código

修改config main 文件中的七牛配置

DengTao %!s(int64=9) %!d(string=hai) anos
pai
achega
bff84fd4c0
Modificáronse 2 ficheiros con 29 adicións e 55 borrados
  1. 23 49
      .idea/workspace.xml
  2. 6 6
      www/protected/config/main.php

+ 23 - 49
.idea/workspace.xml

@@ -90,7 +90,7 @@
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file leaf-file-name="index.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/www/protected/modules/o2o/views/tech/index.php">
         <entry file="file://$PROJECT_DIR$/www/protected/modules/o2o/views/tech/index.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="125">
             <state relative-caret-position="125">
@@ -109,6 +109,16 @@
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
+      <file leaf-file-name="main.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="603">
+              <caret line="130" column="26" selection-start-line="130" selection-start-column="26" selection-end-line="130" selection-end-column="26" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
       <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/www/protected/views/master/index.php">
         <entry file="file://$PROJECT_DIR$/www/protected/views/master/index.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
@@ -144,16 +154,6 @@
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file leaf-file-name="CommonFn.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/protected/components/CommonFn.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="517">
-              <caret line="87" column="0" selection-start-line="87" selection-start-column="0" selection-end-line="87" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
     </leaf>
   </component>
   </component>
   <component name="Git.Settings">
   <component name="Git.Settings">
@@ -200,7 +200,6 @@
         <option value="$PROJECT_DIR$/www/protected/views/rOrder/index.php" />
         <option value="$PROJECT_DIR$/www/protected/views/rOrder/index.php" />
         <option value="$PROJECT_DIR$/www/protected/config/develop.php" />
         <option value="$PROJECT_DIR$/www/protected/config/develop.php" />
         <option value="$PROJECT_DIR$/www/protected/vendors/qiniu/conf.php" />
         <option value="$PROJECT_DIR$/www/protected/vendors/qiniu/conf.php" />
-        <option value="$PROJECT_DIR$/www/protected/config/main.php" />
         <option value="$PROJECT_DIR$/www/protected/config/test.php" />
         <option value="$PROJECT_DIR$/www/protected/config/test.php" />
         <option value="$PROJECT_DIR$/www/protected/config/console.php" />
         <option value="$PROJECT_DIR$/www/protected/config/console.php" />
         <option value="$PROJECT_DIR$/www/protected/modules/o2o/views/techHome/index.php" />
         <option value="$PROJECT_DIR$/www/protected/modules/o2o/views/techHome/index.php" />
@@ -219,6 +218,7 @@
         <option value="$PROJECT_DIR$/www/protected/views/slide/index.php" />
         <option value="$PROJECT_DIR$/www/protected/views/slide/index.php" />
         <option value="$PROJECT_DIR$/www/protected/views/rUser/index.php" />
         <option value="$PROJECT_DIR$/www/protected/views/rUser/index.php" />
         <option value="$PROJECT_DIR$/www/protected/modules/o2o/views/tech/index.php" />
         <option value="$PROJECT_DIR$/www/protected/modules/o2o/views/tech/index.php" />
+        <option value="$PROJECT_DIR$/www/protected/config/main.php" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -334,33 +334,7 @@
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
             </PATH_ELEMENT>
             </PATH_ELEMENT>
             <PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="views" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="wozhua" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="php" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="protected" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="views" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="product" />
+              <option name="myItemId" value="config" />
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
             </PATH_ELEMENT>
             </PATH_ELEMENT>
           </PATH>
           </PATH>
@@ -474,12 +448,12 @@
       <workItem from="1474271619805" duration="5210000" />
       <workItem from="1474271619805" duration="5210000" />
       <workItem from="1474335695854" duration="27867000" />
       <workItem from="1474335695854" duration="27867000" />
       <workItem from="1474419504100" duration="12299000" />
       <workItem from="1474419504100" duration="12299000" />
-      <workItem from="1474436874642" duration="15150000" />
+      <workItem from="1474436874642" duration="15372000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="60526000" />
+    <option name="totallyTimeSpent" value="60748000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -721,14 +695,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="123" column="63" selection-start-line="123" selection-start-column="63" selection-end-line="123" selection-end-column="63" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/config/console.php">
     <entry file="file://$PROJECT_DIR$/www/protected/config/console.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="291">
         <state relative-caret-position="291">
@@ -972,5 +938,13 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="603">
+          <caret line="130" column="26" selection-start-line="130" selection-start-column="26" selection-end-line="130" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   </component>
 </project>
 </project>

+ 6 - 6
www/protected/config/main.php

@@ -123,12 +123,12 @@ return array(
             'qiniuConfig' => array(
             'qiniuConfig' => array(
                 'ak'=>'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr',
                 'ak'=>'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr',
                 'sk'=>'mLtD4GhBjQt_llcgx4rKlhAts9j8iJ0Qa5VmNyi2',
                 'sk'=>'mLtD4GhBjQt_llcgx4rKlhAts9j8iJ0Qa5VmNyi2',
-                'icons'=>'wozhua-icons',//后台可能上传一些图标    如宠物种类的图标    活动banner   圈子的图标
-                'pics'=>'wozhua-pics',//后台和app上  上传到帖子、回帖里面的图片
-                'avatars'=>'wozhua-avatars',//用户的头像
-                'others'=>'wozhua-others',//其他类型的图片
-                'voice'=>'wozhua-voice',//音频文件
-                'video'=>'wozhua-video'//音频文件
+                'icons'=>'icons',//后台可能上传一些图标    如宠物种类的图标    活动banner   圈子的图标
+                'pics'=>'pics',//后台和app上  上传到帖子、回帖里面的图片
+                'avatars'=>'avatars',//用户的头像
+                'others'=>'others',//其他类型的图片
+                'voice'=>'voice',//音频文件
+                'video'=>'video'//音频文件
             )
             )
         ),
         ),
         $wz
         $wz