SilentLittleCat 7 年之前
父節點
當前提交
b41841e030
共有 5 個文件被更改,包括 35 次插入142 次删除
  1. 2 0
      .gitignore
  2. 28 15
      .idea/workspace.xml
  3. 0 105
      config/config_global.php
  4. 0 21
      config/config_ucenter.php
  5. 5 1
      data/template/3_diy_portal_index_sg.tpl.php

+ 2 - 0
.gitignore

xqd
@@ -1 +1,3 @@
 data/attachment/*
+config/config_global.php
+config/config_ucenter.php

+ 28 - 15
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd
@@ -2,6 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/data/template/3_diy_portal_index_sg.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_portal_index_sg.tpl.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -33,11 +35,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_portal_index_sg.tpl.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="3_diy_portal_index_sg.tpl.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_portal_index_sg.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="403">
-              <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
+            <state relative-caret-position="589">
+              <caret line="39" column="39" lean-forward="true" selection-start-line="39" selection-start-column="39" selection-end-line="39" selection-end-column="39" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="62">
+              <caret line="2" column="25" lean-forward="true" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" />
               <folding />
             </state>
           </provider>
@@ -132,7 +144,6 @@
         <option value="$PROJECT_DIR$/source/class/table/table_forum_forum.php" />
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
         <option value="$PROJECT_DIR$/source/function/function_forum.php" />
-        <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
         <option value="$PROJECT_DIR$/source/class/discuz/discuz_upload.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php" />
@@ -146,6 +157,7 @@
         <option value="$PROJECT_DIR$/template/default/portal/index_sg.htm" />
         <option value="$PROJECT_DIR$/source/module/portal/portal_index.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_portal_index_sg.tpl.php" />
+        <option value="$PROJECT_DIR$/.gitignore" />
       </list>
     </option>
   </component>
@@ -269,12 +281,12 @@
       <workItem from="1525928003267" duration="7000" />
       <workItem from="1526220063543" duration="4043000" />
       <workItem from="1526262615805" duration="4000" />
-      <workItem from="1526308325837" duration="2131000" />
+      <workItem from="1526308325837" duration="2293000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="75777000" />
+    <option name="totallyTimeSpent" value="75939000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -554,13 +566,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="31">
-          <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/sysdata/milu_seotool_key.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="155">
@@ -674,8 +679,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_portal_index_sg.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
+        <state relative-caret-position="589">
+          <caret line="39" column="39" lean-forward="true" selection-start-line="39" selection-start-column="39" selection-end-line="39" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="62">
+          <caret line="2" column="25" lean-forward="true" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" />
           <folding />
         </state>
       </provider>

+ 0 - 105
config/config_global.php

xqd
@@ -1,105 +0,0 @@
-<?php
-
-
-$_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']['dbcharset'] = 'utf8';
-$_config['db']['1']['pconnect'] = '0';
-$_config['db']['1']['dbname'] = 'zijia';
-$_config['db']['1']['tablepre'] = 'pre_';
-$_config['db']['slave'] = '';
-$_config['db']['common']['slave_except_table'] = '';
-
-// --------------------------  CONFIG MEMORY  --------------------------- //
-$_config['memory']['prefix'] = 'HEbWjW_';
-$_config['memory']['redis']['server'] = '';
-$_config['memory']['redis']['port'] = 6379;
-$_config['memory']['redis']['pconnect'] = 1;
-$_config['memory']['redis']['timeout'] = '0';
-$_config['memory']['redis']['requirepass'] = '';
-$_config['memory']['redis']['serializer'] = 1;
-$_config['memory']['memcache']['server'] = '';
-$_config['memory']['memcache']['port'] = 11211;
-$_config['memory']['memcache']['pconnect'] = 1;
-$_config['memory']['memcache']['timeout'] = 1;
-$_config['memory']['apc'] = 1;
-$_config['memory']['xcache'] = 1;
-$_config['memory']['eaccelerator'] = 1;
-$_config['memory']['wincache'] = 1;
-
-// --------------------------  CONFIG SERVER  --------------------------- //
-$_config['server']['id'] = 1;
-
-// -------------------------  CONFIG DOWNLOAD  -------------------------- //
-$_config['download']['readmod'] = 2;
-$_config['download']['xsendfile']['type'] = '0';
-$_config['download']['xsendfile']['dir'] = '/down/';
-
-// --------------------------  CONFIG OUTPUT  --------------------------- //
-$_config['output']['charset'] = 'utf-8';
-$_config['output']['forceheader'] = 1;
-$_config['output']['gzip'] = '0';
-$_config['output']['tplrefresh'] = 1;
-$_config['output']['language'] = 'zh_cn';
-$_config['output']['staticurl'] = 'static/';
-$_config['output']['ajaxvalidate'] = '0';
-$_config['output']['iecompatible'] = '0';
-
-// --------------------------  CONFIG COOKIE  --------------------------- //
-$_config['cookie']['cookiepre'] = 'oLoI_';
-$_config['cookie']['cookiedomain'] = '';
-$_config['cookie']['cookiepath'] = '/';
-
-// -------------------------  CONFIG SECURITY  -------------------------- //
-$_config['security']['authkey'] = '65ec58eVF15X2pww';
-$_config['security']['urlxssdefend'] = 1;
-$_config['security']['attackevasive'] = '0';
-$_config['security']['querysafe']['status'] = 1;
-$_config['security']['querysafe']['dfunction']['0'] = 'load_file';
-$_config['security']['querysafe']['dfunction']['1'] = 'hex';
-$_config['security']['querysafe']['dfunction']['2'] = 'substring';
-$_config['security']['querysafe']['dfunction']['3'] = 'if';
-$_config['security']['querysafe']['dfunction']['4'] = 'ord';
-$_config['security']['querysafe']['dfunction']['5'] = 'char';
-$_config['security']['querysafe']['daction']['0'] = '@';
-$_config['security']['querysafe']['daction']['1'] = 'intooutfile';
-$_config['security']['querysafe']['daction']['2'] = 'intodumpfile';
-$_config['security']['querysafe']['daction']['3'] = 'unionselect';
-$_config['security']['querysafe']['daction']['4'] = '(select';
-$_config['security']['querysafe']['daction']['5'] = 'unionall';
-$_config['security']['querysafe']['daction']['6'] = 'uniondistinct';
-$_config['security']['querysafe']['dnote']['0'] = '/*';
-$_config['security']['querysafe']['dnote']['1'] = '*/';
-$_config['security']['querysafe']['dnote']['2'] = '#';
-$_config['security']['querysafe']['dnote']['3'] = '--';
-$_config['security']['querysafe']['dnote']['4'] = '"';
-$_config['security']['querysafe']['dlikehex'] = 1;
-$_config['security']['querysafe']['afullnote'] = '0';
-
-// --------------------------  CONFIG ADMINCP  -------------------------- //
-// -------- Founders: $_config['admincp']['founder'] = '1,2,3'; --------- //
-$_config['admincp']['founder'] = '1';
-$_config['admincp']['forcesecques'] = '0';
-$_config['admincp']['checkip'] = 0;
-$_config['admincp']['runquery'] = '0';
-$_config['admincp']['dbimport'] = 1;
-
-// --------------------------  CONFIG REMOTE  --------------------------- //
-$_config['remote']['on'] = '0';
-$_config['remote']['dir'] = 'remote';
-$_config['remote']['appkey'] = '62cf0b3c3e6a4c9468e7216839721d8e';
-$_config['remote']['cron'] = '0';
-
-// ---------------------------  CONFIG INPUT  --------------------------- //
-$_config['input']['compatible'] = 1;
-
-
-// -------------------  THE END  -------------------- //
-
-?>

