SilentLittleCat 7 years ago
parent
commit
32988e5dde
3 changed files with 65 additions and 98 deletions
  1. 57 92
      .idea/workspace.xml
  2. 4 4
      config/config_global.php
  3. 4 2
      config/config_ucenter.php

+ 57 - 92
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -2,21 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b6faea92-a65d-441a-9752-2f40c137a7e3" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
-      <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" />
-      <change beforePath="$PROJECT_DIR$/data/log/201804_cplog.php" afterPath="$PROJECT_DIR$/data/log/201804_cplog.php" />
-      <change beforePath="$PROJECT_DIR$/data/template/3_3_common_header_group_index.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_3_common_header_group_index.tpl.php" />
-      <change beforePath="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" />
-      <change beforePath="$PROJECT_DIR$/data/template/3_3_forum_post.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_3_forum_post.tpl.php" />
-      <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
-      <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
-      <change beforePath="$PROJECT_DIR$/data/template/3_xj_event_post_event.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_xj_event_post_event.tpl.php" />
-      <change beforePath="$PROJECT_DIR$/forum.php" afterPath="$PROJECT_DIR$/forum.php" />
-      <change beforePath="$PROJECT_DIR$/source/include/post/post_newthread.php" afterPath="$PROJECT_DIR$/source/include/post/post_newthread.php" />
-      <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
-      <change beforePath="$PROJECT_DIR$/source/plugin/xj_event/event_thread.class.php" afterPath="$PROJECT_DIR$/source/plugin/xj_event/event_thread.class.php" />
-      <change beforePath="$PROJECT_DIR$/static/js/forum_post.js" afterPath="$PROJECT_DIR$/static/js/forum_post.js" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -27,50 +14,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="636">
-              <caret line="362" column="51" lean-forward="false" selection-start-line="362" selection-start-column="51" selection-end-line="362" selection-end-column="51" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="event_thread.class.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/source/plugin/xj_event/event_thread.class.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="686">
-              <caret line="75" column="10" lean-forward="false" selection-start-line="75" selection-start-column="10" selection-end-line="75" selection-end-column="10" />
-              <folding>
-                <marker date="1525008676903" expanded="true" signature="1326:1387" ph="SELECT * FRO... ${DB::table('xj_event_field')}" />
-                <marker date="1525008676903" expanded="true" signature="2061:2127" ph="SELECT * FRO... ${DB::table('common_district')}" />
-                <marker date="1525008676903" expanded="true" signature="2157:2237" ph="SELECT * FRO... ${DB::table('common_district')}" />
-                <marker date="1525008676903" expanded="true" signature="2873:2937" ph="SELECT * FRO... ${DB::table('forum_post')}" />
-                <marker date="1525008676903" expanded="true" signature="6252:6969" ph="INSERT INTO ${DB::table('xj_event')}... " />
-                <marker date="1525008676903" expanded="true" signature="7200:7262" ph="SELECT * FRO... ${DB::table('xj_event')}" />
-                <marker date="1525008676903" expanded="true" signature="8155:8216" ph="SELECT * FRO... ${DB::table('xj_event_field')}" />
-                <marker date="1525008676903" expanded="true" signature="8996:9062" ph="SELECT * FRO... ${DB::table('common_district')}" />
-                <marker date="1525008676903" expanded="true" signature="9092:9172" ph="SELECT * FRO... ${DB::table('common_district')}" />
-                <marker date="1525008676903" expanded="true" signature="9267:9359" ph="SELECT upid ${DB::table('common_district')}" />
-                <marker date="1525008676903" expanded="true" signature="9407:9472" ph="SELECT name ${DB::table('common_district')}" />
-                <marker date="1525008676903" expanded="true" signature="10082:10158" ph="SELECT * FRO... ${DB::table('forum_post')}" />
-                <marker date="1525008676903" expanded="true" signature="10203:10269" ph="SELECT setti... ${DB::table('xj_event')}" />
-                <marker date="1525008676903" expanded="true" signature="13895:13967" ph="SELECT activ... ${DB::table('xj_event')}" />
-                <marker date="1525008676903" expanded="true" signature="15455:15517" ph="SELECT * FRO... ${DB::table('xj_event')}" />
-                <marker date="1525008676903" expanded="true" signature="18794:18894" ph="SELECT * FRO... ${DB::table('xj_eventthread')}" />
-                <marker date="1525008676903" expanded="true" signature="18950:19043" ph="SELECT SUM(a... ${DB::table('xj_eventapply')}" />
-                <marker date="1525008676903" expanded="true" signature="19154:19247" ph="SELECT SUM(a... ${DB::table('xj_eventapply')}" />
-                <marker date="1525008676903" expanded="true" signature="19582:19687" ph="SELECT apply... ${DB::table('xj_eventapply')}" />
-                <marker date="1525008676903" expanded="true" signature="20092:20207" ph="SELECT count... ${DB::table('forum_post')}" />
-                <marker date="1525008676903" expanded="true" signature="20524:20616" ph="SELECT upid ${DB::table('common_district')}" />
-                <marker date="1525008676903" expanded="true" signature="20682:20747" ph="SELECT name ${DB::table('common_district')}" />
-                <marker date="1525008676903" expanded="true" signature="21487:21586" ph="SELECT remot... ${DB::table(getattachtablebytid($tid))}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="3_xj_event_post_event.tpl.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data/template/3_xj_event_post_event.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -207,6 +150,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="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" />
+              <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="217">
+              <caret line="7" column="35" lean-forward="false" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="forum_upload.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/class/forum/forum_upload.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -217,11 +180,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/common.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="725">
-              <caret line="1225" column="5" lean-forward="false" selection-start-line="1225" selection-start-column="5" selection-end-line="1225" selection-end-column="5" />
+            <state relative-caret-position="756">
+              <caret line="1223" column="12" lean-forward="true" selection-start-line="1223" selection-start-column="12" selection-end-line="1223" selection-end-column="12" />
               <folding>
                 <marker date="1525011696005" expanded="true" signature="32210:32216" ph=" " />
                 <marker date="1525011696005" expanded="true" signature="32216:32222" ph=" " />
