Merge branch 'ccw' of http://git.shenbd.com/api-project-dev/api.shenbd.com into ccw

aecdb4dc · wwccw0591 · 5e03cd2c · 8b14acaf · aecdb4dc · aecdb4dc
Commit aecdb4dc authored Jan 25, 2019 by wwccw0591
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 1 deletion

Index.php application/controllers/Index.php +7 -0

getInvateHtml.phtml application/views/index/getInvateHtml.phtml +13 -0

application.ini conf/application.ini +1 -1

No files found.
--- a/application/controllers/Index.php
+++ b/application/controllers/Index.php
@@ -105,7 +105,14 @@ class IndexController extends \Our\Controller_Abstract  {
        }
        exit;
    }
+    public function getInvateHtmlAction(){
+        $req=$this->getRequest()->getQuery();
+        if(empty($req['name'] || empty($req['qrcodeUrl'] || empty($req['telephone'])))){
+            echo 'error';exit;
+        }
+        $this->_view->assign("params", $req);

+    }
    public function testPushAction(){
        $clientPush=\JPush\ClientPush::getInstance();
        $clientPush->pushTest(array());

--- a/application/views/index/getInvateHtml.phtml
+++ b/application/views/index/getInvateHtml.phtml
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<?php
+echo json_encode($params);
+?>
+
+</body>
+</html>
\ No newline at end of file
--- a/conf/application.ini
+++ b/conf/application.ini
@@ -148,7 +148,7 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
 redis.database.params.host = "127.0.0.1"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
-redis.database.params.password = "23456ertyu"
+;redis.database.params.password = "23456ertyu"
 out.config="/data/config"

 password.key='~!@#$`1234qwertasdfgzxcvb';