SilentLittleCat 7 년 전
부모
커밋
0986afffe7
3개의 변경된 파일27개의 추가작업 그리고 26개의 파일을 삭제
  1. 24 23
      .idea/workspace.xml
  2. 1 1
      config/config_global.php
  3. 2 2
      config/config_ucenter.php

+ 24 - 23
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/data/sysdata/cache_domain.php" afterPath="$PROJECT_DIR$/data/sysdata/cache_domain.php" />
+      <change beforePath="$PROJECT_DIR$/config/config_global.php" afterPath="$PROJECT_DIR$/config/config_global.php" />
+      <change beforePath="$PROJECT_DIR$/config/config_ucenter.php" afterPath="$PROJECT_DIR$/config/config_ucenter.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -33,7 +34,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="cache_domain.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="cache_domain.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data/sysdata/cache_domain.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="403">
@@ -46,18 +47,18 @@
       <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="403">
-              <caret line="13" column="38" lean-forward="false" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" />
+            <state relative-caret-position="-62">
+              <caret line="13" column="45" lean-forward="false" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="45" />
               <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="341">
-              <caret line="11" column="31" lean-forward="true" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
+            <state relative-caret-position="248">
+              <caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
               <folding />
             </state>
           </provider>
@@ -133,10 +134,10 @@
         <option value="$PROJECT_DIR$/misc.php" />
         <option value="$PROJECT_DIR$/template/wfdsoft_jiaohu/forum/discuz.php" />
         <option value="$PROJECT_DIR$/template/default/forum/discuz.htm" />
-        <option value="$PROJECT_DIR$/config/config_global.php" />
-        <option value="$PROJECT_DIR$/config/config_ucenter.php" />
         <option value="$PROJECT_DIR$/index.php" />
         <option value="$PROJECT_DIR$/data/sysdata/cache_domain.php" />
+        <option value="$PROJECT_DIR$/config/config_global.php" />
+        <option value="$PROJECT_DIR$/config/config_ucenter.php" />
       </list>
     </option>
   </component>
@@ -243,12 +244,12 @@
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
-      <workItem from="1525658293907" duration="22029000" />
+      <workItem from="1525658293907" duration="22180000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="47903000" />
+    <option name="totallyTimeSpent" value="48054000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -914,34 +915,34 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+    <entry file="file://$PROJECT_DIR$/index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="13" column="38" lean-forward="false" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" />
+        <state relative-caret-position="31">
+          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
+    <entry file="file://$PROJECT_DIR$/data/sysdata/cache_domain.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="341">
-          <caret line="11" column="31" lean-forward="true" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
+        <state relative-caret-position="403">
+          <caret line="13" column="18" lean-forward="true" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/index.php">
+    <entry file="file://$PROJECT_DIR$/config/config_global.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="31">
-          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+        <state relative-caret-position="-62">
+          <caret line="13" column="45" lean-forward="false" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="45" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/sysdata/cache_domain.php">
+    <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="13" column="18" lean-forward="true" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
+        <state relative-caret-position="248">
+          <caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
           <folding />
         </state>
       </provider>

+ 1 - 1
config/config_global.php

xqd
@@ -11,7 +11,7 @@ $_config['db']['1']['dbpw'] = 'BXhKw6JRxMy9FTb2';
 //$_config['db']['1']['dbpw'] = '950808';
 $_config['db']['1']['dbcharset'] = 'utf8';
 $_config['db']['1']['pconnect'] = '0';
-$_config['db']['1']['dbname'] = 'zijia';
+$_config['db']['1']['dbname'] = 'zijia_online';
 $_config['db']['1']['tablepre'] = 'pre_';
 $_config['db']['slave'] = '';
 $_config['db']['common']['slave_except_table'] = '';

+ 2 - 2
config/config_ucenter.php

xqd
@@ -8,9 +8,9 @@ define('UC_DBUSER', 'dbuser');
 define('UC_DBPW', 'BXhKw6JRxMy9FTb2');
 //define('UC_DBUSER', 'root');
 //define('UC_DBPW', '950808');
-define('UC_DBNAME', 'zijia');
+define('UC_DBNAME', 'zijia_online');
 define('UC_DBCHARSET', 'utf8');
-define('UC_DBTABLEPRE', '`zijia`.pre_ucenter_');
+define('UC_DBTABLEPRE', '`zijia_online`.pre_ucenter_');
 define('UC_DBCONNECT', 0);
 
 define('UC_CHARSET', 'utf-8');