@@ -288,6 +251,7 @@
       <find>showWindow</find>
       <find>上传</find>
       <find>uploadWindowstart()</find>
+      <find>showwin</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -302,11 +266,9 @@
         <option value="$PROJECT_DIR$/admin.php" />
         <option value="$PROJECT_DIR$/source/admincp/admincp_login.php" />
         <option value="$PROJECT_DIR$/template/wfdsoft_jiaohu/common/header_no_nav.php" />
-        <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/group.php" />
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
-        <option value="$PROJECT_DIR$/config/config_ucenter.php" />
         <option value="$PROJECT_DIR$/data/template/3_3_common_header_group_index.tpl.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
         <option value="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" />
@@ -321,6 +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_global.php" />
+        <option value="$PROJECT_DIR$/config/config_ucenter.php" />
       </list>
     </option>
   </component>
@@ -410,7 +374,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="SearchEverywhereHistoryKey" value="misc_swf&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/misc/misc_swfupload.php&#10;3_diy_group_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;forum_g&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_xj_event_post_event&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_xj_event_post_event.tpl.php&#10;threadplugin_xj_event&#9;null&#9;null&#10;3_3_forum_post&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_forum_post.tpl.php&#10;post_newthread&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/include/post/post_newthread.php&#10;source/module/forum/forum_post.php&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_post.php&#10;forum_post&#9;null&#9;null&#10;group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;common_h&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_group_index.tpl.php&#10;header&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;header_no_nav&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;forum_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;week_nav&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/template/wfdsoft_jiaohu/images/js/week_nav.js&#10;header_no&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;3_diy_group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;group/group_i&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php" />
+    <property name="SearchEverywhereHistoryKey" value="3_3_forum_upload&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_forum_upload.tpl.php&#10;misc_swf&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/misc/misc_swfupload.php&#10;3_diy_group_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;forum_g&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_xj_event_post_event&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_xj_event_post_event.tpl.php&#10;threadplugin_xj_event&#9;null&#9;null&#10;3_3_forum_post&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_forum_post.tpl.php&#10;post_newthread&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/include/post/post_newthread.php&#10;source/module/forum/forum_post.php&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_post.php&#10;forum_post&#9;null&#9;null&#10;group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;common_h&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_group_index.tpl.php&#10;header&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;header_no_nav&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;forum_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;week_nav&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/template/wfdsoft_jiaohu/images/js/week_nav.js&#10;header_no&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;3_diy_group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;group/group_i&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -457,18 +421,18 @@
       <workItem from="1524727323225" duration="1868000" />
       <workItem from="1524830861798" duration="5000" />
       <workItem from="1524881363592" duration="3990000" />
-      <workItem from="1524966401684" duration="19475000" />
+      <workItem from="1524966401684" duration="20099000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="42952000" />
+    <option name="totallyTimeSpent" value="43576000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24375" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24375" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -500,13 +464,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/source/plugin/baidusubmit/table/table_common_usergroup_baidu.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/plugin/baidusubmit/table/table_baidusubmit_setting.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="880">
@@ -675,14 +632,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="279">
-          <caret line="9" column="39" lean-forward="true" selection-start-line="9" selection-start-column="39" selection-end-line="9" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="31">
@@ -726,14 +675,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="217">
-          <caret line="7" column="25" lean-forward="false" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="419">
@@ -1014,10 +955,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/data/template/3_3_forum_upload.tpl.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="775">
+          <caret line="21" column="49" lean-forward="true" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/common.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="725">
-          <caret line="1225" column="5" lean-forward="false" selection-start-line="1225" selection-start-column="5" selection-end-line="1225" selection-end-column="5" />
+        <state relative-caret-position="756">
+          <caret line="1223" column="12" lean-forward="true" selection-start-line="1223" selection-start-column="12" selection-end-line="1223" selection-end-column="12" />
           <folding>
             <marker date="1525011696005" expanded="true" signature="32210:32216" ph=" " />
             <marker date="1525011696005" expanded="true" signature="32216:32222" ph=" " />
@@ -1028,5 +977,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="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" />
+          <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="35" selection-end-line="7" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 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 - 2
config/config_ucenter.php

xqd
@@ -4,8 +4,10 @@
 define('UC_CONNECT', 'mysql');
 
 define('UC_DBHOST', 'localhost');
-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_');