Skip to content

php / sx-prize

Go to a project
Commit d08b6480 by zhangheng
Options

d

parent 83bf72e8
Showing with 113 additions and 94 deletions
.idea/workspace.xml
......@@ -3,6 +3,9 @@
<component name="ChangeListManager">
<list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Common/Conf/db.php" afterPath="$PROJECT_DIR$/Application/Common/Conf/db.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" afterPath="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -19,21 +22,33 @@
<splitter split-orientation="horizontal" split-proportion="0.7491554">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="82" column="37" lean-forward="true" selection-start-line="82" selection-start-column="37" selection-end-line="82" selection-end-column="37" />
<state relative-caret-position="190">
<caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="db.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/db.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="16" column="24" lean-forward="true" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
<folding>
<element signature="e#7#22#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="615">
<caret line="76" column="61" lean-forward="false" selection-start-line="76" selection-start-column="61" selection-end-line="76" selection-end-column="61" />
<state relative-caret-position="311">
<caret line="76" column="72" lean-forward="true" selection-start-line="76" selection-start-column="72" selection-end-line="76" selection-end-column="72" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -45,8 +60,8 @@
<file leaf-file-name="config.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="16" column="19" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="32" />
<state relative-caret-position="437">
<caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -55,18 +70,18 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<state relative-caret-position="-87">
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="true">
<file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-342">
<caret line="13" column="53" lean-forward="false" selection-start-line="13" selection-start-column="53" selection-end-line="13" selection-end-column="53" />
<state relative-caret-position="-779">
<caret line="31" column="9" lean-forward="true" selection-start-line="31" selection-start-column="9" selection-end-line="31" selection-end-column="9" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
</folding>
......@@ -74,31 +89,23 @@
</provider>
</entry>
</file>
<file leaf-file-name="ControllerTrait.class.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1342">
<caret line="104" column="0" lean-forward="true" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Report_index.tpl" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/User/View/default/Report_index.tpl">
<file leaf-file-name="ReportController.class.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/User/Controller/ReportController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="18" column="36" lean-forward="false" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
<folding />
<state relative-caret-position="741">
<caret line="39" column="118" lean-forward="false" selection-start-line="39" selection-start-column="118" selection-end-line="39" selection-end-column="118" />
<folding>
<marker date="1563897510000" expanded="true" signature="2375:2506" ph="select a.id,... user" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Index_share.tpl" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_share.tpl">
<file leaf-file-name="ControllerTrait.class.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="722">
<caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="41" selection-end-column="74" />
<state relative-caret-position="-1342">
<caret line="104" column="0" lean-forward="true" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -153,16 +160,16 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Application/Common/Conf/db.php" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_share.tpl" />
<option value="$PROJECT_DIR$/Application/User/View/default/Check_index.tpl" />
<option value="$PROJECT_DIR$/Application/User/Controller/CheckController.class.php" />
<option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Application/Common/Conf/db.php" />
</list>
</option>
</component>
......@@ -588,7 +595,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="20581000" />
<option name="totallyTimeSpent" value="21897000" />
</component>
<component name="ToolWindowManager">
<frame x="64" y="23" width="1440" height="813" extended-state="0" />
......@@ -630,7 +637,9 @@
<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" />
<folding />
<folding>
<element signature="e#7#22#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -684,7 +693,7 @@
<state relative-caret-position="1634">
<caret line="86" column="49" lean-forward="false" selection-start-line="86" selection-start-column="49" selection-end-line="86" selection-end-column="49" />
<folding>
<marker date="1563255647000" expanded="true" signature="2376:2507" ph="select a.id,... user" />
<marker date="1563897510000" expanded="true" signature="2375:2506" ph="select a.id,... user" />
</folding>
</state>
</provider>
......@@ -709,7 +718,9 @@
<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" />
<folding />
<folding>
<element signature="e#7#22#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -760,7 +771,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="7" column="33" lean-forward="true" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
<folding />
<folding>
<element signature="e#7#22#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -853,7 +866,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="7" column="33" lean-forward="true" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
<folding />
<folding>
<element signature="e#7#22#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -914,7 +929,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="7" column="33" lean-forward="true" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
<folding />
<folding>
<element signature="e#7#22#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -957,16 +974,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/User/Controller/ReportController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1976">
<caret line="104" column="5" lean-forward="false" selection-start-line="104" selection-start-column="5" selection-end-line="104" selection-end-column="5" />
<folding>
<marker date="1563255647000" expanded="true" signature="2376:2507" ph="select a.id,... user" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/User/View/default/Report_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
......@@ -991,42 +998,44 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/db.php">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="15" column="12" lean-forward="false" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
<state relative-caret-position="-1342">
<caret line="104" column="0" lean-forward="true" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1342">
<caret line="104" column="0" lean-forward="true" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<state relative-caret-position="-87">
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="16" column="19" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="32" />
<folding />
<state relative-caret-position="-779">
<caret line="31" column="9" lean-forward="true" selection-start-line="31" selection-start-column="9" selection-end-line="31" selection-end-column="9" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="82" column="37" lean-forward="true" selection-start-line="82" selection-start-column="37" selection-end-line="82" selection-end-column="37" />
<state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="615">
<caret line="76" column="61" lean-forward="false" selection-start-line="76" selection-start-column="61" selection-end-line="76" selection-end-column="61" />
<state relative-caret-position="311">
<caret line="76" column="72" lean-forward="true" selection-start-line="76" selection-start-column="72" selection-end-line="76" selection-end-column="72" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -1034,28 +1043,38 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<entry file="file://$PROJECT_DIR$/Application/User/Controller/ReportController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<state relative-caret-position="741">
<caret line="39" column="118" lean-forward="false" selection-start-line="39" selection-start-column="118" selection-end-line="39" selection-end-column="118" />
<folding>
<marker date="1563897510000" expanded="true" signature="2375:2506" ph="select a.id,... user" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/db.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-342">
<caret line="13" column="53" lean-forward="false" selection-start-line="13" selection-start-column="53" selection-end-line="13" selection-end-column="53" />
<state relative-caret-position="304">
<caret line="16" column="24" lean-forward="true" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
<element signature="e#7#22#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348">
<caret line="230" column="7" lean-forward="false" selection-start-line="230" selection-start-column="7" selection-end-line="230" selection-end-column="7" />
<state relative-caret-position="190">
<caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
<folding />
</state>
</provider>
......
Application/Common/Conf/db.php
<?php
return array(
'DB_TYPE' => 'mysql',
'DB_HOST' => 'localhost',
'DB_PORT' => '3306',
'DB_NAME' => 'dev_sx_20190705', // <--- 修改这里
'DB_USER' => 'dev', // <--- 修改这里
'DB_PWD' => '1q2w3e', // <--- 修改这里
'DB_PREFIX' => '',
'DB_CHARSET' => 'utf8mb4',
);
//return array(
// 'DB_TYPE' => 'mysql',
// 'DB_HOST' => 'izhidaicbc2.mysql.rds.aliyuncs.com',
// 'DB_HOST' => 'localhost',
// 'DB_PORT' => '3306',
// 'DB_NAME' => 'project_dencare_20170121_photo', // <--- 修改这里
// 'DB_USER' => 'zhida', // <--- 修改这里
// 'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
// 'DB_NAME' => 'dev_sx_20190705', // <--- 修改这里
// 'DB_USER' => 'dev', // <--- 修改这里
// 'DB_PWD' => '1q2w3e', // <--- 修改这里
// 'DB_PREFIX' => '',
// 'DB_CHARSET' => 'utf8mb4',
//);
return array(
'DB_TYPE' => 'mysql',
'DB_HOST' => 'izhidaicbc2.mysql.rds.aliyuncs.com',
'DB_PORT' => '3306',
'DB_NAME' => 'project_sx_20190724_ty', // <--- 修改这里
'DB_USER' => 'zhida', // <--- 修改这里
'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
'DB_PREFIX' => '',
'DB_CHARSET' => 'utf8mb4',
);
\ No newline at end of file
Application/Home/View/default/Index_index.tpl
......@@ -71,7 +71,7 @@
window.cdn='__CDN__'
</script>
<script type="text/javascript"
src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all&app_stat_key=t6NkwipRePFcidTJ"></script>
src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all&app_stat_key=KETeS7Nz3iX7sbkY"></script>
<script type="text/javascript" src="__CDN__/js/jquery.qrcode.min.js"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=2.6"></script>
......
Application/User/Controller/ReportController.class.php
......@@ -19,7 +19,7 @@ class ReportController extends BaseUserController
$channel = '__all__';
}
$url = "http://api2.izhida.cn/tongjiV2/report?app_stat_key=t6NkwipRePFcidTJ&app_stat_secret=yK48QGN2em3MjiZA";
$url = "http://api2.izhida.cn/tongjiV2/report?app_stat_key=KETeS7Nz3iX7sbkY&app_stat_secret=t5XxDxbWhAWBNQfM";
$content = file_get_contents($url);
$data = json_decode($content, true);
$data_list = $data['data'];
......@@ -37,8 +37,7 @@ class ReportController extends BaseUserController
if (!$channel) {
$channel = '__all__';
}
$url = "http://api2.izhida.cn/tongjiV2/report?app_stat_key=t6NkwipRePFcidTJ&app_stat_secret=yK48QGN2em3MjiZA";
$url = "http://api2.izhida.cn/tongjiV2/report?app_stat_key=KETeS7Nz3iX7sbkY&app_stat_secret=t5XxDxbWhAWBNQfM";
$content = file_get_contents($url);
$data = json_decode($content, true);
$data_list = $data['data'][$channel];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment