SilentLittleCat 7 年之前
父節點
當前提交
76f40cf4ec
共有 3 個文件被更改,包括 51 次插入23 次删除
  1. 48 20
      .idea/workspace.xml
  2. 1 1
      config/config_global.php
  3. 2 2
      config/config_ucenter.php

+ 48 - 20
.idea/workspace.xml

xqd xqd xqd xqd 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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <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" />
@@ -13,7 +14,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="portal_index.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="portal_index.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/portal/portal_index.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="605">
@@ -23,6 +24,26 @@
           </provider>
         </entry>
       </file>
+      <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="-2108">
+              <caret line="13" column="38" lean-forward="false" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="310">
+              <caret line="10" column="29" lean-forward="true" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="3_diy_portal_index.tpl.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_portal_index.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -101,8 +122,6 @@
         <option value="$PROJECT_DIR$/template/default/forum/discuz.htm" />
         <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" />
         <option value="$PROJECT_DIR$/source/class/table/table_forum_forumfield.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php" />
         <option value="$PROJECT_DIR$/source/class/table/table_forum_forum.php" />
@@ -110,6 +129,8 @@
         <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
         <option value="$PROJECT_DIR$/source/module/portal/portal_index.php" />
+        <option value="$PROJECT_DIR$/config/config_global.php" />
+        <option value="$PROJECT_DIR$/config/config_ucenter.php" />
       </list>
     </option>
   </component>
@@ -152,6 +173,11 @@
               <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
               <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="config" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -204,12 +230,12 @@
       <workItem from="1525658293907" duration="23514000" />
       <workItem from="1525701498505" duration="7843000" />
       <workItem from="1525738524458" duration="1328000" />
-      <workItem from="1525788960861" duration="1000" />
+      <workItem from="1525788960861" duration="193000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="58560000" />
+    <option name="totallyTimeSpent" value="58752000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -345,13 +371,6 @@
         </state>
       </provider>
     </entry>
-    <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="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/ipdata/index.htm">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -471,13 +490,6 @@
         </state>
       </provider>
     </entry>
-    <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="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group_my.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-6667">
@@ -610,5 +622,21 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2108">
+          <caret line="13" column="38" lean-forward="false" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="310">
+          <caret line="10" column="29" lean-forward="true" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 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_online';
+$_config['db']['1']['dbname'] = 'zijia';
 $_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_online');
+define('UC_DBNAME', 'zijia');
 define('UC_DBCHARSET', 'utf8');
-define('UC_DBTABLEPRE', '`zijia_online`.pre_ucenter_');
+define('UC_DBTABLEPRE', '`zijia`.pre_ucenter_');
 define('UC_DBCONNECT', 0);
 
 define('UC_CHARSET', 'utf-8');