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

+ 28 - 28
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -2,8 +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" />
@@ -91,8 +91,8 @@
       <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="470">
-              <caret line="1462" column="57" lean-forward="false" selection-start-line="1462" selection-start-column="51" selection-end-line="1462" selection-end-column="57" />
+            <state relative-caret-position="253">
+              <caret line="1194" column="40" lean-forward="true" selection-start-line="1194" selection-start-column="40" selection-end-line="1194" selection-end-column="40" />
               <folding>
                 <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
               </folding>
@@ -122,11 +122,11 @@
           </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="155">
-              <caret line="53" column="57" lean-forward="true" selection-start-line="53" selection-start-column="57" selection-end-line="53" selection-end-column="57" />
+            <state relative-caret-position="-914">
+              <caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -146,11 +146,11 @@
           </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="217">
-              <caret line="7" column="35" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="35" />
+            <state relative-caret-position="403">
+              <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
               <folding />
             </state>
           </provider>
@@ -188,8 +188,8 @@
       <find>checkgroupname</find>
       <find>print_r</find>
       <find>所属分类</find>
-      <find>s_province</find>
       <find>upload_icon_banner</find>
+      <find>s_province</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -215,8 +215,8 @@
         <option value="$PROJECT_DIR$/source/function/function_forum.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
-        <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>
@@ -324,12 +324,12 @@
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
-      <workItem from="1525658293907" duration="3787000" />
+      <workItem from="1525658293907" duration="4468000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="29661000" />
+    <option name="totallyTimeSpent" value="30342000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -782,36 +782,36 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="539">
+          <caret line="366" column="58" lean-forward="false" selection-start-line="366" selection-start-column="58" selection-end-line="366" selection-end-column="58" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="470">
-          <caret line="1462" column="57" lean-forward="false" selection-start-line="1462" selection-start-column="51" selection-end-line="1462" selection-end-column="57" />
+        <state relative-caret-position="253">
+          <caret line="1194" column="40" lean-forward="true" selection-start-line="1194" selection-start-column="40" selection-end-line="1194" selection-end-column="40" />
           <folding>
             <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+    <entry file="file://$PROJECT_DIR$/config/config_global.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="539">
-          <caret line="366" column="58" lean-forward="false" selection-start-line="366" selection-start-column="58" selection-end-line="366" selection-end-column="58" />
+        <state relative-caret-position="-914">
+          <caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
           <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="217">
-          <caret line="7" column="35" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_global.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="53" column="57" lean-forward="true" selection-start-line="53" selection-start-column="57" selection-end-line="53" selection-end-column="57" />
+        <state relative-caret-position="403">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
           <folding />
         </state>
       </provider>

+ 2 - 2
config/config_global.php

xqd 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'] = '';
@@ -53,7 +53,7 @@ $_config['output']['iecompatible'] = '0';
 
 // --------------------------  CONFIG COOKIE  --------------------------- //
 $_config['cookie']['cookiepre'] = 'oLoI_';
-$_config['cookie']['cookiedomain'] = 'http://zijia.9026.com';
+$_config['cookie']['cookiedomain'] = 'http://t2.9026.com';
 $_config['cookie']['cookiepath'] = '/';
 
 // -------------------------  CONFIG SECURITY  -------------------------- //

+ 3 - 3
config/config_ucenter.php

xqd
@@ -8,14 +8,14 @@ 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');
 define('UC_KEY', '40Lchc5fm8uazbm8DbO9Abs9R1o9l0a9Dc99SaW9K9QbVdq4Ie84Y0r0I0D8s5Z4');
-define('UC_API', 'http://zijia.9026.com/uc_server');
+define('UC_API', 'http://t2.9026.com/uc_server');
 define('UC_APPID', '1');
 define('UC_IP', '');
 define('UC_PPP', 20);