SilentLittleCat 7 years ago
parent
commit
77035bca8c
3 changed files with 23 additions and 23 deletions
  1. 15 15
      .idea/workspace.xml
  2. 4 4
      config/config_global.php
  3. 4 4
      config/config_ucenter.php

+ 15 - 15
.idea/workspace.xml

xqd xqd xqd xqd
@@ -150,21 +150,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="config_global.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="config_global.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/config/config_global.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="279">
-              <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="10" selection-end-column="39" />
+            <state relative-caret-position="217">
+              <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="8" selection-end-column="49" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="248">
-              <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="9" selection-end-column="28" />
+            <state relative-caret-position="186">
+              <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="7" selection-end-column="38" />
               <folding />
             </state>
           </provider>
@@ -283,8 +283,8 @@
         <option value="$PROJECT_DIR$/data/template/3_xj_event_post_event.tpl.php" />
         <option value="$PROJECT_DIR$/source/class/forum/forum_upload.php" />
         <option value="$PROJECT_DIR$/static/js/common.js" />
-        <option value="$PROJECT_DIR$/config/config_ucenter.php" />
         <option value="$PROJECT_DIR$/config/config_global.php" />
+        <option value="$PROJECT_DIR$/config/config_ucenter.php" />
       </list>
     </option>
   </component>
@@ -421,12 +421,12 @@
       <workItem from="1524727323225" duration="1868000" />
       <workItem from="1524830861798" duration="5000" />
       <workItem from="1524881363592" duration="3990000" />
-      <workItem from="1524966401684" duration="20195000" />
+      <workItem from="1524966401684" duration="20312000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="43672000" />
+    <option name="totallyTimeSpent" value="43789000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -977,18 +977,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
+    <entry file="file://$PROJECT_DIR$/config/config_global.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="9" selection-end-column="28" />
+        <state relative-caret-position="217">
+          <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="8" selection-end-column="49" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+    <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="10" selection-end-column="39" />
+        <state relative-caret-position="186">
+          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="7" selection-end-column="38" />
           <folding />
         </state>
       </provider>

+ 4 - 4
config/config_global.php

xqd
@@ -5,10 +5,10 @@ $_config = array();
 
 // ----------------------------  CONFIG DB  ----------------------------- //
 $_config['db']['1']['dbhost'] = 'localhost';
-//$_config['db']['1']['dbuser'] = 'dbuser';
-//$_config['db']['1']['dbpw'] = 'BXhKw6JRxMy9FTb2';
-$_config['db']['1']['dbuser'] = 'root';
-$_config['db']['1']['dbpw'] = '950808';
+$_config['db']['1']['dbuser'] = 'dbuser';
+$_config['db']['1']['dbpw'] = 'BXhKw6JRxMy9FTb2';
+//$_config['db']['1']['dbuser'] = 'root';
+//$_config['db']['1']['dbpw'] = '950808';
 $_config['db']['1']['dbcharset'] = 'utf8';
 $_config['db']['1']['pconnect'] = '0';
 $_config['db']['1']['dbname'] = 'zijia';

+ 4 - 4
config/config_ucenter.php

xqd
@@ -4,10 +4,10 @@
 define('UC_CONNECT', 'mysql');
 
 define('UC_DBHOST', 'localhost');
-//define('UC_DBUSER', 'dbuser');
-//define('UC_DBPW', 'BXhKw6JRxMy9FTb2');
-define('UC_DBUSER', 'root');
-define('UC_DBPW', '950808');
+define('UC_DBUSER', 'dbuser');
+define('UC_DBPW', 'BXhKw6JRxMy9FTb2');
+//define('UC_DBUSER', 'root');
+//define('UC_DBPW', '950808');
 define('UC_DBNAME', 'zijia');
 define('UC_DBCHARSET', 'utf8');
 define('UC_DBTABLEPRE', '`zijia`.pre_ucenter_');