+ 0 - 21
config/config_ucenter.php

xqd
@@ -1,21 +0,0 @@
-<?php
-
-
-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_DBNAME', 'zijia');
-define('UC_DBCHARSET', 'utf8');
-define('UC_DBTABLEPRE', '`zijia`.pre_ucenter_');
-define('UC_DBCONNECT', 0);
-
-define('UC_CHARSET', 'utf-8');
-define('UC_KEY', '40Lchc5fm8uazbm8DbO9Abs9R1o9l0a9Dc99SaW9K9QbVdq4Ie84Y0r0I0D8s5Z4');
-define('UC_API', 'http://t2.9026.com/uc_server');
-define('UC_APPID', '1');
-define('UC_IP', '');
-define('UC_PPP', 20);

+ 5 - 1
data/template/3_diy_portal_index_sg.tpl.php

xqd
@@ -36,7 +36,11 @@ tabId:"#wk_about_menu",tabTag:"a",conId:"#wk_about_div",conTag:"div.wk_aaa",act:
         <div class="sg-page1-warp"></div>
     </div>
     <div class="section page2">
-        <div class="sg-page2-warp"></div>
+        <div class="sg-page2-warp">
+            <div class="sg-page2-left">
+                <div class="sg-page2-title"></div>
+            </div>
+        </div>
     </div>
 </div>