+
@@ -52,34 +54,34 @@
- 
+
+
-
+
Find Password
-
+
+
+
<?php if ($lang == "1") { ?>站点管理<?php } else { ?>Site Manage<?php } ?>
+
+
+
+
+
+
+
+<?php if ($lang == "1") { ?>站点管理<?php } else { ?>Site Manage<?php } ?>
-
-
-
+
+
+
+
+
@@ -101,13 +107,34 @@
输入邀请码
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -532,15 +522,11 @@ function zalyjsCommonOpenPage(url, target = "_blank") {
diff --git a/src/views/manage/group/profile.php b/src/views/manage/group/profile.php
index 55f00dee..00619f75 100755
--- a/src/views/manage/group/profile.php
+++ b/src/views/manage/group/profile.php
@@ -149,6 +149,11 @@
margin-left: 10px;
}
+ .item-body-value {
+ margin-top: 5px;
+ margin-right: 5px;
+ }
+
.more-img {
width: 8px;
height: 13px;
@@ -313,6 +318,15 @@
transform: translateX(20px);
}
+ .site-image {
+ width: 30px;
+ height: 30px;
+ /*margin-top: 5px;*/
+ margin-bottom: 7px;
+ /*border-radius: 50%;*/
+ cursor: pointer;
+ }
+
@@ -424,7 +438,13 @@
+
+
+
+
+
diff --git a/src/views/login/template_login.php b/src/views/login/template_login.php
index f7d9b4be..7f14ad66 100644
--- a/src/views/login/template_login.php
+++ b/src/views/login/template_login.php
@@ -1,28 +1,28 @@
-
diff --git a/src/views/manage/config/sitePublicKey.php b/src/views/manage/config/sitePublicKey.php
index 0a64474b..02c1bede 100755
--- a/src/views/manage/config/sitePublicKey.php
+++ b/src/views/manage/config/sitePublicKey.php
@@ -245,8 +245,6 @@
-
-
+ 输入邀请码
+
+
+
+
-
+
@@ -298,31 +296,6 @@
-
-
-
-
-
-
diff --git a/src/views/manage/group/indexList.php b/src/views/manage/group/indexList.php
index 51aa09fa..57f89bef 100755
--- a/src/views/manage/group/indexList.php
+++ b/src/views/manage/group/indexList.php
@@ -324,10 +324,6 @@
-
-
-
-
-
-
- 创建群组
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -344,12 +340,6 @@
-
-
-
-
-
-
-
+ 
@@ -704,8 +724,17 @@ function uploadFile(obj) {
// $("#" + obj).click();
}
+ downloadFileUrl = "./index.php?action=http.file.downloadFile";
+
+
function showImage(fileId, htmlImgId) {
- var requestUrl = "./index.php?action=http.file.downloadMessageFile&fileId=" + fileId + "&returnBase64=0";
+
+ var requestUrl = "./_api_file_download_/test?fileId=" + fileId;
+
+ if (!isMobile()) {
+ requestUrl = downloadFileUrl + "&fileId=" + fileId + "&returnBase64=0";
+ }
+
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function () {
@@ -792,8 +821,6 @@ function updateConfirm() {
var value = $(".popup-group-input").val();
var keyName = $("#update-user-button").attr("data");
- alert("groupId=" + groupId + " name=" + keyName + " value=" + value);
-
if (keyName == null || keyName == "") {
alert("update fail");
return;
@@ -812,7 +839,18 @@ function updateConfirm() {
}
function updateGroupResponse(url, data, result) {
- alert(result);
+ if (result) {
+ var res = JSON.parse(result);
+
+ if ("success" == res.errCode) {
+ location.reload();
+ } else {
+ alert(getLanguage() == 1 ? "删除失败" : "delete error");
+ }
+
+ } else {
+ alert(getLanguage() == 1 ? "删除失败" : "delete error");
+ }
}
//enable realName
@@ -831,6 +869,7 @@ function updateGroupResponse(url, data, result) {
zalyjsCommonAjaxPostJson(url, data, enableShareGroupResponse)
});
+ //暂时无用
function enableShareGroupResponse(url, data, result) {
alert(result);
}
@@ -842,10 +881,6 @@ function enableShareGroupResponse(url, data, result) {
var isChecked = $(this).is(':checked')
var url = "index.php?action=manage.group.update&lang=" + getLanguage();
-
- alert("groupid=" + groupId);
- alert("key=" + 'addDefaultGroup');
-
var data = {
'groupId': groupId,
'key': 'addDefaultGroup',
@@ -857,7 +892,18 @@ function enableShareGroupResponse(url, data, result) {
});
function addDefaultGroupResponse(url, data, result) {
- alert(result);
+ if (result) {
+ var res = JSON.parse(res);
+
+ if ("success" == res.errCode) {
+
+ } else {
+ alert(getLanguage() == 1 ? "删除失败" : "delete error");
+ }
+
+ } else {
+ alert(getLanguage() == 1 ? "删除失败" : "delete error");
+ }
}
@@ -885,7 +931,19 @@ function addDefaultGroupResponse(url, data, result) {
function removeGroupResponse(url, data, result) {
- alert(result);
+ if (result) {
+ var res = JSON.parse(res);
+
+ if ("success" == res.errCode) {
+ var url = "index.php?action=manage.group&lang=" + getLanguage();
+ window.location.href = url;
+ } else {
+ alert(getLanguage() == 1 ? "删除失败" : "delete error");
+ }
+
+ } else {
+ alert(getLanguage() == 1 ? "删除失败" : "delete error");
+ }
}
diff --git a/src/views/manage/home.php b/src/views/manage/home.php
new file mode 100755
index 00000000..70dcda0a
--- /dev/null
+++ b/src/views/manage/home.php
@@ -0,0 +1,413 @@
+
+
+
+
+
+ 0) {
+ echo $maxMembers;
+ } else {
+ echo 100;
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/manage/index.php b/src/views/manage/index.php
index 0096b0b9..2d117332 100755
--- a/src/views/manage/index.php
+++ b/src/views/manage/index.php
@@ -3,286 +3,16 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+ 站点设置
+
+ Site Config
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+ 小程序管理
+
+ Mini Program Management
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+ 用户管理
+
+ User Management
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+ 群组管理
+
+ Group Management
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+ 邀请码
+
+ Invitation Code
+
+
+
+
+
+
+
-
-
-
-
diff --git a/src/views/manage/miniProgram/add.php b/src/views/manage/miniProgram/add.php
index 642f77c2..454c4e2d 100755
--- a/src/views/manage/miniProgram/add.php
+++ b/src/views/manage/miniProgram/add.php
@@ -369,7 +369,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 站点设置
-
- Site Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 小程序管理
-
- Mini Program Management
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 用户管理
-
- User Management
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 群组管理
-
- Group Management
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 邀请码
-
- Invitation Code
-
-
-
-
-
-
-
@@ -712,6 +711,9 @@ function uploadMiniProgramIcon(obj) {
$("#" + obj).click();
}
+ downloadFileUrl = "./index.php?action=http.file.downloadFile";
+
+
function uploadImageFile(obj) {
if (isMobile()) {
//mobile
@@ -760,7 +762,7 @@ function uploadFileToServer(formData, src) {
}
function showLocalImage(fileId) {
- var requestUrl = "/index.php?action=http.file.downloadMessageFile&fileId=" + fileId + "&returnBase64=0";
+ var requestUrl = downloadFileUrl + "&fileId=" + fileId + "&returnBase64=0";
var xhttp = new XMLHttpRequest();
console.log("showSiteLogo imageId ==" + fileId);
diff --git a/src/views/manage/miniProgram/profile.php b/src/views/manage/miniProgram/profile.php
index 569f779e..6e2171ee 100755
--- a/src/views/manage/miniProgram/profile.php
+++ b/src/views/manage/miniProgram/profile.php
@@ -774,45 +774,56 @@ function uploadFile(obj) {
$("#" + obj).click();
}
+ downloadFileUrl = "./index.php?action=http.file.downloadFile";
function uploadImageFile(obj) {
- if (isMobile()) {
- //mobile
- alert("alert");
- } else {
+ if (obj) {
+ if (obj.files) {
+ var formData = new FormData();
- if (obj) {
- if (obj.files) {
- var formData = new FormData();
+ formData.append("file", obj.files.item(0));
+ formData.append("fileType", "FileImage");
+ formData.append("isMessageAttachment", false);
- formData.append("file", obj.files.item(0));
- formData.append("fileType", "FileImage");
- formData.append("isMessageAttachment", false);
+ var src = window.URL.createObjectURL(obj.files.item(0));
- var src = window.URL.createObjectURL(obj.files.item(0));
+ uploadFileToServer(formData, src);
- uploadFileToServer(formData, src);
-
- //直接放图片
- $("#mini-program-img").attr("src", src);
- }
- return obj.value;
+ //直接放图片
+ $("#mini-program-img").attr("src", src);
}
+ return obj.value;
}
+
}
function uploadFileToServer(formData, src) {
+
+ var url = "./index.php?action=http.file.uploadWeb";
+
+ if (isMobile()) {
+ url = "/_api_file_upload_/?fileType=1"; //fileType=1,表示文件
+ }
+
$.ajax({
- url: "./index.php?action=http.file.uploadWeb",
+ url: url,
type: "post",
data: formData,
contentType: false,
processData: false,
- success: function (imageFileId) {
- console.log("imageId ==" + imageFileId);
- if (imageFileId) {
- updateMiniProgramProfile("logo", imageFileId);
+ success: function (imageFileIdResult) {
+
+ if (imageFileIdResult) {
+ var fileId = imageFileIdResult;
+ if (isMobile()) {
+ var res = JSON.parse(imageFileIdResult);
+ fileId = res.fileId;
+ }
+ updateMiniProgramProfile("logo", fileId);
+ } else {
+ alert(getLanguage() == 1 ? "上传返回结果空 " : "empty response");
}
+
},
error: function (err) {
alert("update image error");
@@ -822,7 +833,13 @@ function uploadFileToServer(formData, src) {
}
function showImage(fileId, htmlImgId) {
- var requestUrl = "./index.php?action=http.file.downloadMessageFile&fileId=" + fileId + "&returnBase64=0";
+ var requestUrl = "./_api_file_download_/test?fileId=" + fileId;
+
+
+ if (!isMobile()) {
+ requestUrl = downloadFileUrl + "&fileId=" + fileId + "&returnBase64=0";
+ }
+
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function () {
diff --git a/src/views/manage/user/groups.php b/src/views/manage/user/groups.php
index 658e1bee..2dbca4e3 100755
--- a/src/views/manage/user/groups.php
+++ b/src/views/manage/user/groups.php
@@ -524,16 +524,13 @@ function zalyjsCommonOpenPage(url, target = "_blank") {
$(document).on("click", "#group-list-id", function () {
var groupId = $(this).attr("groupId");
- alert("groupId=" + groupId);
var url = "index.php?action=manage.group.profile&lang=" + getLanguage() + "&groupId=" + groupId;
-
zalyjsCommonOpenPage(url);
});
$(document).on("click", "#miniProgram-list-id", function () {
var url = "index.php?action=manage.miniProgram.list";
- // alert("url=" + url);
zalyjsCommonOpenPage(url);
});
diff --git a/src/views/manage/user/indexList.php b/src/views/manage/user/indexList.php
index 30943e72..d80b796d 100755
--- a/src/views/manage/user/indexList.php
+++ b/src/views/manage/user/indexList.php
@@ -423,7 +423,7 @@ function zalyjsCommonAjaxPostJson(url, jsonBody, callBack) {
* @param url
* @param target
*/
- function zalyjsCommonOpenPage(url, target = "_blank") {
+ function zalyjsCommonOpenPage(url) {
// window.open(url, target);
location.href = url;
}
@@ -545,12 +545,11 @@ function zalyjsCommonOpenPage(url, target = "_blank") {
$(document).on("click", "#user-list-id", function () {
var userId = $(this).attr("userId");
- var url = "index.php?action=manage.user.profile&lang=" + getLanguage() + "&userId=" + userId;
+ var url = "./index.php?action=manage.user.profile&lang=" + getLanguage() + "&userId=" + userId;
zalyjsCommonOpenPage(url);
});
-
diff --git a/src/views/manage/user/profile.php b/src/views/manage/user/profile.php
index 17a6f30c..4a548b23 100755
--- a/src/views/manage/user/profile.php
+++ b/src/views/manage/user/profile.php
@@ -146,6 +146,7 @@
/*height: 3rem;*/
font-size: 16px;
/*color: rgba(76, 59, 177, 1);*/
+ margin-top: 5px;
margin-left: 10px;
}
@@ -323,6 +324,7 @@
}
.item-body-value {
+ margin-top: 5px;
margin-right: 5px;
}
@@ -459,12 +461,7 @@ function zalyjsCommonOpenPage(url) {
-
-
-
用户ID
-
- User ID
-
+ ID
@@ -533,7 +530,6 @@ function zalyjsCommonOpenPage(url) {
-
;)
diff --git a/src/views/miniProgram/square/index.php b/src/views/miniProgram/square/index.php
new file mode 100755
index 00000000..63c9aded
--- /dev/null
+++ b/src/views/miniProgram/square/index.php
@@ -0,0 +1,508 @@
+
+
+
+
+
+ Site Manage
+
+
+
+
+
+
+
+
diff --git a/src/views/manage/home.php b/src/views/manage/home.php
index 70dcda0a..d7401ef1 100755
--- a/src/views/manage/home.php
+++ b/src/views/manage/home.php
@@ -367,6 +367,15 @@ function zalyjsCommonOpenPage(url) {
location.href = url;
}
+ function zalyjsCommonOpenNewPage(url) {
+ if (isMobile()) {
+ zalyjsNavOpenPage(url);
+ } else {
+ // window.open(url, target);
+ location.href = url;
+ }
+ }
+
+
+
+
+
+
+
+
+站点登录
+
+
+
+
+
+
+
+
+
+
+
+Mini Program
+ <?php if ($lang == "1") { ?>默认好友<?php } else { ?>Default Friends<?php } ?>
@@ -18,7 +18,7 @@
/*overflow: hidden;*/
width: 100%;
height: 100%;
- background: rgba(245, 244, 249, 1);
+ background: rgba(245, 245, 245, 1);
font-size: 14px;
overflow-x: hidden;
overflow-y: hidden;
@@ -35,8 +35,7 @@
position: fixed;
z-index: 9999;
overflow: hidden;
- visibility: hidden;
- display: flex;
+ display:none;
justify-content: center;
align-items: center;
}
@@ -543,7 +542,7 @@ function zalyjsCommonOpenPage(url, target = "_blank") {
zalyjsCommonOpenPage(url);
});
-
+
diff --git a/src/views/manage/config/defaultGroups.php b/src/views/manage/config/defaultGroups.php
index 17e93ef2..942293f9 100755
--- a/src/views/manage/config/defaultGroups.php
+++ b/src/views/manage/config/defaultGroups.php
@@ -3,7 +3,7 @@
- Mini Program
+ <?php if ($lang == "1") { ?>默认群组<?php } else { ?>Default Groups<?php } ?>
@@ -18,11 +18,9 @@
/*overflow: hidden;*/
width: 100%;
height: 100%;
- background: rgba(245, 244, 249, 1);
+ background: rgba(245, 245, 245, 1);
font-size: 14px;
overflow-x: hidden;
- overflow-y: hidden;
-
}
/* mask and new window */
diff --git a/src/views/manage/config/index.php b/src/views/manage/config/index.php
index b2d8cab2..d5baab1a 100755
--- a/src/views/manage/config/index.php
+++ b/src/views/manage/config/index.php
@@ -3,7 +3,7 @@
- Config Manage
+ <?php if ($lang == "1") { ?>站点设置<?php } else { ?>Site Config<?php } ?>
@@ -17,9 +17,9 @@
font-family: PingFangSC-Regular, "MicrosoftYaHei";
/*overflow: hidden;*/
width: 100%;
- height: 100%;
+ /*height: 100%;*/
background: rgba(245, 245, 245, 1);
- font-size: 10.66px;
+ font-size: 14px;
overflow-x: hidden;
}
@@ -872,7 +872,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/msg/groupMsg.php b/src/views/msg/groupMsg.php
index ff813a67..69eed655 100755
--- a/src/views/msg/groupMsg.php
+++ b/src/views/msg/groupMsg.php
@@ -54,6 +54,10 @@
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/src/views/init/installSite.php b/src/views/init/installSite.php
index 43823ccf..3b038699 100644
--- a/src/views/init/installSite.php
+++ b/src/views/init/installSite.php
@@ -69,13 +69,11 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 站点设置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 小程序管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 用户管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 群组管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 邀请码
+
+
+
+
+
+
-
请选择登录方式：
+
+
+
+
+
+
+
+
+
diff --git a/src/views/passport/login.php b/src/views/passport/login.php
new file mode 100644
index 00000000..27552b97
--- /dev/null
+++ b/src/views/passport/login.php
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
+
+
+ Reset Password
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/passport/template_login.php b/src/views/passport/template_login.php
new file mode 100644
index 00000000..7f14ad66
--- /dev/null
+++ b/src/views/passport/template_login.php
@@ -0,0 +1,62 @@
+
+
+
+
From 5a36915341daa95378ec8e22fa63484b5078b3b6 Mon Sep 17 00:00:00 2001
From: sisishiliu <4416@cunmou.com>
Date: Sat, 8 Sep 2018 20:12:25 +0800
Subject: [PATCH 004/302] beta version.
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 42f94d57..46380d3d 100644
--- a/README.md
+++ b/README.md
@@ -79,5 +79,5 @@
## 官方与联系方式
-- DuckChat官方网站 http://duck.chat
+- DuckChat官方网站 http://duckchat.akaxin.com
- QQ2群：`131466613` （Duckchat爱好者GaGa 2群）
From b70a960ef85b7919ce74f510d5199fac2d1ecf1b Mon Sep 17 00:00:00 2001
From: sisishiliu <4416@cunmou.com>
Date: Sat, 8 Sep 2018 20:53:40 +0800
Subject: [PATCH 005/302] beta version.
---
src/controller/Api/Plugin/Api_Plugin_ProxyController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/controller/Api/Plugin/Api_Plugin_ProxyController.php b/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
index b0b2bafc..e76cec8e 100644
--- a/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
+++ b/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
@@ -136,8 +136,8 @@ private function buildApiPluginProxyResponse($body, $httpCode, $header = array()
$invalidHeaderKey = array(
"transfer-encoding",
- "content-encoding",
- "content-length"
+// "content-encoding",
+// "content-length"
);
foreach ($header as $key => $val) {
From ffbbc033dafc82ad7f0c99d780893f7c70ab2648 Mon Sep 17 00:00:00 2001
From: sisishiliu <4416@cunmou.com>
Date: Sat, 8 Sep 2018 20:56:30 +0800
Subject: [PATCH 006/302] beta version
---
.../Api/Friend/Api_Friend_ApplyController.php | 19 +++++++++++++++++++
.../Api/Group/Api_Group_CreateController.php | 1 +
src/controller/InstallDBController.php | 2 +-
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/controller/Api/Friend/Api_Friend_ApplyController.php b/src/controller/Api/Friend/Api_Friend_ApplyController.php
index c4d352d0..119606d3 100644
--- a/src/controller/Api/Friend/Api_Friend_ApplyController.php
+++ b/src/controller/Api/Friend/Api_Friend_ApplyController.php
@@ -35,6 +35,10 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
}
$greetings = $request->getGreetings();
+ //check site allow addfriend
+
+ $this->checkSiteAddFriendConfig($this->userId);
+
//check is friend before is friend,with exception
$this->checkIsFriend($toUserId);
@@ -50,10 +54,25 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
$this->ctx->Message_Client->proxyNewFriendApplyMessage($toUserId, $this->userId, $toUserId);
} catch (Exception $ex) {
$this->ctx->Wpf_Logger->error($tag, "error_msg=" . $ex->getMessage());
+ $this->setRpcError("error.alert", $ex->getMessage());
$this->rpcReturn($transportData->getAction(), new $this->classNameForResponse());
}
}
+ private function checkSiteAddFriendConfig($userId)
+ {
+ $enableAddFriend = $this->ctx->Site_Config->getConfigValue(SiteConfig::SITE_ENABLE_ADD_FRIEND);
+
+ if (empty($enableAddFriend)) {
+
+ $isManager = $this->ctx->Site_Config->isManager($userId);
+ if (!$isManager) {
+ throw new Exception("site disable add friend");
+ }
+
+ }
+ }
+
private function checkIsFriend($toUserId)
{
$isFriend = $this->ctx->SiteUserFriendTable->isFriend($this->userId, $toUserId);
diff --git a/src/controller/Api/Group/Api_Group_CreateController.php b/src/controller/Api/Group/Api_Group_CreateController.php
index e98c23fb..6d3a5b91 100644
--- a/src/controller/Api/Group/Api_Group_CreateController.php
+++ b/src/controller/Api/Group/Api_Group_CreateController.php
@@ -75,6 +75,7 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
} catch (Exception $ex) {
$this->ctx->Wpf_Logger->error($tag, "error_msg=" . $ex->getMessage());
+ $this->setRpcError("error.alert", $ex->getMessage());
$this->rpcReturn($transportData->getAction(), new $this->classNameForResponse());
}
}
diff --git a/src/controller/InstallDBController.php b/src/controller/InstallDBController.php
index ddf5e1af..dbdcf9d8 100644
--- a/src/controller/InstallDBController.php
+++ b/src/controller/InstallDBController.php
@@ -101,7 +101,7 @@ public function doIndex()
}
$params = [
- "isPhpVersionValid" => version_compare(PHP_VERSION, "7.0.0") >= 1,
+ "isPhpVersionValid" => version_compare(PHP_VERSION, "5.6.0") >= 0,
"isLoadOpenssl" => extension_loaded("openssl") && false != ZalyRsa::newRsaKeyPair(2048),
"isLoadPDOSqlite" => extension_loaded("pdo_sqlite"),
"isLoadCurl" => extension_loaded("curl"),
From 1f9b53d2eb1534b99ffdb00dac3cda15cd0e7682 Mon Sep 17 00:00:00 2001
From: sisishiliu <4416@cunmou.com>
Date: Sat, 8 Sep 2018 21:05:41 +0800
Subject: [PATCH 007/302] beta version.
---
src/controller/Api/Plugin/Api_Plugin_ProxyController.php | 4 ++--
src/lib/Util/ZalyCurl.php | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/controller/Api/Plugin/Api_Plugin_ProxyController.php b/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
index e76cec8e..b0b2bafc 100644
--- a/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
+++ b/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
@@ -136,8 +136,8 @@ private function buildApiPluginProxyResponse($body, $httpCode, $header = array()
$invalidHeaderKey = array(
"transfer-encoding",
-// "content-encoding",
-// "content-length"
+ "content-encoding",
+ "content-length"
);
foreach ($header as $key => $val) {
diff --git a/src/lib/Util/ZalyCurl.php b/src/lib/Util/ZalyCurl.php
index 388ec357..3681b6f9 100644
--- a/src/lib/Util/ZalyCurl.php
+++ b/src/lib/Util/ZalyCurl.php
@@ -167,6 +167,7 @@ public function requestAndReturnHeaders($method, $url, $params = [], $headers =
$this->_getRequestParams($params);
$this->_setHeader($headers);
$this->setRequestMethod($method);
+ curl_setopt($this->_curlObj, CURLOPT_ENCODING, "gzip");
curl_setopt($this->_curlObj, CURLOPT_URL, $url);
curl_setopt($this->_curlObj, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($this->_curlObj, CURLOPT_MAXREDIRS, 6);
From a417bf8b392d8fe02992914be17647578b6f32e4 Mon Sep 17 00:00:00 2001
From: sisishiliu <4416@cunmou.com>
Date: Mon, 10 Sep 2018 15:46:35 +0800
Subject: [PATCH 008/302] 1.0 beta-2
---
src/config.sample.php | 2 +-
...sport_PasswordModifyPasswordController.php | 79 +++++++
.../Api/Plugin/Api_Plugin_ProxyController.php | 7 +-
.../Api/Site/Api_Site_LoginController.php | 6 +-
src/controller/BaseController.php | 9 +-
.../Duckchat_MiniProgramController.php | 7 +-
src/controller/HttpBaseController.php | 33 ++-
.../Im/Cts/Im_Cts_UpdatePointerController.php | 2 +
src/controller/InstallDBController.php | 5 +-
.../Manage/Manage_CommonController.php | 5 +
.../User/Manage_User_ProfileController.php | 3 +-
...MiniProgram_Passport_AccountController.php | 50 +++--
src/controller/MiniProgramController.php | 10 +-
src/lib/Util/ZalyAes.php | 2 -
src/lib/Util/ZalyCurl.php | 5 +
src/lib/Util/ZalyErrorBase.php | 1 +
src/lib/Util/ZalyErrorEn.php | 3 +
src/lib/Util/ZalyErrorZh.php | 4 +-
src/lib/Util/ZalyHelper.php | 37 ++++
.../GPBMetadata/Platform/ApiSiteMute.php | 30 +++
src/lib/wpf/Wpf_Controller.php | 17 +-
src/model/Push/Push_Client.php | 20 +-
src/model/Site/Site_Config.php | 13 ++
src/model/Site/Site_Login.php | 18 +-
src/public/css/login.css | 5 +-
src/public/css/zaly_msg.css | 2 +-
src/public/css/zaly_widget.css | 3 +-
src/public/js/config/lang.properties | 3 +-
src/public/js/config/lang_en.properties | 5 +-
src/public/js/config/lang_zh.properties | 3 +-
src/public/js/im/zalyBaseWs.js | 1 +
src/public/js/im/zalyClient.js | 1 +
src/public/js/im/zalyGroupMsg.js | 1 +
src/public/js/im/zalyIm.js | 3 +-
src/public/js/im/zalyKey.js | 5 +-
src/public/js/im/zalyMsg.js | 4 +-
src/public/js/login/login.js | 36 +--
src/public/js/zalyjsNative.js | 2 +-
src/views/manage/config/defaultFriends.php | 9 +-
src/views/manage/config/defaultGroups.php | 6 +-
src/views/manage/config/index.php | 8 +-
src/views/manage/config/siteManagers.php | 35 +--
src/views/manage/config/sitePublicKey.php | 4 +-
src/views/manage/group/indexList.php | 40 +---
src/views/manage/group/members.php | 6 +-
src/views/manage/group/profile.php | 4 +-
src/views/manage/home.php | 11 +-
src/views/manage/miniProgram/add.php | 6 +-
src/views/manage/miniProgram/index.php | 38 +---
src/views/manage/miniProgram/list.php | 39 +---
src/views/manage/miniProgram/profile.php | 4 +-
src/views/manage/uic/index.php | 4 +-
src/views/manage/uic/usedList.php | 6 +-
src/views/manage/user/groups.php | 4 +-
src/views/manage/user/indexList.php | 34 +--
src/views/manage/user/profile.php | 97 +++++----
src/views/miniProgram/passport/account.php | 205 +++++++++++++++++-
57 files changed, 629 insertions(+), 373 deletions(-)
create mode 100644 src/controller/Api/Passport/Api_Passport_PasswordModifyPasswordController.php
create mode 100644 src/lib/proto/GPBMetadata/Platform/ApiSiteMute.php
diff --git a/src/config.sample.php b/src/config.sample.php
index d1ec9d9b..29028040 100644
--- a/src/config.sample.php
+++ b/src/config.sample.php
@@ -16,7 +16,7 @@
'apiPageSiteInit' => "./index.php?action=installDB",
'apiSiteLogin' => './index.php?action=api.site.login&body_format=pb',
'session_verify_101' => 'http://open.akaxin.com:5208/index.php?action=api.session.verify&body_format=pb',
- 'session_verify_102' => 'http://127.0.0.1/index.php?action=api.session.verify&body_format=pb',
+ 'session_verify_102' => './index.php?action=api.session.verify&body_format=pb',
"siteAddress" => '',
'passport_cookie_name' => "duckchat_passport_cookie",
'mail' =>
diff --git a/src/controller/Api/Passport/Api_Passport_PasswordModifyPasswordController.php b/src/controller/Api/Passport/Api_Passport_PasswordModifyPasswordController.php
new file mode 100644
index 00000000..4c8ab2d5
--- /dev/null
+++ b/src/controller/Api/Passport/Api_Passport_PasswordModifyPasswordController.php
@@ -0,0 +1,79 @@
+classNameForRequest;
+ }
+
+ /**
+ * @param \Zaly\Proto\Site\ApiPassportPasswordModifyPasswordRequest $request
+ * @param \Google\Protobuf\Internal\Message $transportData
+ */
+ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf\Internal\Message $transportData)
+ {
+ $tag = __CLASS__ . '-' . __FUNCTION__;
+ try{
+ $newPassword = $request->getNewPassword();
+ $password = $request->getPassword();
+ $loginName = $request->getLoginName();
+ $this->ctx->Wpf_Logger->error($tag, "error_msg=" . $request->serializeToJsonString());
+ $this->checkOldPassword($loginName, $password);
+ $this->updatePasswordByLoginName($loginName, $newPassword);
+ $this->setRpcError($this->defaultErrorCode, "");
+ }catch (Exception $ex) {
+ $this->ctx->Wpf_Logger->error($tag, "error_msg=" . $ex->getMessage());
+ }
+ $this->rpcReturn($transportData->getAction(), new $this->classNameForResponse());
+ }
+
+ private function checkOldPassword($loginName, $password)
+ {
+ $userInfo = $this->ctx->PassportPasswordTable->getUserByLoginName($loginName);
+ if($userInfo == false) {
+ $errorCode = $this->zalyError->errorExistUser;
+ $errorInfo = $this->zalyError->getErrorInfo($errorCode);
+ $this->setRpcError($errorCode, $errorInfo);
+ throw new Exception("user is not exists");
+ }
+
+ if(!password_verify($password, $userInfo['password'])) {
+ $errorCode = $this->zalyError->errorMatchLogin;
+ $errorInfo = $this->zalyError->getErrorInfo($errorCode);
+ $this->setRpcError($errorCode, $errorInfo);
+ throw new Exception("loginName password is not match");
+ }
+ }
+
+ private function updatePasswordByLoginName($loginName, $password)
+ {
+ $tag = __CLASS__ . '-' . __FUNCTION__;
+
+ try{
+ $where = [
+ "loginName" => $loginName
+ ];
+ $data = [
+ "password" => password_hash($password, PASSWORD_BCRYPT)
+ ];
+ $this->ctx->PassportPasswordTable->updateUserData($where, $data);
+ }catch (Exception $ex) {
+ $this->ctx->Wpf_Logger->error($tag, "error_msg=" . $ex->getMessage());
+ $errorCode = $this->zalyError->errorUpdatePwd;
+ $errorInfo = $this->zalyError->getErrorInfo($errorCode);
+ $this->setRpcError($errorCode, $errorInfo);
+ throw new Exception("update password failed ");
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/controller/Api/Plugin/Api_Plugin_ProxyController.php b/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
index b0b2bafc..e6e2da8d 100644
--- a/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
+++ b/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
@@ -105,8 +105,11 @@ private function getPluginRequestUrl($reqUrl, $pluginId)
$port = empty($pluginUrl["port"]) ? "" : ":{$pluginUrl["port"]}";
$host = $host . $port;
}
-
- $url = "{$schema}://{$host}/{$reqUrl}";
+ if(strpos($reqUrl, "/") == 0) {
+ $url = "{$schema}://{$host}{$reqUrl}";
+ } else {
+ $url = "{$schema}://{$host}/{$reqUrl}";
+ }
return $url;
} catch (Exception $e) {
$this->ctx->Wpf_Logger->info($tag, " error_msg=" . $e->getMessage());
diff --git a/src/controller/Api/Site/Api_Site_LoginController.php b/src/controller/Api/Site/Api_Site_LoginController.php
index a9901ca7..405b9c7f 100644
--- a/src/controller/Api/Site/Api_Site_LoginController.php
+++ b/src/controller/Api/Site/Api_Site_LoginController.php
@@ -48,7 +48,7 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
throw new Exception("with error parameters");
}
- $this->ctx->Wpf_Logger->info("api.site.login", " =========preSessionId=" . $preSessionId);
+ $this->ctx->Wpf_Logger->info("api.site.login", "preSessionId=" . $preSessionId);
// $this->ctx->Wpf_Logger->info("api.site.login", " -devicePubkPem=" . $devicePubkPem);
if (!$preSessionId) {
@@ -58,8 +58,8 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
throw new Exception($errorInfo);
}
- //get user profile from platform
- $userProfile = $this->ctx->Site_Login->checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem);
+ //get user profile from platform clientSiteType=1:mobile client
+ $userProfile = $this->ctx->Site_Login->checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem, 1);
$realSessionId = $userProfile['sessionId'];
$this->ctx->Wpf_Logger->info("api.site.login", "get platform sessionid=" . $realSessionId);
diff --git a/src/controller/BaseController.php b/src/controller/BaseController.php
index 55875101..458704b4 100644
--- a/src/controller/BaseController.php
+++ b/src/controller/BaseController.php
@@ -36,6 +36,7 @@ abstract class BaseController extends \Wpf_Controller
"api.passport.passwordFindPassword",
"api.passport.passwordResetPassword",
"api.passport.passwordUpdateInvitationCode",
+ "api.passport.passwordModifyPassword",
"api.plugin.proxy",
];
protected $sessionIdTimeOut = 36000000; //10个小时的毫秒
@@ -226,7 +227,6 @@ public function doIndex()
$this->handleHeader();
$this->getAndSetClientLang();
- $this->getZalyErrorLang();
$this->checkSessionId($this->action);
$this->rpc($requestMessage, $this->requestTransportData);
@@ -363,15 +363,18 @@ protected function getAndSetClientLang()
$requestTransportData = $this->requestTransportData;
$headers = $requestTransportData->getHeader();
-
$headLang = isset($headers[TransportDataHeaderKey::HeaderUserClientLang]) ? $headers[TransportDataHeaderKey::HeaderUserClientLang] : "";
$this->ctx->Wpf_Logger->info("client-language", "==" . $headLang);
if (isset($headLang) && $headLang == Zaly\Proto\Core\UserClientLangType::UserClientLangZH) {
$this->language = Zaly\Proto\Core\UserClientLangType::UserClientLangZH;
+ $this->zalyError = $this->ctx->ZalyErrorZh;
+
+ } else {
+ $this->language = Zaly\Proto\Core\UserClientLangType::UserClientLangEN;
+ $this->zalyError = $this->ctx->ZalyErrorEn;
}
}
-
}
\ No newline at end of file
diff --git a/src/controller/Duckchat/Duckchat_MiniProgramController.php b/src/controller/Duckchat/Duckchat_MiniProgramController.php
index 368cf91c..4550de94 100644
--- a/src/controller/Duckchat/Duckchat_MiniProgramController.php
+++ b/src/controller/Duckchat/Duckchat_MiniProgramController.php
@@ -139,7 +139,6 @@ public function doIndex()
$this->handleHeader();
$this->getAndSetClientLang();
- $this->getZalyErrorLang();
$this->rpc($requestMessage, $this->requestTransportData);
}
@@ -260,15 +259,17 @@ protected function getAndSetClientLang()
$requestTransportData = $this->requestTransportData;
$headers = $requestTransportData->getHeader();
-
$headLang = isset($headers[TransportDataHeaderKey::HeaderUserClientLang]) ? $headers[TransportDataHeaderKey::HeaderUserClientLang] : "";
$this->ctx->Wpf_Logger->info("client-language", "==" . $headLang);
if (isset($headLang) && $headLang == Zaly\Proto\Core\UserClientLangType::UserClientLangZH) {
$this->language = Zaly\Proto\Core\UserClientLangType::UserClientLangZH;
+ $this->zalyError = $this->ctx->ZalyErrorZh;
+ } else {
+ $this->language = \Zaly\Proto\Core\UserClientLangType::UserClientLangEN;
+ $this->zalyError = $this->ctx->ZalyErrorEn;
}
-
}
/**
diff --git a/src/controller/HttpBaseController.php b/src/controller/HttpBaseController.php
index 65ec6f51..9093491d 100644
--- a/src/controller/HttpBaseController.php
+++ b/src/controller/HttpBaseController.php
@@ -32,7 +32,7 @@ abstract class HttpBaseController extends \Wpf_Controller
private $u2Type = "u";
private $jumpRoomType = "";
private $jumpRoomId = "";
- private $jumpRelation="";
+ private $jumpRelation = "";
private $siteCookieName = "zaly_site_user";
public function __construct(Wpf_Ctx $context)
@@ -96,8 +96,7 @@ public function handlePreSessionId()
$preSessionId = isset($_GET['preSessionId']) ? $_GET['preSessionId'] : "";
if($preSessionId) {
$userProfile = $this->ctx->Site_Login->checkPreSessionIdFromPlatform($preSessionId);
- $this->userId = $userProfile["userId"];
- $this->setCookieBase64($this->userId, $this->siteCookieName);
+ $this->setCookieBase64($userProfile["sessionId"], $this->siteCookieName);
}
}
}
@@ -145,25 +144,16 @@ public function checkUserCookie()
{
$tag = __CLASS__ . "-" . __FUNCTION__;
- $cookie = isset($_COOKIE['zaly_site_user'] ) ? $_COOKIE['zaly_site_user'] : "";
- if(!$cookie) {
+ $this->sessionId = isset($_COOKIE['zaly_site_user'] ) ? $_COOKIE['zaly_site_user'] : "";
+ if(!$this->sessionId) {
throw new Exception("cookie is not found");
}
- $cookieDecode = base64_decode($cookie);
- $this->userId = $this->ctx->ZalyAes->decrypt($cookieDecode, $this->ctx->ZalyAes->cookieKey);
-
- $this->userInfo = $this->ctx->SiteUserTable->getUserByUserId($this->userId);
- if (!$this->userInfo) {
- throw new Exception("user not exists");
- }
-
- $sessionInfo = $this->ctx->SiteSessionTable->getWebUserSessionInfo($this->userId);
- $this->ctx->Wpf_Logger->info($tag, json_encode($sessionInfo));
- if (!$sessionInfo) {
+ $this->sessionInfo = $this->ctx->SiteSessionTable->getSessionInfoBySessionId($this->sessionId);
+ if (!$this->sessionInfo) {
throw new Exception("session is not ok");
}
- $timeActive = $sessionInfo['timeActive'];
+ $timeActive = $this->sessionInfo['timeActive'];
$nowTime = $this->ctx->ZalyHelper->getMsectime();
@@ -171,7 +161,14 @@ public function checkUserCookie()
throw new Exception("session is not ok");
}
- $this->sessionId = $sessionInfo['sessionId'];
+ $this->userInfo = $this->ctx->SiteUserTable->getUserByUserId($this->sessionInfo['userId']);
+ if (!$this->userInfo) {
+ throw new Exception("user is not ok");
+ }
+
+ $this->sessionId = $this->sessionInfo['sessionId'];
+ $this->userId = $this->userInfo['userId'];
+
}
public function setLogout()
diff --git a/src/controller/Im/Cts/Im_Cts_UpdatePointerController.php b/src/controller/Im/Cts/Im_Cts_UpdatePointerController.php
index 45ff9b02..6987749c 100644
--- a/src/controller/Im/Cts/Im_Cts_UpdatePointerController.php
+++ b/src/controller/Im/Cts/Im_Cts_UpdatePointerController.php
@@ -65,6 +65,8 @@ public function doRequest(\Google\Protobuf\Internal\Message $request, Zaly\Proto
$currentU2Pointer = $maxU2Pointer;
}
$this->ctx->Wpf_Logger->info("im.cts.updatePointer", "pointer=" . $currentU2Pointer);
+
+ //clientSideType=1: 手机客户端 clientSideType=2:web端
$this->ctx->SiteU2MessageTable->updatePointer($userId, $deviceId, "1", $currentU2Pointer);
}
}
diff --git a/src/controller/InstallDBController.php b/src/controller/InstallDBController.php
index dbdcf9d8..288cdad3 100644
--- a/src/controller/InstallDBController.php
+++ b/src/controller/InstallDBController.php
@@ -11,7 +11,7 @@ class InstallDBController
private $logger;
private $_dbPath = ".";
private $loginPluginIds = [101, 102];
- private $passportAccountSafePluginId = 104;
+ private $passportAccountSafePluginId = 105;
private $configName = "config.php";
private $sampleConfigName = "config.sample.php";
private $_dbName;
@@ -63,14 +63,11 @@ public function doIndex()
$scheme = isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : "http";
$siteAddress = $scheme . "://" . $serverHost;
- $sessionVerifyUrl = $siteAddress . '/index.php?action=api.session.verify&body_format=pb';
-
$loginPluginId = $_POST['pluginId'];
$dbNameKey = ZalyHelper::generateStrKey(8);
$sqliteName = "db." . md5($dbNameKey) . ".sqlite3";
$config['sqlite']['sqliteDBName'] = $sqliteName;
$config['loginPluginId'] = in_array($loginPluginId, $this->loginPluginIds) ? $loginPluginId : 101;
- $config['session_verify_102'] = $sessionVerifyUrl;
$config['msectime'] = ZalyHelper::getMsectime();
$config['siteAddress'] = $siteAddress;
diff --git a/src/controller/Manage/Manage_CommonController.php b/src/controller/Manage/Manage_CommonController.php
index ab6ff785..0d463538 100644
--- a/src/controller/Manage/Manage_CommonController.php
+++ b/src/controller/Manage/Manage_CommonController.php
@@ -28,8 +28,13 @@ protected function preRequest()
}
}
+ /**
+ * @param Exception $ex
+ * @return mixed|void
+ */
protected function requestException($ex)
{
+ echo $ex->getMessage();
$this->showPermissionPage();
}
diff --git a/src/controller/Manage/User/Manage_User_ProfileController.php b/src/controller/Manage/User/Manage_User_ProfileController.php
index 1fc3f9fd..4103989b 100644
--- a/src/controller/Manage/User/Manage_User_ProfileController.php
+++ b/src/controller/Manage/User/Manage_User_ProfileController.php
@@ -19,12 +19,13 @@ public function doRequest()
$config = $this->ctx->SiteConfigTable->selectSiteConfig(SiteConfig::SITE_MANAGERS);
$siteManagerStr = $config[SiteConfig::SITE_MANAGERS];
+ $params['isSiteOwner'] = $this->ctx->Site_Config->isSiteOwner($userId);
+
if ($siteManagerStr) {
$isSiteManager = in_array($userId, explode(",", $siteManagerStr));
$params['isSiteManager'] = $isSiteManager;
}
-
$config = $this->ctx->SiteConfigTable->selectSiteConfig(SiteConfig::SITE_DEFAULT_FRIENDS);
$defaultFriendStr = $config[SiteConfig::SITE_DEFAULT_FRIENDS];
if ($defaultFriendStr) {
diff --git a/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php b/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php
index 1600683a..c56632e4 100644
--- a/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php
+++ b/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php
@@ -11,7 +11,7 @@ class MiniProgram_Passport_AccountController extends MiniProgramController
private $passporAccountPluginId = 105;
private $errorCode = "";
private $sessionClear = "duckchat.session.clear";
- private $resetPassword = "api.passport.passwordResetPassword";
+ private $resetPassword = "api.passport.passwordModifyPassword";
public function getMiniProgramId()
{
@@ -29,6 +29,7 @@ public function preRequest()
public function doRequest()
{
+
$tag = __CLASS__.'-'.__FUNCTION__;
$method = strtolower($_SERVER['REQUEST_METHOD']);
@@ -36,15 +37,24 @@ public function doRequest()
if($method == "post") {
$loginName = $_POST['loginName'];
- $token = $_POST['token'];
- $password = $_POST['password'];
+ $newPassword = $_POST['newPassword'];
+ $oldPassword = $_POST['oldPassword'];
$siteLoginName = $this->loginName;
if($siteLoginName != $loginName) {
- echo json_encode(["errCode" => "登录名不正确"]);
+ $errorCode = $this->zalyError->errorUpdatePasswordLoginName;
+ $errorInfo = $this->zalyError->getErrorInfo($errorCode);
+ echo json_encode(["errCode" => $errorInfo]);
+ return;
+ }
+ if(strlen($newPassword)<5 || strlen($newPassword)>20) {
+ $errorCode = $this->zalyError->errorPassowrdLength;
+ $errorInfo = $this->zalyError->getErrorInfo($errorCode);
+ echo json_encode(["errCode" => $errorInfo]);
return;
}
- $this->updatePassportPassword($loginName, $token, $password);
+
+ $this->modifyPassportPassword($loginName, $oldPassword, $newPassword);
echo json_encode(["errCode" => "success"]);
return;
} else {
@@ -59,25 +69,24 @@ public function doRequest()
}
}
- private function updatePassportPassword($loginName, $token, $password)
+ private function modifyPassportPassword($loginName, $oldPassword, $newPassword)
{
$tag = __CLASS__ . "-". __FUNCTION__;
try{
- $updatePasswordReq = new \Zaly\Proto\Site\ApiPassportPasswordResetPasswordRequest();
- $updatePasswordReq->setLoginName($loginName);
- $updatePasswordReq->setPassword($password);
- $updatePasswordReq->setToken($token);
- $siteAddress = ZalyConfig::getConfig("siteAddress");
- $updatePasswordUrl = $siteAddress . "/index.php?action=" . $this->resetPassword . "&body_format=pb";
- $this->sendReq( $this->resetPassword, $updatePasswordUrl, $updatePasswordReq);
-
- $sessionClearRequest = new \Zaly\Proto\Plugin\DuckChatSessionClearRequest();
- $sessionClearRequest->setUserId($this->userId);
- $siteAddress = ZalyConfig::getConfig("siteAddress");
- $sessionClearUrl = $siteAddress . "/index.php?action=" . $this->sessionClear . "&body_format=pb&miniProgramId=".$this->passporAccountPluginId;
- $this->sendReq($this->sessionClear, $sessionClearUrl, $sessionClearRequest);
-
+ $modifyPasswordReq = new \Zaly\Proto\Site\ApiPassportPasswordModifyPasswordRequest();
+ $modifyPasswordReq->setLoginName($loginName);
+ $modifyPasswordReq->setPassword($oldPassword);
+ $modifyPasswordReq->setNewPassword($newPassword);
+ $updatePasswordUrl = "/index.php?action=" . $this->resetPassword . "&body_format=pb";
+ $updatePasswordUrl = ZalyHelper::getFullReqUrl($updatePasswordUrl);
+ $this->sendReq( $this->resetPassword, $updatePasswordUrl, $modifyPasswordReq);
+
+ $sessionClearRequest = new \Zaly\Proto\Plugin\DuckChatSessionClearRequest();
+ $sessionClearRequest->setUserId($this->userId);
+ $sessionClearUrl = "/index.php?action=" . $this->sessionClear . "&body_format=pb&miniProgramId=".$this->passporAccountPluginId;
+ $sessionClearUrl = ZalyHelper::getFullReqUrl($sessionClearUrl);
+ $this->sendReq($this->sessionClear, $sessionClearUrl, $sessionClearRequest);
}catch (Exception $ex) {
$this->ctx->Wpf_Logger->error($tag, $ex->getMessage());
throw new Exception($ex->getMessage());
@@ -93,6 +102,7 @@ private function sendReq($action, $url, $dataReq)
$transportData = new \Zaly\Proto\Core\TransportData();
$transportData->setBody($anyBody);
$transportData->setAction($action);
+ $transportData->setHeader(["_".\Zaly\Proto\Core\TransportDataHeaderKey::HeaderUserClientLang => $this->language]);
$data = $transportData->serializeToString();
$pluginProfile = $this->getMiniProgramProfile($this->passporAccountPluginId);
diff --git a/src/controller/MiniProgramController.php b/src/controller/MiniProgramController.php
index 37eccac5..d3ea163b 100644
--- a/src/controller/MiniProgramController.php
+++ b/src/controller/MiniProgramController.php
@@ -152,10 +152,10 @@ public function requestDuckChatInnerApi($miniProgramId, $action, $requestProtoDa
//加密发送
$encryptedTransportData = $this->ctx->ZalyAes->encrypt($requestTransportDataString, $authKey);
- $siteAddress = ZalyConfig::getConfig("siteAddress");
- $requestUrl = $siteAddress . "/?action=" . $action . "&body_format=pb&miniProgramId=" . $miniProgramId;
+ $requestUrl = "/?action=" . $action . "&body_format=pb&miniProgramId=" . $miniProgramId;
+ $requestUrl = ZalyHelper::getFullReqUrl($requestUrl);
- $this->ctx->Wpf_Logger->info($action, "http request url =" . $requestUrl);
+ $this->ctx->Wpf_Logger->error($action, "fihttp request url =" . $requestUrl);
$encryptedHttpTransportResponse = $this->ctx->ZalyCurl->requestDataByAction($action, $encryptedTransportData, $requestUrl, 'POST');
@@ -269,6 +269,10 @@ protected function getAndSetClientLang()
if (isset($headLang) && $headLang == Zaly\Proto\Core\UserClientLangType::UserClientLangZH) {
$this->language = Zaly\Proto\Core\UserClientLangType::UserClientLangZH;
+ $this->zalyError = $this->ctx->ZalyErrorZh;
+ } else {
+ $this->language = Zaly\Proto\Core\UserClientLangType::UserClientLangEN;
+ $this->zalyError = $this->ctx->ZalyErrorEn;
}
}
diff --git a/src/lib/Util/ZalyAes.php b/src/lib/Util/ZalyAes.php
index 2f883141..158dc279 100644
--- a/src/lib/Util/ZalyAes.php
+++ b/src/lib/Util/ZalyAes.php
@@ -21,8 +21,6 @@ class ZalyAes
CONST KEY_PATH = "/akaxin/phpconfig";
- public $cookieKey = "AlYCnz5nFusJoe1g";
-
/**
* aes128ecb pkcs5加密数据
* mcrypt_encrypt 在php7.2以后弃用
diff --git a/src/lib/Util/ZalyCurl.php b/src/lib/Util/ZalyCurl.php
index 3681b6f9..57abc6f3 100644
--- a/src/lib/Util/ZalyCurl.php
+++ b/src/lib/Util/ZalyCurl.php
@@ -271,7 +271,12 @@ protected function _setHeader($baseHeaders)
if (!$baseHeaders) {
return false;
}
+ $delHeaders = array("host");
foreach ($baseHeaders as $key => $value) {
+ $key =strtolower($key);
+ if(in_array($key, $delHeaders)) {
+ continue;
+ }
$headers[] = $key . ': ' . $value;
}
curl_setopt($this->_curlObj, CURLOPT_HTTPHEADER, $headers);
diff --git a/src/lib/Util/ZalyErrorBase.php b/src/lib/Util/ZalyErrorBase.php
index 4a2bf537..1a5dce87 100644
--- a/src/lib/Util/ZalyErrorBase.php
+++ b/src/lib/Util/ZalyErrorBase.php
@@ -71,6 +71,7 @@ abstract class ZalyErrorBase
public $errorSessionClear = "error.session.clear";
+ public $errorUpdatePasswordLoginName = "error.updatePassword.loginName";
abstract public function getErrorInfo($errorCode);
}
\ No newline at end of file
diff --git a/src/lib/Util/ZalyErrorEn.php b/src/lib/Util/ZalyErrorEn.php
index c7750c76..46e1a006 100644
--- a/src/lib/Util/ZalyErrorEn.php
+++ b/src/lib/Util/ZalyErrorEn.php
@@ -60,6 +60,9 @@ class ZalyErrorEn extends ZalyErrorBase
"error.password.length" => "Password length is illegal",
"error.session.clear" => "clear failed",
+
+ "error.updatePassword.loginName" => "LoginName unavailable",
+
];
public function getErrorInfo($errorCode)
diff --git a/src/lib/Util/ZalyErrorZh.php b/src/lib/Util/ZalyErrorZh.php
index 3f70a512..9a83df15 100644
--- a/src/lib/Util/ZalyErrorZh.php
+++ b/src/lib/Util/ZalyErrorZh.php
@@ -62,7 +62,9 @@ class ZalyErrorZh extends ZalyErrorBase
"error.nickname.length" => "昵称长度不合法",
"error.site.pubkPem" => "站点公钥不合法",
- "error.session.clear" => "删除失败"
+ "error.session.clear" => "删除失败",
+
+ "error.updatePassword.loginName" => "登录名不正确",
];
diff --git a/src/lib/Util/ZalyHelper.php b/src/lib/Util/ZalyHelper.php
index e5b4c636..3ba57651 100644
--- a/src/lib/Util/ZalyHelper.php
+++ b/src/lib/Util/ZalyHelper.php
@@ -147,4 +147,41 @@ public static function isPhoneNumber($phoneNumber)
{
return preg_match("/^1[3456789]{1}\d{9}$/", $phoneNumber);
}
+
+ public static function getFullReqUrl($reqUrl)
+ {
+ try{
+ $reqUrlStruct = parse_url($reqUrl);
+
+ if (!empty($reqUrlStruct["scheme"])) {
+ $query = !empty($reqUrlStruct["query"]) ? "?" . $reqUrlStruct["query"] : "";
+ $reqUrl = $reqUrlStruct["path"] . $query;
+ }
+
+ $urlInfo = parse_url($reqUrl);
+ $defaultScheme = $_SERVER['REQUEST_SCHEME'];
+ $defaultHost = $_SERVER['HTTP_HOST'];
+ $schema = "";
+ $host = "";
+ // 必须用scheme，防止用户多输//
+ if (empty($urlInfo["scheme"]) && empty($urlInfo['host'])) {
+ $schema = $defaultScheme;
+ $host = $defaultHost;
+ } else {
+ $schema = $urlInfo["scheme"];
+ $host = $urlInfo["host"];
+ $port = empty($urlInfo["port"]) ? "" : ":{$urlInfo["port"]}";
+ $host = $host . $port;
+ }
+ if(strpos($reqUrl, "/") == 0) {
+ $fullUrl = "{$schema}://{$host}{$reqUrl}";
+ } else {
+ $fullUrl = "{$schema}://{$host}/{$reqUrl}";
+ }
+
+ return $fullUrl;
+ }catch (Exception $ex) {
+ return $reqUrl;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/lib/proto/GPBMetadata/Platform/ApiSiteMute.php b/src/lib/proto/GPBMetadata/Platform/ApiSiteMute.php
new file mode 100644
index 00000000..e9cb2cd6
--- /dev/null
+++ b/src/lib/proto/GPBMetadata/Platform/ApiSiteMute.php
@@ -0,0 +1,30 @@
+internalAddGeneratedFile(hex2bin(
+ "0ac4010a1c706c6174666f726d2f6170695f736974655f6d7574652e7072" .
+ "6f746f1208706c6174666f726d224a0a12417069536974654d7574655265" .
+ "717565737412100a0873697465436f646518012001280912120a0a736974" .
+ "65557365724964180220012809120e0a0669734d75746518032001280822" .
+ "150a13417069536974654d757465526573706f6e7365422f0a17636f6d2e" .
+ "7a616c792e70726f746f2e706c6174666f726dca02135a616c795c50726f" .
+ "746f5c506c6174666f726d620670726f746f33"
+ ));
+
+ static::$is_initialized = true;
+ }
+}
+
diff --git a/src/lib/wpf/Wpf_Controller.php b/src/lib/wpf/Wpf_Controller.php
index 3307b202..a324dad4 100644
--- a/src/lib/wpf/Wpf_Controller.php
+++ b/src/lib/wpf/Wpf_Controller.php
@@ -46,17 +46,6 @@ public function getParam($key) {
return isset($_REQUEST[$key]) ? $_REQUEST[$key] : null;
}
- public function getZalyErrorLang()
- {
- $requestTransportData = $this->requestTransportData;
- $headers = $requestTransportData->getHeader();
- if(!isset($headers[TransportDataHeaderKey::HeaderUserClientLang])
- || ($headers[TransportDataHeaderKey::HeaderUserClientLang] == \Zaly\Proto\Core\UserClientLangType::UserClientLangZH)) {
- $this->zalyError = $this->ctx->ZalyErrorZh;
- } else {
- $this->zalyError = $this->ctx->ZalyErrorEn;
- }
- }
public function checkDBIsExist()
{
@@ -73,10 +62,8 @@ public function checkDBIsExist()
return false;
}
- public function setCookieBase64($userId, $cookieName)
+ public function setCookieBase64($val, $cookieName)
{
- $cookieAes = $this->ctx->ZalyAes->encrypt($userId, $this->ctx->ZalyAes->cookieKey);
- $cookieBase64 = base64_encode($cookieAes);
- setcookie($cookieName, $cookieBase64, time() + $this->sessionIdTimeOut, "/", "", false, true);
+ setcookie($cookieName, $val, time() + $this->sessionIdTimeOut, "/", "", false, true);
}
}
\ No newline at end of file
diff --git a/src/model/Push/Push_Client.php b/src/model/Push/Push_Client.php
index 8ebd253c..853cab56 100644
--- a/src/model/Push/Push_Client.php
+++ b/src/model/Push/Push_Client.php
@@ -8,11 +8,13 @@
class Push_Client
{
+ private $logger;
private $ctx;
private $pushAction = "api.push.notification";
public function __construct(BaseCtx $ctx)
{
+ $this->logger = new Wpf_Logger();
$this->ctx = $ctx;
}
@@ -30,6 +32,18 @@ public function sendNotification($roomType, $msgType, $fromUserId, $toId, $pushT
try {
$siteConfig = $this->getSiteConfig();
+
+ $pushType = $siteConfig[SiteConfig::SITE_SUPPORT_PUSH_TYPE];
+
+ if (empty($pushType)) {
+ $pushType = 0;
+ }
+
+ if (Zaly\Proto\Core\PushType::PushDisabled == $pushType) {
+ $this->logger->info($this->pushAction, "site disable push function");
+ return;
+ }
+
$pushHeader = new \Zaly\Proto\Platform\PushHeader();
//sign time seconds
@@ -51,7 +65,11 @@ public function sendNotification($roomType, $msgType, $fromUserId, $toId, $pushT
$pushBody->setFromUserId($fromUserId);
$userNickName = $this->ctx->SiteUserTable->getUserNickName($fromUserId);
$pushBody->setFromUserName($userNickName);
- $pushBody->setPushContent($pushText);
+
+ if (Zaly\Proto\Core\PushType::PushWithMessageContent == $pushType) {
+ $pushBody->setPushContent($pushText);
+ }
+
if (\Zaly\Proto\Core\MessageRoomType::MessageRoomGroup == $roomType) {
$pushBody->setRoomId($toId);
$pushBody->setRoomName($this->getGroupName($toId));
diff --git a/src/model/Site/Site_Config.php b/src/model/Site/Site_Config.php
index 19c1618b..5513e9bf 100644
--- a/src/model/Site/Site_Config.php
+++ b/src/model/Site/Site_Config.php
@@ -50,6 +50,19 @@ public function getSiteOwner()
return null;
}
+
+ public function isSiteOwner($userId)
+ {
+ $siteOwner = $this->getSiteOwner();
+ if (empty($userId) || empty($siteOwner)) {
+ return false;
+ }
+
+ if ($userId == $siteOwner) {
+ return true;
+ }
+ }
+
/**
* get managers ,site has many managers
*
diff --git a/src/model/Site/Site_Login.php b/src/model/Site/Site_Login.php
index 30d621cb..ebb3d313 100644
--- a/src/model/Site/Site_Login.php
+++ b/src/model/Site/Site_Login.php
@@ -30,10 +30,11 @@ public function __construct(BaseCtx $ctx)
/**
* @param $preSessionId
* @param string $devicePubkPem
+ * @param int $clientSideType
* @return array
* @throws Exception
*/
- public function checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem = "")
+ public function checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem = "", $clientSideType = 1)
{
try {
@@ -47,7 +48,7 @@ public function checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem = ""
//get intivation first
$uicInfo = $this->getIntivationCode($loginUserProfile->getInvitationCode());
- $userProfile = $this->doSiteLoginAction($loginUserProfile, $devicePubkPem, $uicInfo);
+ $userProfile = $this->doSiteLoginAction($loginUserProfile, $devicePubkPem, $uicInfo, $clientSideType);
//set site owner
$this->checkAndSetSiteOwner($userProfile['userId'], $uicInfo);
@@ -94,11 +95,9 @@ private function getUserProfileFromPlatform($preSessionId, $sitePrikPem)
$pluginIds = $this->ctx->SiteConfigTable->selectSiteConfig(SiteConfig::SITE_LOGIN_PLUGIN_ID);
$pluginId = $pluginIds[SiteConfig::SITE_LOGIN_PLUGIN_ID];
-
$sessionVerifyUrl = ZalyConfig::getSessionVerifyUrl($pluginId);
-
+ $sessionVerifyUrl = ZalyHelper::getFullReqUrl($sessionVerifyUrl);
$this->ctx->Wpf_Logger->error("api.site.login", "get profile from platform url=" . $sessionVerifyUrl);
-
$result = $this->ctx->ZalyCurl->request("post", $sessionVerifyUrl, $data);
//解析数据
@@ -142,10 +141,11 @@ private function getUserProfileFromPlatform($preSessionId, $sitePrikPem)
* @param Zaly\Proto\Platform\LoginUserProfile $loginUserProfile
* @param $devicePubkPem
* @param $uicInfo
+ * @param $clientSideType
* @return array
* @throws Exception
*/
- private function doSiteLoginAction($loginUserProfile, $devicePubkPem, $uicInfo)
+ private function doSiteLoginAction($loginUserProfile, $devicePubkPem, $uicInfo, $clientSideType)
{
if (!$loginUserProfile) {
$errorCode = $this->zalyError->errorSession;
@@ -192,7 +192,7 @@ private function doSiteLoginAction($loginUserProfile, $devicePubkPem, $uicInfo)
}
//这里
- $sessionId = $this->insertOrUpdateUserSession($userProfile, $devicePubkPem);
+ $sessionId = $this->insertOrUpdateUserSession($userProfile, $devicePubkPem, $clientSideType);
$userProfile['sessionId'] = $sessionId;
return $userProfile;
}
@@ -264,9 +264,10 @@ private function insertSiteUserProfile($userProfile)
*
* @param $userProfile
* @param $devicePubkPem
+ * @param $clientSideType
* @return string
*/
- private function insertOrUpdateUserSession($userProfile, $devicePubkPem)
+ private function insertOrUpdateUserSession($userProfile, $devicePubkPem, $clientSideType)
{
$sessionId = $this->ctx->ZalyHelper->generateStrId();
$deviceId = sha1($devicePubkPem);
@@ -285,6 +286,7 @@ private function insertOrUpdateUserSession($userProfile, $devicePubkPem)
"ipActive" => "",
"userAgent" => "",
"userAgentType" => "",
+ "clientSideType" => $clientSideType,
];
$this->ctx->SiteSessionTable->insertSessionInfo($sessionInfo);
} catch (Exception $ex) {
diff --git a/src/public/css/login.css b/src/public/css/login.css
index c58e7973..7522b2df 100755
--- a/src/public/css/login.css
+++ b/src/public/css/login.css
@@ -5,7 +5,7 @@ body,html {
padding:0;
margin:0;
-webkit-tap-highlight-color: transparent;
- background:url("http://duckchat.akaxin.com/border_line.png") ;
+ background:url("http://duckchat.akaxin.com/border_line.png") no-repeat;
}
.zaly_container {
@@ -14,6 +14,7 @@ body,html {
display: flex;
align-items: center;
justify-content: center;
+ background-color: rgba(76,59,177,1);
background-image: url("../img/login_bg.png");
}
.zaly_login{
@@ -80,7 +81,7 @@ body,html {
display: none;
}
-.pwd, .repwd , .clearLoginName{
+.pwd, .repwd , .clearLoginName,.oldPwd{
width: 2rem;
height: 1rem;
right: 0;
diff --git a/src/public/css/zaly_msg.css b/src/public/css/zaly_msg.css
index fe46e5f2..e5fc62bb 100755
--- a/src/public/css/zaly_msg.css
+++ b/src/public/css/zaly_msg.css
@@ -43,7 +43,7 @@ html, body{
width: 100%;
height: 100%;
font-size: 10.66px;
- background-image: url("http://duckchat.akaxin.com/border_line.png") ;
+ background: url("http://duckchat.akaxin.com/border_line.png") no-repeat ;
}
/**:focus {outline: none;}*/
diff --git a/src/public/css/zaly_widget.css b/src/public/css/zaly_widget.css
index 733fa8a4..e8045893 100755
--- a/src/public/css/zaly_widget.css
+++ b/src/public/css/zaly_widget.css
@@ -7,8 +7,7 @@ html, body{
width: 100%;
height: 100%;
font-size: 10.66px;
- background:url("http://duckchat.akaxin.com/border_line.png") rgba(245,244,249,1) ;
- background-size: 1px 1px;
+ background:url("http://duckchat.akaxin.com/border_line.png") no-repeat;
}
.widget {
diff --git a/src/public/js/config/lang.properties b/src/public/js/config/lang.properties
index 7e9920bd..cecb7fc8 100644
--- a/src/public/js/config/lang.properties
+++ b/src/public/js/config/lang.properties
@@ -65,7 +65,8 @@ removeMemberFromGroupJsTip=确定要移除群聊?
loginTip=登录
loginNamePlaceholder=输入登录名
registerLoginNamePlaceholder=用户名以字母、数字、下划线，1-16个字符
-enterPasswordPlaceholder=输入密码
+enterPasswordPlaceholder=输入密码,长度5到20个字符(无中文)
+enterOldPasswordPlaceholder=输入旧密码
registerTip=注册
login*site*btn=登录站点
register*Site*Tip=Register Site
diff --git a/src/public/js/config/lang_en.properties b/src/public/js/config/lang_en.properties
index e599db4a..7ae01822 100644
--- a/src/public/js/config/lang_en.properties
+++ b/src/public/js/config/lang_en.properties
@@ -66,8 +66,9 @@ removeMemberFromGroupJsTip=Are You Sure Remove Member?
loginTip=Login
loginNamePlaceholder=Please Enter LoginName
registerLoginNamePlaceholder=LoginName is alphanumeric, underscore, 1-16 characters
-enterPasswordPlaceholder=Please Enter Password
-enterCodePlaceholder=Please Enter Password
+enterPasswordPlaceholder= Enter Password,5-20 characters(no chinese)
+enterOldPasswordPlaceholder= Enter Old Password
+enterCodePlaceholder=Please Enter Password, 6-20 characters
registerTip=Register
registerNicknameTip=Nickname
login*site*btn=Login Site
diff --git a/src/public/js/config/lang_zh.properties b/src/public/js/config/lang_zh.properties
index c8edda1c..9d4387d9 100644
--- a/src/public/js/config/lang_zh.properties
+++ b/src/public/js/config/lang_zh.properties
@@ -65,7 +65,8 @@ removeMemberFromGroupJsTip=确定要移除群聊?
loginTip=登录
loginNamePlaceholder=输入登录名
registerLoginNamePlaceholder=用户名以字母、数字、下划线，1-16个字符
-enterPasswordPlaceholder=输入密码
+enterPasswordPlaceholder=输入密码, 长度5到20个字符(无中文)
+enterOldPasswordPlaceholder=输入旧密码
registerTip=注册
login*site*btn=登录站点
register*Site*Tip=注册站点
diff --git a/src/public/js/im/zalyBaseWs.js b/src/public/js/im/zalyBaseWs.js
index 1e576d1c..91a90f79 100755
--- a/src/public/js/im/zalyBaseWs.js
+++ b/src/public/js/im/zalyBaseWs.js
@@ -23,6 +23,7 @@ $(":input").attr("autocapitalize", "off");
function ZalyIm(params)
{
var config = params.config;
+ document.title = config.name;
var loginPluginProfile = params.loginPluginProfile;
var webSocketGwDomain = config[siteConfigKeys.serverAddressForIM];
if(webSocketGwDomain == undefined || webSocketGwDomain == null || webSocketGwDomain.length<1 || webSocketGwDomain.indexOf("http://") > -1) {
diff --git a/src/public/js/im/zalyClient.js b/src/public/js/im/zalyClient.js
index 420fec25..ecf06fe0 100755
--- a/src/public/js/im/zalyClient.js
+++ b/src/public/js/im/zalyClient.js
@@ -46,6 +46,7 @@ function handleClientSendRequest(action, reqData, callback, isHttp)
header[HeaderSessionid] = sessionId;
header[HeaderHostUrl] = originDomain;
header[HeaderUserClientLang] = languageName == "en-US" ? "0" : "1";
+ header[HeaderUserAgent] = navigator.userAgent;
var packageId = localStorage.getItem(PACKAGE_ID);
diff --git a/src/public/js/im/zalyGroupMsg.js b/src/public/js/im/zalyGroupMsg.js
index 18239496..4225769b 100755
--- a/src/public/js/im/zalyGroupMsg.js
+++ b/src/public/js/im/zalyGroupMsg.js
@@ -932,6 +932,7 @@ function sendMsgBySend() {
alert("文本过长");
return false;
}
+ $(".msg_content").val('');
sendMsg(chatSessionId, chatSessionType, msgContent, MessageType.MessageText);
}
diff --git a/src/public/js/im/zalyIm.js b/src/public/js/im/zalyIm.js
index 550e4925..94f10602 100755
--- a/src/public/js/im/zalyIm.js
+++ b/src/public/js/im/zalyIm.js
@@ -67,7 +67,8 @@ function handleImSendRequest(action, reqData, callback)
var header = {};
header[HeaderSessionid] = sessionId;
header[HeaderHostUrl] = originDomain;
- header[HeaderUserClientLang] = languageName == "en-US" ? "0" : "1";
+ header[HeaderUserClientLang] = languageName == "en-US" ? UserClientLangEN : UserClientLangZH;
+ header[HeaderUserAgent] = navigator.userAgent;
var packageId = localStorage.getItem(PACKAGE_ID);
diff --git a/src/public/js/im/zalyKey.js b/src/public/js/im/zalyKey.js
index 8ed03132..bcd540bf 100755
--- a/src/public/js/im/zalyKey.js
+++ b/src/public/js/im/zalyKey.js
@@ -25,6 +25,9 @@ MessageType = {
};
+UserClientLangZH = "1";
+UserClientLangEN = "0";
+
MessageTypeNum = {
MessageInvalid : 0,
MessageNotice : "1",
@@ -47,7 +50,6 @@ FriendRelation = {
FriendRelationFollowForWeb : "FriendRelationFollowForWeb",
}
-
MessageStatus = {
MessageStatusSending : "MessageStatusSending",
MessageEventStatus : "MessageEventStatus",
@@ -196,4 +198,5 @@ languageName = navigator.language == "en-US" ? "en" : "zh";
uploadFileUrl = './index.php?action=http.file.uploadWeb';
languageName = "zh";
+languageNum = languageName == "en" ? UserClientLangEN : UserClientLangZH;
diff --git a/src/public/js/im/zalyMsg.js b/src/public/js/im/zalyMsg.js
index d858ced8..c1bbd777 100755
--- a/src/public/js/im/zalyMsg.js
+++ b/src/public/js/im/zalyMsg.js
@@ -380,7 +380,6 @@ function handleSyncMsg(msg)
var currentChatSessionId = localStorage.getItem(chatSessionIdKey);
var isNewMsg = handleMsgForMsgRoom(msg.chatSessionId, msg);
-
///是自己群的消息，并且是新消息
if(msg.chatSessionId == currentChatSessionId && isNewMsg) {
appendMsgHtml(msg);
@@ -849,7 +848,6 @@ function appendMsgHtml(msg)
// html = "请前往客户端查看web消息";
$(".right-chatbox").append(html);
- $(".msg_content").val('');
getNotMsgImg(userId, userAvatar);
getMsgImgSrc(msg, msgId);
}
@@ -1065,7 +1063,7 @@ function uploadMsgImgToServer(formData, src, type)
}
},
error:function(err){
- console.log("file upload " + fileName);
+ console.log("file upload failed");
alert("发送失败,稍后重试");
return false;
}
diff --git a/src/public/js/login/login.js b/src/public/js/login/login.js
index 0e476211..6d4d7bb2 100644
--- a/src/public/js/login/login.js
+++ b/src/public/js/login/login.js
@@ -34,7 +34,6 @@ jQuery.i18n.properties({
$(":input").attr("autocapitalize", "off");
-refererKey = "site_referer";
siteConfig = {};
enableInvitationCode=0;
enableRealName=0;
@@ -46,6 +45,12 @@ preSessionId="";
refererUrl = document.referrer;
secondNum = 120;
isSending = false;
+refererUrlKey = "documentReferer";
+
+if(refererUrl.length>0) {
+ localStorage.setItem(refererUrlKey, refererUrl);
+ refererUrlKeyVal = localStorage.getItem(refererUrlKey);
+}
var protocol = window.location.protocol;
var host = window.location.host;
@@ -53,7 +58,6 @@ var pathname = window.location.pathname;
originDomain = protocol+"//"+host+pathname;
isRegister=false;
-
function zalyLoginConfig(results) {
if(typeof results == "object" ) {
siteConfig = results;
@@ -72,12 +76,14 @@ function loginSuccess()
function handleRedirect()
{
+ var refererUrl = localStorage.getItem(refererUrlKey);
if(refererUrl) {
if(refererUrl.indexOf("?") > -1) {
refererUrl = refererUrl+"&preSessionId="+preSessionId+"&isRegister="+isRegister;
} else {
refererUrl = refererUrl+"?preSessionId="+preSessionId+"&isRegister="+isRegister;
}
+ localStorage.clear();
window.location.href = refererUrl;
}
}
@@ -86,10 +92,11 @@ function handleRedirect()
function loginFailed()
{
zalyjsAlert("登录失败");
- console.log("登录失败");
}
-if(refererUrl != undefined && refererUrl.length>1) {
+getOsType();
+
+if(refererUrl != undefined && refererUrl.length>1 || clientType == "PC") {
siteConfigJsUrl = "./index.php?action=page.siteConfig&callback=zalyLoginConfig";
addJsByDynamic(siteConfigJsUrl);
} else {
@@ -98,7 +105,6 @@ if(refererUrl != undefined && refererUrl.length>1) {
function addJsByDynamic(url)
{
- console.log(url);
var script = document.createElement("script")
script.type = "text/javascript";
//Firefox, Opera, Chrome, Safari 3+
@@ -163,7 +169,6 @@ function returnRegisterDiv() {
function handleHtmlLanguage(html)
{
- console.log($.i18n.map['registerBtnTip']);
$(html).find("[data-local-placeholder]").each(function () {
var placeholderValue = $(this).attr("data-local-placeholder");
var placeholder = $(this).attr("placeholder");
@@ -179,8 +184,6 @@ function handleHtmlLanguage(html)
html = html.replace(valueHtml, newValueHtml);
});
- console.log(html);
-
return html;
}
@@ -229,7 +232,7 @@ function checkRegisterInfo()
}
- if(registerPassword == "" || registerPassword == undefined || registerPassword.length<0) {
+ if(registerPassword == "" || registerPassword == undefined || registerPassword.length<5 || registerPassword.length>20 || !isPassword(registerPassword)) {
$(".register_input_pwd_failed")[0].style.display = "block";
if (isFocus == false) {
$("#register_input_pwd").focus();
@@ -292,6 +295,15 @@ function isLoginName(loginName)
return reg.test(loginName);
}
+/**
+ * 数字 字母下划线
+ * @param password
+ */
+function isPassword(password) {
+ var reg = /^[^\u4e00-\u9fa5]+$/;
+ return reg.test(password);
+}
+
function loginNameExist()
{
zalyjsAlert("用户名已经在站点被注册");
@@ -344,7 +356,6 @@ function handlePassportPasswordUpdateInvationCode(results)
if(refererUrl != undefined && refererUrl.length>1) {
handleRedirect();
} else {
- console.log("call js " + clientType + " zalyJsLoginSuccess" + " == presessionid=="+preSessionId);
zalyjsLoginSuccess(loginName, preSessionId, isRegister, loginFailed);
}
}
@@ -353,7 +364,7 @@ function handlePassportPasswordReg(results)
{
isRegister = true;
preSessionId = results.preSessionId;
- if(refererUrl != undefined && refererUrl.length>1) {
+ if(refererUrl != undefined && refererUrl.length>1 || clientType == "PC") {
handleRedirect();
} else {
zalyjsLoginSuccess(registerLoginName, preSessionId, isRegister, loginFailed);
@@ -409,7 +420,7 @@ function handleApiPassportPasswordLogin(results)
{
isRegister = false;
preSessionId = results.preSessionId;
- if(refererUrl != undefined && refererUrl.length>1) {
+ if(refererUrl != undefined && refererUrl.length>1 || clientType == "PC") {
var jsUrl = "./index.php?action=page.js&loginName="+loginName+"&success_callback=loginSuccess&fail_callback=loginFailNeedRegister";
addJsByDynamic(jsUrl);
} else {
@@ -421,7 +432,6 @@ function loginFailNeedRegister()
{
if(enableInvitationCode != "1") {
if(isRegister == true) {
- console.log("isRegister is always true isregister ==" + isRegister);
return false;
}
isRegister = true;
diff --git a/src/public/js/zalyjsNative.js b/src/public/js/zalyjsNative.js
index b25560fb..818a24a0 100644
--- a/src/public/js/zalyjsNative.js
+++ b/src/public/js/zalyjsNative.js
@@ -58,7 +58,7 @@ function getOsType() {
} else if (u.indexOf('iPhone') > -1) {
clientType = 'IOS';
} else {
- clientType = "";
+ clientType = "PC";
}
}
diff --git a/src/views/manage/config/defaultFriends.php b/src/views/manage/config/defaultFriends.php
index 9c1c40f0..88799def 100755
--- a/src/views/manage/config/defaultFriends.php
+++ b/src/views/manage/config/defaultFriends.php
@@ -3,7 +3,7 @@
-
+
+
+
+
+ Login
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Register
+ Forget Password
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Find Password
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 输入邀请码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 输入邀请码
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Config Manage
+ <?php if ($lang == "1") { ?>站点公钥<?php } else { ?>Site Public Key<?php } ?>
@@ -18,7 +18,7 @@
width: 100%;
height: 100%;
background: rgba(245, 245, 245, 1);
- font-size: 10.66px;
+ font-size: 14px;
}
diff --git a/src/views/manage/group/indexList.php b/src/views/manage/group/indexList.php
index 57f89bef..aae0371d 100755
--- a/src/views/manage/group/indexList.php
+++ b/src/views/manage/group/indexList.php
@@ -3,7 +3,7 @@
- Mini Program
+ <?php if ($lang == "1") { ?>群组管理<?php } else { ?>Group Management<?php } ?>
@@ -18,10 +18,10 @@
/*overflow: hidden;*/
width: 100%;
height: 100%;
- background: rgba(245, 244, 249, 1);
+ background: rgba(245, 245, 245, 1);
font-size: 14px;
overflow-x: hidden;
- overflow-y: hidden;
+ /*overflow-y: hidden;*/
}
@@ -320,8 +320,6 @@
-
-
diff --git a/src/views/manage/config/siteManagers.php b/src/views/manage/config/siteManagers.php
index 081794de..26de3cce 100755
--- a/src/views/manage/config/siteManagers.php
+++ b/src/views/manage/config/siteManagers.php
@@ -3,7 +3,7 @@
- Mini Program
+ <?php if ($lang == "1") { ?>站点管理员<?php } else { ?>Site Managers<?php } ?>
@@ -18,7 +18,7 @@
/*overflow: hidden;*/
width: 100%;
height: 100%;
- background: rgba(245, 244, 249, 1);
+ background: rgba(245, 245, 245, 1);
font-size: 14px;
overflow-x: hidden;
overflow-y: hidden;
@@ -386,35 +386,6 @@
-
-
-
-
@@ -546,7 +517,7 @@ function zalyjsCommonOpenPage(url, target = "_blank") {
zalyjsCommonOpenPage(url);
});
-
+
diff --git a/src/views/manage/config/sitePublicKey.php b/src/views/manage/config/sitePublicKey.php
index 02c1bede..2f01a305 100755
--- a/src/views/manage/config/sitePublicKey.php
+++ b/src/views/manage/config/sitePublicKey.php
@@ -3,7 +3,7 @@
-
-
-
-
-
-
-
- 创建群组
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -346,7 +344,7 @@
$profile) { ?>
-
">
+
">
Config Manage
+ <?php if ($lang == "1") { ?>群资料<?php } else { ?>Group Profile<?php } ?>
@@ -18,7 +18,7 @@
width: 100%;
height: 100%;
background: rgba(245, 245, 245, 1);
- font-size: 10.66px;
+ font-size: 14px;
overflow-x: hidden;
overflow-y: hidden;
diff --git a/src/views/manage/home.php b/src/views/manage/home.php
index d7401ef1..45f58a4f 100755
--- a/src/views/manage/home.php
+++ b/src/views/manage/home.php
@@ -15,8 +15,8 @@
overflow: hidden;
width: 100%;
height: 100%;
- background: rgba(245, 244, 249, 1);
- font-size: 10.66px;
+ background: rgba(245, 245, 245, 1);
+ font-size: 14px;
}
@@ -73,7 +73,7 @@
width: 100%;
height: 50px;
margin-left: 1rem;
- margin-top: 1rem;
+ margin-top: 7px;
flex-direction: row;
}
@@ -137,8 +137,7 @@
@@ -373,34 +371,6 @@
-
-
-
-
-
@@ -522,7 +492,7 @@ function zalyjsCommonOpenPage(url, target = "_blank") {
diff --git a/src/views/manage/group/profile.php b/src/views/manage/group/profile.php
index 00619f75..283c9905 100755
--- a/src/views/manage/group/profile.php
+++ b/src/views/manage/group/profile.php
@@ -3,7 +3,7 @@
-
-
-
-
-
-
-
- 创建群组
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ <?php if ($lang == "1") { ?>小程序<?php } else { ?>Mini Program<?php } ?>
+ <?php if ($lang == "1") { ?>小程序列表<?php } else { ?>Mini Program List<?php } ?>
@@ -20,7 +20,7 @@
font-size: 14px;
overflow-x: hidden;
/*overflow-y: hidden;*/
- display: block;
+ /*display: block;*/
}
/* mask and new window */
@@ -307,8 +307,6 @@
-
-
站点设置
Site Config
@@ -382,7 +381,7 @@ function zalyjsCommonOpenNewPage(url) {
$("#site-config-id").click(function () {
var url = "/index.php?action=manage.config&lang=" + getLanguage();
- zalyjsCommonOpenPage(url);
+ zalyjsCommonOpenNewPage(url);
});
$("#mini-program-id").click(function () {
diff --git a/src/views/manage/miniProgram/add.php b/src/views/manage/miniProgram/add.php
index 43dbafea..45937b44 100755
--- a/src/views/manage/miniProgram/add.php
+++ b/src/views/manage/miniProgram/add.php
@@ -3,7 +3,7 @@
- <?php if ($lang == "1") { ?>添加小程序<?php } else { ?>Add Mini Program<?php } ?>
+ <?php if ($lang == "1") { ?>小程序添加<?php } else { ?>Add Mini Program<?php } ?>
@@ -18,8 +18,8 @@
/*overflow: hidden;*/
width: 100%;
height: 100%;
- background: rgba(245, 244, 249, 1);
- font-size: 10.66px;
+ background: rgba(245, 245, 245, 1);
+ font-size: 14px;
overflow-x: hidden;
overflow-y: hidden;
diff --git a/src/views/manage/miniProgram/index.php b/src/views/manage/miniProgram/index.php
index b94bcaff..58ef584d 100755
--- a/src/views/manage/miniProgram/index.php
+++ b/src/views/manage/miniProgram/index.php
@@ -3,7 +3,7 @@
- <?php if ($lang == "1") { ?>小程序<?php } else { ?>Mini Program<?php } ?>
+ <?php if ($lang == "1") { ?>小程序管理<?php } else { ?>Mini Program Management<?php } ?>
@@ -331,8 +331,6 @@
-
-
-
-
@@ -357,8 +355,8 @@
Public Secret Key
-
@@ -438,35 +436,6 @@
-
-
-
-
@@ -634,7 +603,6 @@ function createNewKey() {
}
function createKeyResponse(url, data, result) {
- alert(result);
window.location.reload();
}
diff --git a/src/views/manage/miniProgram/list.php b/src/views/manage/miniProgram/list.php
index fd77be97..263772a5 100755
--- a/src/views/manage/miniProgram/list.php
+++ b/src/views/manage/miniProgram/list.php
@@ -3,7 +3,7 @@
-
-
-
-
-
-
-
- 创建群组
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -334,7 +332,7 @@
$value) { ?>
- ">
+
">
-
-Mini Program
+ <?php if ($lang == "1") { ?>用户群组<?php } else { ?>User Groups<?php } ?>
@@ -18,7 +18,7 @@
/*overflow: hidden;*/
width: 100%;
height: 100%;
- background: rgba(245, 244, 249, 1);
+ background: rgba(245, 245, 245, 1);
font-size: 14px;
overflow-x: hidden;
overflow-y: hidden;
diff --git a/src/views/manage/user/indexList.php b/src/views/manage/user/indexList.php
index d80b796d..02a65cbe 100755
--- a/src/views/manage/user/indexList.php
+++ b/src/views/manage/user/indexList.php
@@ -3,7 +3,7 @@
- Mini Program
+ <?php if ($lang == "1") { ?>用户管理<?php } else { ?>User Management<?php } ?>
@@ -18,7 +18,7 @@
/*overflow: hidden;*/
width: 100%;
height: 100%;
- background: rgba(245, 244, 249, 1);
+ background: rgba(245, 245, 245, 1);
font-size: 14px;
overflow-x: hidden;
overflow-y: hidden;
@@ -433,8 +433,6 @@ function zalyjsCommonOpenPage(url) {
-
-
User Profile
+ <?php if ($lang == "1") { ?>用户资料<?php } else { ?>User Profile<?php } ?>
@@ -17,8 +17,8 @@
/*overflow: hidden;*/
width: 100%;
height: 100%;
- background: rgba(245, 244, 249, 1);
- font-size: 10.66px;
+ background: rgba(245, 245, 245, 1);
+ font-size: 14px;
overflow-x: hidden;
overflow-y: hidden;
@@ -558,29 +558,32 @@ function zalyjsCommonOpenPage(url) {
@@ -359,35 +357,6 @@
-
-
-
-
@@ -511,7 +480,7 @@ function zalyjsCommonOpenPage(url, target = "_blank") {
diff --git a/src/views/manage/user/groups.php b/src/views/manage/user/groups.php
index 2dbca4e3..66f2e4ef 100755
--- a/src/views/manage/user/groups.php
+++ b/src/views/manage/user/groups.php
@@ -3,7 +3,7 @@
-
-
-
-
-
-
-
- 创建群组
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -506,34 +504,6 @@ function zalyjsCommonOpenPage(url) {
-
-
-
-
-
diff --git a/src/views/manage/user/profile.php b/src/views/manage/user/profile.php
index 4642f5a5..0057f3e6 100755
--- a/src/views/manage/user/profile.php
+++ b/src/views/manage/user/profile.php
@@ -3,7 +3,7 @@
-
-
-
-
-
-
-
- 创建群组
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
设为站点管理员
-
- Add Site Manager
-
-
+
-
-
-
+
-
+
+
+
-
+
-
+
+
设为站点管理员
-
+ Add Site Manager
+
+
+
+
+
+
+
+
+
+
@@ -637,34 +640,34 @@ function zalyjsCommonOpenPage(url) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/miniProgram/passport/account.php b/src/views/miniProgram/passport/account.php
index e0269fe9..6c92515e 100644
--- a/src/views/miniProgram/passport/account.php
+++ b/src/views/miniProgram/passport/account.php
@@ -29,11 +29,11 @@
-
From 0c3573992c72491725de463c656a00c564809003 Mon Sep 17 00:00:00 2001 From: sisishiliu <4416@cunmou.com> Date: Mon, 10 Sep 2018 21:48:06 +0800 Subject: [PATCH 012/302] 1.0-beta-2 --- src/config.sample.php | 3 +- .../Api/Site/Api_Site_LoginController.php | 8 ++-- src/controller/BaseController.php | 2 +- ...MiniProgram_Passport_AccountController.php | 37 +++++-------------- src/lib/Util/ZalyHelper.php | 3 ++ src/model/Site/Site_Login.php | 9 +++-- src/public/css/login.css | 2 +- src/public/css/zaly_msg.css | 2 +- src/public/css/zaly_widget.css | 2 +- src/public/js/im/zalyAction.js | 1 + src/public/js/im/zalyIm.js | 4 ++ src/public/js/im/zalyKey.js | 2 + src/public/js/im/zalyMsg.js | 12 ++++-- src/views/miniProgram/passport/account.php | 22 ++++++----- src/views/passport/login.php | 16 ++++---- src/views/passport/template_login.php | 11 +++--- 16 files changed, 67 insertions(+), 69 deletions(-) diff --git a/src/config.sample.php b/src/config.sample.php index 29028040..4d406e68 100644 --- a/src/config.sample.php +++ b/src/config.sample.php @@ -14,9 +14,8 @@ 'loginPluginId' => '105', 'apiPageWidget' => './index.php?action=page.widget', 'apiPageSiteInit' => "./index.php?action=installDB", - 'apiSiteLogin' => './index.php?action=api.site.login&body_format=pb', 'session_verify_101' => 'http://open.akaxin.com:5208/index.php?action=api.session.verify&body_format=pb', - 'session_verify_102' => './index.php?action=api.session.verify&body_format=pb', + 'session_verify_102' => './index.php?action=api.session.verify&body_format=base64pb', "siteAddress" => '', 'passport_cookie_name' => "duckchat_passport_cookie", 'mail' => diff --git a/src/controller/Api/Site/Api_Site_LoginController.php b/src/controller/Api/Site/Api_Site_LoginController.php index 405b9c7f..d5e1a6ec 100644 --- a/src/controller/Api/Site/Api_Site_LoginController.php +++ b/src/controller/Api/Site/Api_Site_LoginController.php @@ -1,4 +1,4 @@ -cd @@ -49,7 +49,6 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf } $this->ctx->Wpf_Logger->info("api.site.login", "preSessionId=" . $preSessionId); -// $this->ctx->Wpf_Logger->info("api.site.login", " -devicePubkPem=" . $devicePubkPem); if (!$preSessionId) { $errorCode = $this->zalyError->errorSiteLogin; @@ -62,11 +61,11 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf $userProfile = $this->ctx->Site_Login->checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem, 1); $realSessionId = $userProfile['sessionId']; + $this->ctx->Wpf_Logger->info("api.site.login", "get platform sessionid=" . $realSessionId); $response = $this->buildApiSiteLoginResponse($userProfile, $realSessionId); - $this->ctx->Wpf_Logger->info("api.site.login", "response=" . $response->serializeToJsonString()); //back to request @@ -76,7 +75,6 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf $errorCode = $this->zalyError->errorSiteLogin; $errorInfo = $this->zalyError->getErrorInfo($errorCode); $this->ctx->Wpf_Logger->error($tag, "=========error=" . $ex->getMessage()); - $this->setRpcError($errorCode, $errorInfo); $this->rpcReturn($transportData->getAction(), new $this->classNameForResponse()); } @@ -92,9 +90,9 @@ private function buildApiSiteLoginResponse($userInfo, $sessionId) $publicUserProfile = $this->getPublicUserProfile($userInfo); if (\Zaly\Proto\Core\UserAvailableType::UserAvailableBlocked == $publicUserProfile->getAvailableType()) { + error_log("user profile failed"); throw new Exception("user is blocked"); } - $allUserProfile = new \Zaly\Proto\Core\AllUserProfile(); $allUserProfile->setPublic($publicUserProfile); diff --git a/src/controller/BaseController.php b/src/controller/BaseController.php index 458704b4..dd6cb955 100644 --- a/src/controller/BaseController.php +++ b/src/controller/BaseController.php @@ -112,7 +112,6 @@ public function rpcReturn($action, $response) $transData->setHeader($this->headers); $transData->setPackageId($this->requestTransportData->getPackageId()); - $body = ""; if ("json" == $this->bodyFormatType) { $body = $transData->serializeToJsonString(); @@ -126,6 +125,7 @@ public function rpcReturn($action, $response) return; } echo $body; + return; } // ignore.~ diff --git a/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php b/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php index c56632e4..44312609 100644 --- a/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php +++ b/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php @@ -37,8 +37,6 @@ public function doRequest() if($method == "post") { $loginName = $_POST['loginName']; - $newPassword = $_POST['newPassword']; - $oldPassword = $_POST['oldPassword']; $siteLoginName = $this->loginName; if($siteLoginName != $loginName) { @@ -47,14 +45,8 @@ public function doRequest() echo json_encode(["errCode" => $errorInfo]); return; } - if(strlen($newPassword)<5 || strlen($newPassword)>20) { - $errorCode = $this->zalyError->errorPassowrdLength; - $errorInfo = $this->zalyError->getErrorInfo($errorCode); - echo json_encode(["errCode" => $errorInfo]); - return; - } - $this->modifyPassportPassword($loginName, $oldPassword, $newPassword); + $this->modifyPassportPassword($loginName); echo json_encode(["errCode" => "success"]); return; } else { @@ -69,22 +61,15 @@ public function doRequest() } } - private function modifyPassportPassword($loginName, $oldPassword, $newPassword) + private function modifyPassportPassword($loginName) { $tag = __CLASS__ . "-". __FUNCTION__; try{ - $modifyPasswordReq = new \Zaly\Proto\Site\ApiPassportPasswordModifyPasswordRequest(); - $modifyPasswordReq->setLoginName($loginName); - $modifyPasswordReq->setPassword($oldPassword); - $modifyPasswordReq->setNewPassword($newPassword); - $updatePasswordUrl = "/index.php?action=" . $this->resetPassword . "&body_format=pb"; - $updatePasswordUrl = ZalyHelper::getFullReqUrl($updatePasswordUrl); - $this->sendReq( $this->resetPassword, $updatePasswordUrl, $modifyPasswordReq); $sessionClearRequest = new \Zaly\Proto\Plugin\DuckChatSessionClearRequest(); $sessionClearRequest->setUserId($this->userId); - $sessionClearUrl = "/index.php?action=" . $this->sessionClear . "&body_format=pb&miniProgramId=".$this->passporAccountPluginId; + $sessionClearUrl = "/index.php?action=" . $this->sessionClear . "&body_format=base64pb&miniProgramId=".$this->passporAccountPluginId; $sessionClearUrl = ZalyHelper::getFullReqUrl($sessionClearUrl); $this->sendReq($this->sessionClear, $sessionClearUrl, $sessionClearRequest); }catch (Exception $ex) { @@ -104,20 +89,16 @@ private function sendReq($action, $url, $dataReq) $transportData->setAction($action); $transportData->setHeader(["_".\Zaly\Proto\Core\TransportDataHeaderKey::HeaderUserClientLang => $this->language]); $data = $transportData->serializeToString(); + $data = base64_encode($data); $pluginProfile = $this->getMiniProgramProfile($this->passporAccountPluginId); - - if($action == $this->sessionClear) { - $authKey = $pluginProfile['authKey']; - $data = $this->ctx->ZalyAes->encrypt($data, $authKey); - } + $authKey = $pluginProfile['authKey']; + $data = $this->ctx->ZalyAes->encrypt($data, $authKey); $result = $this->ctx->ZalyCurl->request("post", $url, $data); - - if($action == $this->sessionClear) { - $authKey = $pluginProfile['authKey']; - $result = $this->ctx->ZalyAes->decrypt($data, $authKey); - } + $authKey = $pluginProfile['authKey']; + $result = $this->ctx->ZalyAes->decrypt($result, $authKey); + $result = base64_decode($result); //解析数据 $transportData = new \Zaly\Proto\Core\TransportData(); diff --git a/src/lib/Util/ZalyHelper.php b/src/lib/Util/ZalyHelper.php index 3ba57651..ca1755bb 100644 --- a/src/lib/Util/ZalyHelper.php +++ b/src/lib/Util/ZalyHelper.php @@ -175,6 +175,9 @@ public static function getFullReqUrl($reqUrl) } if(strpos($reqUrl, "/") == 0) { $fullUrl = "{$schema}://{$host}{$reqUrl}"; + } elseif(strpos($reqUrl, "./") == 0){ + $reqUrl = str_replace("./", "/", $reqUrl); + $fullUrl = "{$schema}://{$host}{$reqUrl}"; } else { $fullUrl = "{$schema}://{$host}/{$reqUrl}"; } diff --git a/src/model/Site/Site_Login.php b/src/model/Site/Site_Login.php index ebb3d313..bab8bce1 100644 --- a/src/model/Site/Site_Login.php +++ b/src/model/Site/Site_Login.php @@ -44,7 +44,6 @@ public function checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem = "" //get userProfile from platform $loginUserProfile = $this->getUserProfileFromPlatform($preSessionId, $sitePriKeyPem); - //get intivation first $uicInfo = $this->getIntivationCode($loginUserProfile->getInvitationCode()); @@ -91,14 +90,15 @@ private function getUserProfileFromPlatform($preSessionId, $sitePrikPem) $transportData->setBody($anyBody); $transportData->setAction($this->sessionVerifyAction); $data = $transportData->serializeToString(); - + $data = base64_encode($data); $pluginIds = $this->ctx->SiteConfigTable->selectSiteConfig(SiteConfig::SITE_LOGIN_PLUGIN_ID); $pluginId = $pluginIds[SiteConfig::SITE_LOGIN_PLUGIN_ID]; $sessionVerifyUrl = ZalyConfig::getSessionVerifyUrl($pluginId); $sessionVerifyUrl = ZalyHelper::getFullReqUrl($sessionVerifyUrl); - $this->ctx->Wpf_Logger->error("api.site.login", "get profile from platform url=" . $sessionVerifyUrl); + $result = $this->ctx->ZalyCurl->request("post", $sessionVerifyUrl, $data); + $result = base64_decode($result); //解析数据 $transportData = new \Zaly\Proto\Core\TransportData(); @@ -122,9 +122,10 @@ private function getUserProfileFromPlatform($preSessionId, $sitePrikPem) $aesData = $response->getEncryptedProfile(); $randomKey = $this->ctx->ZalyRsa->decrypt($key, $sitePrikPem); $serialize = $this->ctx->ZalyAes->decrypt($aesData, $randomKey); + //获取LoginUserProfile $loginUserProfile = unserialize($serialize); -// $this->ctx->Wpf_Logger->error("site: api.session.verify api.site.login", " profile=" . $loginUserProfile->serializeToJsonString()); + return $loginUserProfile; } catch (Exception $ex) { diff --git a/src/public/css/login.css b/src/public/css/login.css index 7522b2df..76530c95 100755 --- a/src/public/css/login.css +++ b/src/public/css/login.css @@ -5,7 +5,7 @@ body,html { padding:0; margin:0; -webkit-tap-highlight-color: transparent; - background:url("http://duckchat.akaxin.com/border_line.png") no-repeat; + background:url("https://duckchat.akaxin.com/border_line.png") no-repeat; } .zaly_container { diff --git a/src/public/css/zaly_msg.css b/src/public/css/zaly_msg.css index e5fc62bb..376f6c62 100755 --- a/src/public/css/zaly_msg.css +++ b/src/public/css/zaly_msg.css @@ -43,7 +43,7 @@ html, body{ width: 100%; height: 100%; font-size: 10.66px; - background: url("http://duckchat.akaxin.com/border_line.png") no-repeat ; + background: url("https://duckchat.akaxin.com/border_line.png") no-repeat ; } /**:focus {outline: none;}*/ diff --git a/src/public/css/zaly_widget.css b/src/public/css/zaly_widget.css index e8045893..6bb3080f 100755 --- a/src/public/css/zaly_widget.css +++ b/src/public/css/zaly_widget.css @@ -7,7 +7,7 @@ html, body{ width: 100%; height: 100%; font-size: 10.66px; - background:url("http://duckchat.akaxin.com/border_line.png") no-repeat; + background:url("https://duckchat.akaxin.com/border_line.png") no-repeat; } .widget { diff --git a/src/public/js/im/zalyAction.js b/src/public/js/im/zalyAction.js index 11f94437..cead90f1 100755 --- a/src/public/js/im/zalyAction.js +++ b/src/public/js/im/zalyAction.js @@ -40,6 +40,7 @@ var ZalyAction = { api_passport_passwordResetPassword :"site.ApiPassportPasswordResetPasswordRequest", duckchat_message_send : "plugin.DuckChatMessageSendRequest", api_passport_passwordUpdateInvitationCode:"site.ApiPassportPasswordUpdateInvitationCodeRequest", + api_passport_passwordModifyPassword : "site.ApiPassportPasswordModifyPasswordRequest", api_friend_search:"site.ApiFriendSearchRequest", diff --git a/src/public/js/im/zalyIm.js b/src/public/js/im/zalyIm.js index 94f10602..9f05e648 100755 --- a/src/public/js/im/zalyIm.js +++ b/src/public/js/im/zalyIm.js @@ -101,10 +101,14 @@ function handleImSendRequest(action, reqData, callback) if(resp) { handleReceivedImMessage(resp, callback); } + }, + fail: function () { + isSyncingMsg = false; } }); } } catch(e) { + isSyncingMsg = false; return false; } } diff --git a/src/public/js/im/zalyKey.js b/src/public/js/im/zalyKey.js index bcd540bf..a48ea52d 100755 --- a/src/public/js/im/zalyKey.js +++ b/src/public/js/im/zalyKey.js @@ -200,3 +200,5 @@ uploadFileUrl = './index.php?action=http.file.uploadWeb'; languageName = "zh"; languageNum = languageName == "en" ? UserClientLangEN : UserClientLangZH; +isSyncingMsg = false; +isPreSyncingMsgTime=""; diff --git a/src/public/js/im/zalyMsg.js b/src/public/js/im/zalyMsg.js index c1bbd777..472992b9 100755 --- a/src/public/js/im/zalyMsg.js +++ b/src/public/js/im/zalyMsg.js @@ -2,8 +2,6 @@ msgImageSize = ""; -isSyncingMsg = false; - function getRoomList() { var roomList = handleRoomListFromLocalStorage(undefined); @@ -269,7 +267,8 @@ function handleSetItemError(error) } enableWebsocketGw = localStorage.getItem(websocketGW); -if(enableWebsocketGw == "false") { + +if(enableWebsocketGw == "false" || enableWebsocketGw == null) { ///1秒 sync setInterval(function (args) { enableWebsocketGw = localStorage.getItem(websocketGW); @@ -298,9 +297,16 @@ function handleAuth() function syncMsgForRoom() { + + if((Date.parse(new Date()) - isPreSyncingMsgTime) > 10000) { + isSyncingMsg = false; + } + if(isSyncingMsg == true) { return ; } + + isPreSyncingMsgTime = Date.parse(new Date()); isSyncingMsg = true; var action = "im.cts.sync"; diff --git a/src/views/miniProgram/passport/account.php b/src/views/miniProgram/passport/account.php index 6c92515e..95e14f6a 100644 --- a/src/views/miniProgram/passport/account.php +++ b/src/views/miniProgram/passport/account.php @@ -23,7 +23,7 @@
v`dKJ`anZKa&|EB^2$=-qfUKlZ!YB39q3D1?tS*@W_Fm><*iph^s>1%^e|tXo7k?wtiLbcsrdAr
zhY<$g3H?!4BAPV4K-xV5~nws3N!PJJc<*mmAuzDT`0j8hMPkhW)*z|5~
zAPT~tTrT&ZFq7YD9Ag}gUWn$khe2tBahanRC@e}KjKk4`69wf$7>A=4Cn`!u7>A<<
zCk{$i7>AP#CoW1T7>5%NCkaYu7>5%LCn-uK7>5%MM+Hh`7>CmtM-@se7>5&#qY@=H
zjKgWgQH_!a#^Idc=s-yflXV
zI1*6U!RW@3g2EC;7mg$pwlJ!3q@l2eQH3KBg*{AC9H}TGVB+FPMiB!O6-PRXD44J~
zX+RMN(+vlRM%rq#oU1rdU5A8MqhyJM&er=Fbb|)~`T*oLZwCrR5t%Waan4vIqlkv7
z4{P94sV!3g4{|-;WW8XHq|u<>SCK6Gs$Gn3KnoskD3?F)(3JTBp*o
zaYVpGK}ib^dzd&VX~1C(lLSRN4qF%%D3Wnl!l*=%io*^@2Z}@-RxmnIy5RtMGn~rh
zvw<;zA_<2Dj7gL_PHCz91khhOfBA+>=2(ZZfg%CNDvV7O?l{(9IG}LGu>!*hg)5G6
z7>+0$ag4%nM&X8I3`PP9CmbU%l2EwdXor!A!U0DsjARtsIND&+fMOFz3rw0&Y~d(}
zNh6949HlU6Mlp?}3?>UGCUKO&WC_I-PGXoWqL{!*1e0YH-8ivf9Lm|#I6D5Ojs@dT
znjeum`K}r#GK@oMN6|5?MS^iC7o(`g2@T^=x}&JX2?gU&!lS6d=?ddeqNAw5=?LRc
z;-e(Rxe&&oBu7bt6A0r_)S<-1X@hYn>QUn0w7@tNeJD|J8Zf1$%|!xOXzrTy(o*`v
z9Iu5imv3q?Yb)h^<=8Jflz4%Tvs4fc0RF??p21@A-me-=X?gQG5xl84;4&pnsG~0v
zm^q#|R-7CEQiIu8{(SY2j=mAlbp+hY^>_~@7h#JYB6~|zaR}%w0QDi@*IOe4`O(qQ
zqsB32eSLGFa)@{P255I`YI5IRSF_i0sr2cZSMhHS-oCt3MX5&MKb(mS&J0H%tN;K2
M07*qoM6N<$f^aJ$YXATM
diff --git a/src/public/js/config/en.properties b/src/public/js/config/en.properties
deleted file mode 100755
index 5a6043f2..00000000
--- a/src/public/js/config/en.properties
+++ /dev/null
@@ -1,86 +0,0 @@
-chatSessionTip=Message
-groupTip=Groups Chat
-friendTip=Friends Chat
-createGroupTip=Create Group
-enterGroupNamePlaceholder=Please Enter Group Name
-createGroupNameTip=The Length Of Group Name between 1 and 10
-createTip=Create
-groupProfileDescTip=Group Introduce
-groupProfileNameTip=Group Name
-saveGroupDescTip=Save
-removeGroupMemberTip=Remove Member
-muteTip=Mute
-inviteFriendTip=Invite Friend
-joinGroupPermissionsTip=Add Group Permissions
-groupAdminTip=Administrator Invitation
-groupMemberTip=Members Invitation
-groupPublicTip=public
-saveTip=Save
-canGuestReadMsgTip=Guest Can Read Msg
-shareGroupTip=Share Group Qrcode
-quitGroupTip=Quit Group
-disbandGroupTip=Disband Group
-editRemarkTip=Edit Remark Name
-remarkNamePlaceholder=Please Enter Remark Name
-sureTip=Sure
-deleteFriendTip=Delete Friend
-addFriendTip=Add Friend
-sendTip=Send
-applyFriendTip=Apply Add Friend
-addFriendReasonPlaceholder=Please Enter Introduce
-newFriendsTip=New Friends
-refuseTip=Refuse
-agreeTip=agree
-introductionTip=Introduction
-noFriendDataTip=No Friends For Invite
-selectContactTip=Selected Contact
-cancelTip=Cancel
-addTip=Add
-removeTip=Select Member For Remove
-copyGroupQrcodeUrlTip=Copy Url
-saveGroupQrcodeImg=Save Qrcode
-openChatTip=Open Chat
-openTempChatTip=Temp Chat
-setSpeakerTip=Set Speaker
-removeSpeakerTip=Remove Speaker
-setAdminTip=Set Admin
-removeAdminTip=Remove Admin
-logoutTip=Logout
-friendQrcodeTip=Self Qrcode
-
-refuseFriendJsTip=Are You Refuse?
-agreeFriendJsTip=Are You Sure Agreed?
-logoutJsTip=Logout Account, The Chat Message Will Be Delete, Are You Sure Logout?
-deleteFriendJsTip=Are You Sure Delete Friend?
-removeAdminJsTip=Are You Sure Remove Admin Role?
-setAdminJsTip=Are You Sure Set Admin Role?
-setSpeakerJsTip=Are You Sure Set Speaker?
-removeSpeakerJsTip=Are You Sure Remove Speaker?
-quitGroupJsTip=Are You Sure Quit Group?
-disbandGroupJsTip=Are You Sure Disband Group?
-removeMemberFromGroupJsTip=Are You Sure Remove Member?
-
-
-
-loginTip=Login
-loginNamePlaceholder=Please Enter LoginName
-registerLoginNamePlaceholder=LoginName is alphanumeric, underscore, 1-16 characters
-enterPasswordPlaceholder=Please Enter Password
-enterCodePlaceholder=Please Enter Password
-registerTip=Register
-registerBtnTip=Register And Login
-registerBtnCodeTip=Next
-forgetPasswordTip=Forget Password
-enterRepasswordPlaceholder=Please Enter Password Again
-enterNicknamePlaceholder=Please Enter Nickname, 1-16 characters
-enterEmailPlaceholder=Please Enter Email
-hasAccountTip=Has Account?
-enterVerifyCodePlaceholder=Please Enter Verify Code
-getVerifyCodeTip=Get Verify Code
-resetPwdTip=Reset Password
-findPasswordTip=Find Password
-
-passwordIsNotSameJsTip=Password is not same
-emailJsTip=Email is unavailable
-loginNameNotNullJsTip=Please enter loginName
-sendVerifyCodeTimeJsTip=seconds After resend
\ No newline at end of file
diff --git a/src/public/js/config/zh.properties b/src/public/js/config/zh.properties
deleted file mode 100755
index 66e79935..00000000
--- a/src/public/js/config/zh.properties
+++ /dev/null
@@ -1,85 +0,0 @@
-chatSessionTip=消息
-groupTip=群聊
-friendTip=好友
-createGroupTip=创建群组
-enterGroupNamePlaceholder=请输入群组名称
-createGroupNameTip=群组名称长度限制1-10
-createTip=创建
-groupProfileDescTip=群介绍
-groupProfileNameTip=群名称
-saveGroupDescTip=保存
-removeGroupMemberTip=移除成员
-muteTip=静音
-inviteFriendTip=邀请好友
-joinGroupPermissionsTip=邀请入群权限
-groupAdminTip=管理员邀请
-groupMemberTip=群成员
-groupPublicTip=公开
-saveTip=保存
-canGuestReadMsgTip=游客是否可以阅读群消息
-shareGroupTip=分享群名片
-quitGroupTip=退群
-disbandGroupTip=解散群
-editRemarkTip=修改备注
-remarkNamePlaceholder=请输入备注
-sureTip=保存
-deleteFriendTip=删除好友
-addFriendTip=添加好友
-sendTip=发送
-applyFriendTip=新朋友
-addFriendReasonPlaceholder=请输入附言
-newFriendsTip=新朋友
-refuseTip=拒绝
-agreeTip=接受
-introductionTip=附言
-noFriendDataTip=暂无好友
-selectContactTip=选择好友
-cancelTip=取消
-addTip=添加
-removeTip=移除群成员
-copyGroupQrcodeUrlTip=复制链接
-saveGroupQrcodeImg=保存图片
-openChatTip=发起聊天
-openTempChatTip=临时会话
-setSpeakerTip=设为发言人
-removeSpeakerTip=移除发言人
-setAdminTip=设为管理员
-removeAdminTip=移除管理员
-logoutTip=退出
-friendQrcodeTip=二维码
-
-refuseFriendJsTip=确定拒绝对方？
-agreeFriendJsTip=确定同意对方的好友申请？
-logoutJsTip=退出账号，将会清空聊天记录
-deleteFriendJsTip=确定要删除好友么
-removeAdminJsTip=移除管理员
-setAdminJsTip=设置管理员
-setSpeakerJsTip=设置发言人
-removeSpeakerJsTip=确定要移除发言权限？
-quitGroupJsTip=退出群组
-disbandGroupJsTip=解散群
-removeMemberFromGroupJsTip=确定要移除群聊?
-
-
-loginTip=登录
-loginNamePlaceholder=输入登录名
-registerLoginNamePlaceholder=用户名以字母、数字、下划线，1-16个字符
-enterPasswordPlaceholder=输入密码
-registerTip=注册
-registerBtnTip=注册并登录
-registerBtnCodeTip=下一步
-forgetPasswordTip=忘记密码？
-enterRepasswordPlaceholder=再次输入密码
-enterNicknamePlaceholder=输入昵称,1-16个字符
-enterEmailPlaceholder=输入邮箱
-hasAccountTip=已有账号？
-enterVerifyCodePlaceholder=验证码
-enterCodePlaceholder = 输入邀请码
-getVerifyCodeTip=获取验证码
-resetPwdTip=重置密码
-findPasswordTip=找回密码
-
-passwordIsNotSameJsTip=两次密码不一致
-emailJsTip=邮箱不合法
-loginNameNotNullJsTip=输入用户名
-sendVerifyCodeTimeJsTip=秒后重新发送
\ No newline at end of file
diff --git a/src/public/js/login/account.js b/src/public/js/login/account.js
deleted file mode 100644
index 435dc144..00000000
--- a/src/public/js/login/account.js
+++ /dev/null
@@ -1,500 +0,0 @@
-
-var languageName = navigator.language == "en-US" ? "en" : "zh";
-
-var languageName = "zh";
-jQuery.i18n.properties({
- name: "lang",
- path: '../../public/js/config/',
- mode: 'map',
- language: languageName,
- callback: function () {
- try {
- //初始化页面元素
- $('[data-local]').each(function () {
- var changeData = $(this).attr("data-local");
- var changeDatas = changeData.split(":");
- var changeDataName = changeDatas[0];
- var changeDataValue = changeDatas[1];
- $(this).attr(changeDataName, $.i18n.map[changeDataValue]);
- });
- $('[data-local-value]').each(function () {
- var changeHtmlValue = $(this).attr("data-local-value");
- $(this).html($.i18n.map[changeHtmlValue]);
- });
- $('[data-local-placeholder]').each(function () {
- var placeholderValue = $(this).attr("data-local-placeholder");
- $(this).attr("placeholder", $.i18n.map[placeholderValue]);
- });
- }
- catch(ex){
- console.log(ex.message);
- }
- }
-});
-
-$(":input").attr("autocapitalize", "off");
-
-refererKey = "site_referer";
-siteConfig = {};
-enableInvitationCode=0;
-enableRealName=0;
-sitePubkPem="";
-invitationCode='';
-nickname="";
-allowShareRealname=0;
-preSessionId="";
-refererUrl = document.referrer;
-secondNum = 120;
-isSending = false;
-
-var protocol = window.location.protocol;
-var host = window.location.host;
-var pathname = window.location.pathname;
-originDomain = protocol+"//"+host+pathname;
-isRegister=false;
-
-
-function changeImgByClickPwd() {
- var imgType = $(".pwd").attr("img_type");
- if(imgType == "hide") {
- $(".pwd").attr("img_type", "display");
- $(".pwd").attr("src", "../../public/img/login/display_pwd.png");
- $(".login_input_pwd").attr("type", "text");
- $(".register_input_pwd").attr("type", "text");
- $(".forget_input_pwd").attr("type", "text");
- } else {
- $(".pwd").attr("img_type", "hide");
- $(".pwd").attr("src", "../../public/img/login/hide_pwd.png");
- $(".login_input_pwd").attr("type", "password");
- $(".register_input_pwd").attr("type", "password");
- $(".forget_input_pwd").attr("type", "password");
- }
-}
-
-function changeImgByClickRepwd() {
- var imgType = $(".repwd").attr("img_type");
- if(imgType == "hide") {
- $(".repwd").attr("img_type", "display");
- $(".repwd").attr("src", "../../public/img/login/display_pwd.png");
- $(".register_input_repwd").attr("type", "text");
- $(".forget_input_repwd").attr("type", "text");
- } else {
- $(".repwd").attr("img_type", "hide");
- $(".repwd").attr("src", "../../public/img/login/hide_pwd.png");
- $(".register_input_repwd").attr("type", "password");
- $(".forget_input_repwd").attr("type", "password");
- }
-}
-
-$(".input_login_site").bind('input porpertychange',function(){
- if($(this).val().length>0) {
- $(this).addClass("black");
- $(this).removeClass("outline");
- }
-});
-
-function registerForPassportPassword()
-{
- var html = template("tpl-register-div", {
- enableInvitationCode : enableInvitationCode
- });
- html = handleHtmlLanguage(html);
- $(".zaly_site_register-pwd").html(html);
- $(".zaly_login_by_pwd")[0].style.display = "none";
- $(".zaly_site_register-pwd")[0].style.display = "block";
-}
-
-function returnRegisterDiv() {
- $(".zaly_site_register-pwd")[0].style.display = "block";
- $(".zaly_site_register-invitecode")[0].style.display = "none";
- $(".zaly_site_update-invitecode")[0].style.display = "none";
-}
-
-function handleHtmlLanguage(html)
-{
- console.log($.i18n.map['registerBtnTip']);
- $(html).find("[data-local-placeholder]").each(function () {
- var placeholderValue = $(this).attr("data-local-placeholder");
- var placeholder = $(this).attr("placeholder");
- var newPlaceholder = $.i18n.map[placeholderValue];
- html = html.replace(placeholder, newPlaceholder);
- });
-
- $(html).find("[data-local-value]").each(function () {
- var changeHtmlValue = $(this).attr("data-local-value");
- var valueHtml = $(this).html();
- var newValueHtml = $.i18n.map[changeHtmlValue];
- // $(this).html(newValueHtml);
- html = html.replace(valueHtml, newValueHtml);
- });
-
- console.log(html);
-
- return html;
-}
-
-
-function forgetPwdForPassportPassword()
-{
- $(".zaly_login_by_pwd")[0].style.display = "none";
- $(".zaly_site_register-repwd")[0].style.display = "block";
-}
-
-function registerForLogin()
-{
- // $(".input_login_site").val("");
- $(".zaly_login_by_pwd")[0].style.display = "block";
- $(".zaly_site_register-pwd")[0].style.display = "none";
-}
-
-$(document).on("click", ".register_code_button", function () {
- var flag = checkRegisterInfo();
- if(flag == false) {
- return false;
- }
- $(".zaly_site_register-invitecode")[0].style.display = "block";
- $(".zaly_site_register-pwd")[0].style.display = "none";
-});
-
-function checkRegisterInfo()
-{
- registerLoginName = $(".register_input_loginName").val();
- registernNickname = $(".register_input_nickname").val();
- registerPassword = $(".register_input_pwd").val();
- repassword = $(".register_input_repwd").val();
- registerEmail = $(".register_input_email").val();
- isFocus = false;
-
- if(registerLoginName == "" || registerLoginName == undefined || registerLoginName.length<0 ) {
- $("#register_input_loginName").focus();
- $(".register_input_loginName_failed")[0].style.display = "block";
- isFocus = true;
- }
-
- if(!isLoginName(registerLoginName) || registerLoginName.length>16) {
- $("#register_input_loginName").focus();
- $(".register_input_loginName_failed")[0].style.display = "block";
- isFocus = true;
- }
-
-
- if(registerPassword == "" || registerPassword == undefined || registerPassword.length<0) {
- $(".register_input_pwd_failed")[0].style.display = "block";
- if (isFocus == false) {
- $("#register_input_pwd").focus();
- $(".register_input_loginName_failed")[0].style.display = "none";
- isFocus = true;
- }
- }
-
- if(repassword == "" || repassword == undefined || repassword.length<0) {
- $(".register_input_repwd_failed")[0].style.display = "block";
- if(isFocus == false) {
- $("#register_input_repwd").focus();
- $(".register_input_pwd_failed")[0].style.display = "none";
- isFocus = true;
- }
- }
-
- if(registernNickname == "" || registernNickname == undefined || registernNickname.length<0 || registernNickname.length>16) {
- $(".register_input_nickname_failed")[0].style.display = "block";
- if(isFocus == false) {
- $(".register_input_repwd_failed")[0].style.display = "none";
- $("#register_input_nickname").focus();
- isFocus = true;
- }
- }
-
- if(registerEmail == "" || registerEmail == undefined || registerEmail.length<0) {
- $(".register_input_email_failed")[0].style.display = "block";
- if(isFocus == false) {
- $("#register_input_email").focus();
- $(".register_input_nickname_failed")[0].style.display = "none";
- isFocus = true;
- }
- }
-
-
- if(isFocus == true) {
- return false;
- }
- $(".register_input_email_failed")[0].style.display = "none";
-
- if(registerPassword != repassword) {
- zalyjsAlert($.i18n.map["passwordIsNotSameJsTip"]);
- return false;
- }
- if(!validateEmail(registerEmail)) {
- zalyjsAlert($.i18n.map["emailJsTip"]);
- return false;
- }
- return true;
-}
-
-/**
- * 数字 字母下划线
- * @param loginName
- */
-function isLoginName(loginName)
-{
- var reg = /^[A-Za-z0-9_]+$/;
- return reg.test(loginName);
-}
-
-function loginNameExist()
-{
- zalyjsAlert("用户名已经在站点被注册");
-}
-
-function loginNameNotExist()
-{
- if(sitePubkPem.length<1) {
- zalyjsAlert("站点公钥获取失败");
- return false;
- }
-
- var action = "api.passport.passwordReg";
- var reqData = {
- loginName:registerLoginName,
- password:registerPassword,
- email:registerEmail,
- nickname:registernNickname,
- sitePubkPem:sitePubkPem,
- invitationCode:invitationCode,
- }
- handleClientSendRequest(action, reqData, handlePassportPasswordReg);
-}
-
-$(document).on("click", ".register_button", function () {
- invitationCode = $(".register_input_code").val();
- var flag = checkRegisterInfo();
- if(flag == false) {
- return false;
- }
- var jsUrl = "./index.php?action=page.js&loginName="+registerLoginName+"&success_callback=loginNameExist&fail_callback=loginNameNotExist";
- addJsByDynamic(jsUrl);
-});
-
-$(document).on("click", ".update_code_btn", function () {
- invitationCode = $(".update_input_code").val();
- var action = "api.passport.passwordUpdateInvitationCode";
- var reqData = {
- sitePubkPem:sitePubkPem,
- invitationCode:invitationCode,
- preSessionId:preSessionId,
- }
- handleClientSendRequest(action, reqData, handlePassportPasswordUpdateInvationCode);
-});
-
-function handlePassportPasswordUpdateInvationCode(results)
-{
- isRegister = true;
- preSessionId = results.preSessionId;
- if(refererUrl != undefined && refererUrl.length>1) {
- handleRedirect();
- } else {
- console.log("call js " + clientType + " zalyJsLoginSuccess" + " == presessionid=="+preSessionId);
- zalyjsLoginSuccess(loginName, preSessionId, isRegister, loginFailed);
- }
-}
-
-function handlePassportPasswordReg(results)
-{
- isRegister = true;
- preSessionId = results.preSessionId;
- if(refererUrl != undefined && refererUrl.length>1) {
- handleRedirect();
- } else {
- zalyjsLoginSuccess(registerLoginName, preSessionId, isRegister, loginFailed);
- }
-}
-
-function validateEmail(email)
-{
- var re = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
- return re.test(email);
-}
-
-
-$(document).on("click", ".login_button", function () {
-
- loginName = $(".login_input_loginName").val();
- loginPassword = $(".login_input_pwd").val();
- var isFocus = false;
- if(loginName == "" || loginName == undefined || loginName.length<0) {
- $(".login_input_loginName").focus();
- $(".login_input_loginName_failed")[0].style.display = "block";
- isFocus = true;
- }
-
- if(loginPassword == "" || loginPassword == undefined || loginPassword.length<0) {
- $(".login_input_pwd_failed")[0].style.display = "block";
- if (isFocus == false) {
- $(".login_input_pwd").focus();
- $(".login_input_loginName_failed")[0].style.display = "none";
- isFocus = true;
- }
- }
-
- if(isFocus == true ) {
- return false;
- }
- $(".login_input_pwd_failed")[0].style.display = "none";
-
- if(sitePubkPem.length<1) {
- zalyjsAlert("站点公钥获取失败");
- return false;
- }
- var action = "api.passport.passwordLogin";
- var reqData = {
- loginName:loginName,
- password:loginPassword,
- sitePubkPem:sitePubkPem,
- };
- handleClientSendRequest(action, reqData, handleApiPassportPasswordLogin);
-});
-
-function handleApiPassportPasswordLogin(results)
-{
- isRegister = false;
- preSessionId = results.preSessionId;
- if(refererUrl != undefined && refererUrl.length>1) {
- var jsUrl = "./index.php?action=page.js&loginName="+loginName+"&success_callback=loginSuccess&fail_callback=loginFailNeedRegister";
- addJsByDynamic(jsUrl);
- } else {
- zalyjsLoginSuccess(loginName, preSessionId, isRegister, loginFailNeedRegister);
- }
-}
-
-function loginFailNeedRegister()
-{
- if(enableInvitationCode != "1") {
- if(isRegister == true) {
- console.log("isRegister is always true isregister ==" + isRegister);
- return false;
- }
- isRegister = true;
- if(refererUrl != undefined && refererUrl.length>1) {
- handleRedirect();
- } else {
- zalyjsLoginSuccess(loginName, preSessionId, isRegister, loginFailed);
- }
- } else {
- $(".zaly_login_by_pwd")[0].style.display = "none";
- $(".zaly_site_update-invitecode")[0].style.display = "block";
- }
-}
-
-function getVerifyCode()
-{
- if(isSending == true) {
- return;
- }
- var loginName = $(".forget_input_loginName").val();
- if(loginName.length < 1) {
- ////TODO 换成 页面漂浮报错
- zalyjsAlert($.i18n.map["loginNameNotNullJsTip"]);
- return false;
- }
-
- var action = "api.passport.passwordFindPassword";
- var reqData = {
- "loginName" : loginName,
- };
-
- isSending = true;
- showTime();
-
- handleClientSendRequest(action, reqData, handleVerifyCode);
-}
-
-function handleVerifyCode()
-{
- $(".forget_input_repwd_div")[0].style.display = "block";
- $(".forget_input_pwd_div")[0].style.display = "block";
-}
-
-function showTime()
-{
- secondNum = secondNum-1;
- if(secondNum < 0) {
- var html = "获取验证码";
- $(".get_verify_code").html(html);
- isSending = false;
- secondNum = 120;
- return false;
- }
- var html = secondNum+$.i18n.map['sendVerifyCodeTimeJsTip']
- $(".get_verify_code").html(html);
- setTimeout(function () {
- showTime();
- },1000);
-}
-
-$(document).on("click", ".reset_pwd_button", function () {
- var isFoucs = false;
- var action = "api.passport.passwordResetPassword";
- var isFocus = false;
- var token = $(".forget_input_code").val();
- var repassword = $(".forget_input_repwd").val();
- var password = $(".forget_input_pwd").val();
- var loginName = $(".forget_input_loginName").val();
-
- if(loginName == "" || loginName == undefined || loginName.length<0) {
- $(".forget_input_loginName").focus();
- $(".forget_input_loginName_failed")[0].style.display = "block";
- isFocus = true;
- }
- if(token == "" || token.length<1) {
- $(".forget_input_code_failed")[0].style.display = "block";
- if(isFocus == false) {
- $(".forget_input_code").focus();
- $(".forget_input_loginName_failed")[0].style.display = "none";
- isFocus = true;
- }
- }
-
- if(password == "" || password.length<1) {
- $(".forget_input_pwd_failed")[0].style.display = "block";
- if(isFocus == false) {
- $(".forget_input_pwd").focus();
- $(".forget_input_code_failed")[0].style.display = "none";
- isFocus = true;
- }
- }
-
- if(repassword == "" || repassword.length<1) {
- $(".forget_input_repwd_failed")[0].style.display = "block";
- if(isFocus == false) {
- $(".forget_input_repwd").focus();
- $(".forget_input_pwd_failed")[0].style.display = "none";
- isFocus = true;
- }
- }
-
- if(isFocus == true) {
- return;
- }
-
- var reqData = {
- "loginName" : loginName,
- "token" :token,
- "password" :password
- };
-
- $.ajax({
- method: "POST",
- url:"./index.php?action=miniProgram.passport.account&mini",
- data: reqData,
- success:function (resp, status, request) {
- console.log(resp);
- var error = JSON.parse(resp);
- if(error["errCode"].length>1) {
- zalyjsAlert(error['errCode']);
- }
- },
- failed:function (error) {
- console.log(error);
- }
- });
-});
diff --git a/src/public/js/login/callback.js b/src/public/js/login/callback.js
deleted file mode 100755
index 4b648ff8..00000000
--- a/src/public/js/login/callback.js
+++ /dev/null
@@ -1,71 +0,0 @@
-
-refererKey = "site_referer";
-siteConfig = {};
-enableInvitationCode=0;
-enableRealName=0;
-sitePubkPem="";
-invitationCode='';
-nickname="";
-allowShareRealname=0;
-preSessionId="";
-
-refererUrl = document.referrer;
-
-function zalyLoginConfig(results) {
- if(typeof results == "object" ) {
- siteConfig = results;
- } else {
- siteConfig = JSON.parse(results);
- }
- enableInvitationCode = siteConfig.enableInvitationCode;
- enableRealName=siteConfig.enableRealName;
- sitePubkPem = siteConfig.sitePubkPem;
-}
-
-function loginSuccess()
-{
- handleRedirect(preSessionId);
-}
-
-function loginFailNeedRegister()
-{
- registerSite();
-}
-
-
-function handleRedirect(preSessionId, isRegister)
-{
- if(refererUrl) {
- if(refererUrl.indexOf("?") > -1) {
- refererUrl = refererUrl+"&preSessionId="+preSessionId+"&isRegister="+isRegister;
- } else {
- refererUrl = refererUrl+"?preSessionId="+preSessionId+"&isRegister="+isRegister;
- }
- window.location.href = refererUrl;
- }
-}
-
-function loginNameExist()
-{
- alert("用户名已经在站点被注册");
-}
-
-function loginNameNotExist()
-{
- if(sitePubkPem.length<1) {
- alert("站点公钥获取失败");
- return false;
- }
-
- var action = "api.passport.passwordReg";
- var reqData = {
- loginName:registerLoginName,
- password:registerPassword,
- email:registerEmail,
- nickname:registernNickname,
- sitePubkPem:sitePubkPem,
- invitationCode:invitationCode,
- }
- // alert("Json=="+JSON.stringify(reqData));
- handleClientSendRequest(action, reqData, handlePassportPasswordReg);
-}
\ No newline at end of file
diff --git a/src/public/js/login/zalyjsNative.js b/src/public/js/login/zalyjsNative.js
deleted file mode 100755
index 7943db42..00000000
--- a/src/public/js/login/zalyjsNative.js
+++ /dev/null
@@ -1,174 +0,0 @@
-var clientType = "iOS"
-// var callbackIdParamName = "_zalyjsCallbackId"
-var callbackIdParamName = "zalyjsCallbackId"
-
-var zalyjsCallbackHelper = function() {
- var thiz = this
- this.dict = {}
-
- //
- // var id = helper.register(callback)
- //
- this.register = function(callback) {
- var id = Math.random().toString()
- thiz.dict[id] = callback
- return id
- }
-
- //
- // helper.call({"_zalyjsCallbackId", "args": ["", "", "", ....] })
- //
- this.callback = function(param) {
- try {
- param = atob(param);
-
- var paramObj = JSON.parse(param)
- var id = paramObj[callbackIdParamName]
-
- var args = paramObj["args"]
- var callback = thiz.dict["" + id]
- if (callback != undefined) {
- // callback.apply(undefined, args)
- callback(args);
- delete(thiz.dict[id])
- } else {
- // do log
- }
- } catch (error) {
- // do log
- // console.log(" callback error =="+ error.toString());
- }
- }
- return this
-}();
-
-getOsType();
-
-function getOsType() {
- var u = navigator.userAgent;
- if (u.indexOf('Android') > -1 || u.indexOf('Linux') > -1) {
- clientType = 'Android';
- } else if (u.indexOf('iPhone') > -1) {
- clientType = 'IOS';
- } else {
- clientType = "";
- }
-}
-
-function isAndroid() {
- return clientType.toLowerCase() == "android"
-}
-
-function isIOS() {
- return clientType.toLowerCase() == "ios"
-}
-
-function jsonToQueryString(json) {
- url = Object.keys(json).map(function(k) {
- return encodeURIComponent(k) + '=' + encodeURIComponent(json[k])
- }).join('&')
- return url
-}
-
-
-//
-//
-// Javascript Bridge Begin
-//
-//
-
-function zalyjsSetClientType(t) {
- clientType = t
-}
-
-function zalyjsAjaxGet(url, callback) {
- var callbackId = zalyjsCallbackHelper.register(callback)
-
- var messageBody = {}
- messageBody["url"] = url
- messageBody[callbackIdParamName] = callbackId
- messageBody = JSON.stringify(messageBody)
-
- if (isAndroid()) {
- window.Android.zalyjsAjaxGet(messageBody)
- } else {
- window.webkit.messageHandlers.zalyjsAjaxGet.postMessage(messageBody)
- }
-}
-
-function zalyjsAjaxGetJSON(url, param, callback) {
- var queryString = jsonToQueryString(param)
- if (url.indexOf("?") != -1) {
- queryString = "&" + queryString
- } else {
- queryString = "?" + queryString
- }
- url = url + queryString
- zalyjsAjaxGet(url, function(body) {
- var jsonBody = JSON.parse(body)
- callback(jsonBody)
- })
-}
-
-function zalyjsAjaxPost(url, body, callback) {
- var callbackId = zalyjsCallbackHelper.register(callback)
-
- var messageBody = {}
- messageBody["url"] = url
- messageBody["body"] = body
- messageBody[callbackIdParamName] = callbackId
- messageBody = JSON.stringify(messageBody)
- window.webkit.messageHandlers.zalyjsAjaxPost.postMessage(messageBody)
-}
-
-function zalyjsAjaxPostJSON(url, body, callback) {
- zalyjsAjaxPost(url, jsonToQueryString(body), function(data) {
- var json = JSON.parse(data)
- callback(json)
- })
-}
-
-
-function zalyjsNavOpenPage(url) {
- var messageBody = {}
- messageBody["url"] = url
- messageBody = JSON.stringify(messageBody)
-
- if (isAndroid()) {
- window.Android.zalyjsNavOpenPage(messageBody)
- } else if(isIOS()) {
- window.webkit.messageHandlers.zalyjsNavOpenPage.postMessage(messageBody)
- }
-}
-
-function zalyjsLoginSuccess(loginName, sessionid, isRegister, callback) {
-
- var callbackId = zalyjsCallbackHelper.register(callback)
- var messageBody = {}
- messageBody["loginName"] = loginName
- messageBody["sessionid"] = sessionid
- messageBody["isRegister"] = (isRegister == true ? true : false)
- messageBody[callbackIdParamName] = callbackId
- messageBody = JSON.stringify(messageBody)
-
- if (isAndroid()) {
- window.Android.zalyjsLoginSuccess(messageBody)
- } else if(isIOS()) {
- window.webkit.messageHandlers.zalyjsLoginSuccess.postMessage(messageBody)
- }
-}
-
-function zalyjsLoginConfig(callback) {
- var callbackId = zalyjsCallbackHelper.register(callback)
-
- var messageBody = {}
- messageBody[callbackIdParamName] = callbackId
- messageBody = JSON.stringify(messageBody)
-
- if (isAndroid()) {
- window.Android.zalyjsLoginConfig(messageBody)
- } else if(isIOS()) {
- window.webkit.messageHandlers.zalyjsLoginConfig.postMessage(messageBody)
- }
-}
-
diff --git a/src/views/login/loginSite.php b/src/views/login/loginSite.php
deleted file mode 100755
index 0cd31f94..00000000
--- a/src/views/login/loginSite.php
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
- login
-
-
-
-
-
-
-
-
-
-
-
-Site Manage
-
-
-
-
-
-
-
-
-
-
-
-
-Site Manage
-
-
-
-
-
-
-
-
-
-
-
-
-Site Manage
-
-
-
-
-
-
-
-
-
-
-
-
-Config Manage
-
-
-
-
-
-
-
-
-
-
-Site Manage
-
-
-
-
-
-
-
-
-
-
-
-
-Site Manage
-
-
-
-
-
-
-
-
-
-
-
-
-login
-
-
-
-
-
-
-
-
-
-login
-
-
-
-
-
-
-
-
-
-Site Manage
-
-
-
-
-
-
-
-
## 简介 -`DuckChat` 是一款即时通讯解决方案，可以帮你拥有一套自己的微信、钉钉等类似的移动社交产品。因服务器掌握在自己手里，在获取便利的同时，还同时拥有对自己数据、业务的`100%`可控权，防止企业商业机密泄漏等。 +`DuckChat` 是一款即时通讯解决方案，用以搭建安全的私有聊天软件服务，可以帮你拥有一套自己的微信、钉钉等类似的移动社交产品。 + +因服务器掌握在自己手里，在获取便利的同时，还同时拥有对自己数据、业务的`100%`可控权，防止企业商业机密泄漏等。 **适用场景** @@ -78,5 +81,4 @@ ## 官方与联系方式 -- DuckChat官方网站 http://duckchat.akaxin.com -- QQ2群：`131466613` （Duckchat爱好者GaGa 2群） +- DuckChat官方网站 https://duckchat.akaxin.com From 1074997c3fa4a6676765ab4fb44a7b93e9063d14 Mon Sep 17 00:00:00 2001 From: sisishiliu <4416@cunmou.com> Date: Tue, 11 Sep 2018 11:13:49 +0800 Subject: [PATCH 016/302] 1.0-beta-4 --- src/public/css/login.css | 3 +-- src/public/css/zaly_msg.css | 6 +++--- src/public/js/im/zalyBaseWs.js | 1 + src/public/js/login/login.js | 6 +++++- src/views/passport/login.php | 5 ++--- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/public/css/login.css b/src/public/css/login.css index 76530c95..3dcb0ba8 100755 --- a/src/public/css/login.css +++ b/src/public/css/login.css @@ -141,12 +141,11 @@ input::-webkit-input-placeholder, .register_site::-webkit-input-placeholder{ font-size:1.31rem; font-family:PingFangSC-Regular; - color:rgba(223,223,223,1); + color:rgba(153,153,153,1); vertical-align:middle; width: 25rem; } - input:focus, input:active, .register_site:focus, diff --git a/src/public/css/zaly_msg.css b/src/public/css/zaly_msg.css index 376f6c62..9b47f104 100755 --- a/src/public/css/zaly_msg.css +++ b/src/public/css/zaly_msg.css @@ -503,12 +503,12 @@ html, body{ height:1.5rem; font-size:1.5rem; font-family:PingFangSC-Regular; - color:rgba(201,201,201,1); + color:rgba(153,153,153,1); line-height:1.5rem; } .input-line { height:0.19rem; - background:rgba(201,201,201,1); + color:rgba(153,153,153,1); margin-left: 2rem; overflow: hidden; margin-right: 16rem; @@ -721,7 +721,7 @@ html, body{ .create_group_box_div_input::-webkit-input-placeholder{ height:1.88rem; font-size:1.88rem; - color:rgba(201,201,201,1); + color:rgba(153,153,153,1); line-height:1.88rem; } diff --git a/src/public/js/im/zalyBaseWs.js b/src/public/js/im/zalyBaseWs.js index 91a90f79..282ee3a6 100755 --- a/src/public/js/im/zalyBaseWs.js +++ b/src/public/js/im/zalyBaseWs.js @@ -23,6 +23,7 @@ $(":input").attr("autocapitalize", "off"); function ZalyIm(params) { var config = params.config; + DefaultTitle = config.name; document.title = config.name; var loginPluginProfile = params.loginPluginProfile; var webSocketGwDomain = config[siteConfigKeys.serverAddressForIM]; diff --git a/src/public/js/login/login.js b/src/public/js/login/login.js index 6d4d7bb2..ae60519c 100644 --- a/src/public/js/login/login.js +++ b/src/public/js/login/login.js @@ -162,9 +162,13 @@ function registerForPassportPassword() $(".zaly_site_register-pwd")[0].style.display = "block"; } + function returnRegisterDiv() { - $(".zaly_site_register-pwd")[0].style.display = "block"; + $(".zaly_site_register-pwd")[0].style.display = "none"; $(".zaly_site_register-invitecode")[0].style.display = "none"; + $(".zaly_site_register-repwd")[0].style.display = "none"; + $(".zaly_site_update-invitecode")[0].style.display="none"; + $(".zaly_login_by_pwd")[0].style.display = "block"; } function handleHtmlLanguage(html) diff --git a/src/views/passport/login.php b/src/views/passport/login.php index cfbb439b..f05b10d2 100644 --- a/src/views/passport/login.php +++ b/src/views/passport/login.php @@ -106,7 +106,7 @@
+
+
@@ -67,7 +67,200 @@
-
+
From d3ba4f7bd93aa7f2cbc869ba89942391d0dfdbd1 Mon Sep 17 00:00:00 2001
From: sisishiliu <4416@cunmou.com>
Date: Mon, 10 Sep 2018 15:47:40 +0800
Subject: [PATCH 009/302] 1.0 beta-2
---
src/controller/Api/Friend/Api_Friend_ApplyController.php | 8 +++++++-
.../MiniProgram/Manage_MiniProgram_UpdateController.php | 4 ----
src/lib/Util/ZalyCurl.php | 3 +--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/controller/Api/Friend/Api_Friend_ApplyController.php b/src/controller/Api/Friend/Api_Friend_ApplyController.php
index 119606d3..e1f1ec70 100644
--- a/src/controller/Api/Friend/Api_Friend_ApplyController.php
+++ b/src/controller/Api/Friend/Api_Friend_ApplyController.php
@@ -27,12 +27,18 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
$tag = __CLASS__ . '-' . __FUNCTION__;
try {
$toUserId = $request->getToUserId();
- if (!$toUserId) {
+
+ if (empty($toUserId)) {
$errorCode = $this->zalyError->errorFriendApply;
$errorInfo = $this->zalyError->getErrorInfo($errorCode);
$this->setRpcError($errorCode, $errorInfo);
throw new Exception("no user id");
}
+
+ if ($toUserId == $this->userId) {
+ $this->setRpcError("error.alert", "can't add yourself as a friend");
+ }
+
$greetings = $request->getGreetings();
//check site allow addfriend
diff --git a/src/controller/Manage/MiniProgram/Manage_MiniProgram_UpdateController.php b/src/controller/Manage/MiniProgram/Manage_MiniProgram_UpdateController.php
index b14e0a90..24cada2f 100644
--- a/src/controller/Manage/MiniProgram/Manage_MiniProgram_UpdateController.php
+++ b/src/controller/Manage/MiniProgram/Manage_MiniProgram_UpdateController.php
@@ -21,10 +21,6 @@ protected function doRequest()
$name = $_POST['name'];
$value = $_POST['value'];
- $this->ctx->Wpf_Logger->info("~~~~~~~~~~~~~~~~~~", "plugin=" . $pluginId);
- $this->ctx->Wpf_Logger->info("~~~~~~~~~~~~~~~~~~", "name=" . $name);
- $this->ctx->Wpf_Logger->info("~~~~~~~~~~~~~~~~~~", "value=" . $value);
-
if (empty($pluginId) || empty($name)) {
throw new Exception("error parameters");
}
diff --git a/src/lib/Util/ZalyCurl.php b/src/lib/Util/ZalyCurl.php
index 57abc6f3..f33a130a 100644
--- a/src/lib/Util/ZalyCurl.php
+++ b/src/lib/Util/ZalyCurl.php
@@ -273,8 +273,7 @@ protected function _setHeader($baseHeaders)
}
$delHeaders = array("host");
foreach ($baseHeaders as $key => $value) {
- $key =strtolower($key);
- if(in_array($key, $delHeaders)) {
+ if(in_array(strtolower($key), $delHeaders)) {
continue;
}
$headers[] = $key . ': ' . $value;
From cb4e1701513c4fa9a7425d70b36a9dbc4335af81 Mon Sep 17 00:00:00 2001
From: sisishiliu <4416@cunmou.com>
Date: Mon, 10 Sep 2018 19:02:11 +0800
Subject: [PATCH 010/302] 1.0 beta-2
---
src/model/File/File_Manager.php | 199 ++++++++++++++++++++------------
1 file changed, 125 insertions(+), 74 deletions(-)
diff --git a/src/model/File/File_Manager.php b/src/model/File/File_Manager.php
index 2a3c7f09..1146dbca 100644
--- a/src/model/File/File_Manager.php
+++ b/src/model/File/File_Manager.php
@@ -50,7 +50,8 @@ public function readFile($fileId)
return file_get_contents($path);
}
- public function contentType($fileId) {
+ public function contentType($fileId)
+ {
if (strlen($fileId) < 1) {
return "";
}
@@ -135,8 +136,6 @@ private function turnFileId2FilePath($fileId)
}
/**
- * php gd
- * https://blog.csdn.net/dongqinliuzi/article/details/48273185
*
* @param array $picList
* @param $outImagePath
@@ -144,7 +143,7 @@ private function turnFileId2FilePath($fileId)
*/
private function splicingGroupAvatar($picList = array(), $outImagePath)
{
- $tag = __CLASS__.'-'.__FUNCTION__;
+ $tag = __CLASS__ . '-' . __FUNCTION__;
if (!function_exists("imagecreatetruecolor")) {
$this->wpf_Logger->error($tag, "php need support gd library, please check local php environment");
return null;
@@ -159,98 +158,120 @@ private function splicingGroupAvatar($picList = array(), $outImagePath)
$picList = array_slice($picList, 0, 9); // 只操作前9个图片
- $background = imagecreatetruecolor($default_width, $default_height); // 背景图片
+ $defaultImage = imagecreatetruecolor($default_width, $default_height); //创建图片大小
//int imagecolorallocate ( resource $image , int $red , int $green , int $blue ) 为一幅图像分配颜色
- $color = imagecolorallocate($background, 202, 201, 201); // 为真彩色画布创建白色背景，再设置为透明
- imagefill($background, 0, 0, $color); //区域填充
- imageColorTransparent($background, $color); // 将某个颜色定义为透明色
+ $color = imagecolorallocate($defaultImage, 229, 229, 229); // 为真彩色画布创建白色背景，再设置为透明
+ imagefill($defaultImage, 0, 0, $color); //区域填充
+ imageColorTransparent($defaultImage, $color); // 将某个颜色定义为透明色
$pic_count = count($picList);
- $lineArr = array(); // 需要换行的位置
- $space_x = 3;
- $space_y = 3;
- $line_x = 0;
+ $newLineArr = array(); // 需要换行的位置
+ $space_x = 10;
+ $space_y = 10;
+
+ $start_x = 0;
+ $start_y = 0;
+
+ $picElements = [];
switch ($pic_count) {
- case 1: // 正中间
- $start_x = intval($default_width / 4); // 开始位置X
- $start_y = intval($default_height / 4); // 开始位置Y
- $pic_w = intval($default_width / 2); // 宽度
- $pic_h = intval($default_height / 2); // 高度
+ case 1://ok
+ $element = [
+ "x" => intval($default_width / 4),
+ "y" => intval($default_height / 4),
+ "w" => intval($default_width / 2),
+ "h" => intval($default_height / 2),
+ ];
+ $picElements[] = $element;
break;
- case 2: // 中间位置并排
- $start_x = 2;
- $start_y = intval($default_height / 4) + 3;
- $pic_w = intval($default_width / 2) - 5;
- $pic_h = intval($default_height / 2) - 5;
- $space_x = 5;
+ case 2://ok
+ $pic_w = intval($default_width / 2) - 5;//width
+ $picElements = $this->buildImageElements(6, $start_x, $start_y, $pic_w, $default_height, [2]);
break;
case 3:
- $start_x = 124; // 开始位置X
- $start_y = 5; // 开始位置Y
$pic_w = intval($default_width / 2) - 5; // 宽度
- $pic_h = intval($default_height / 2) - 5; // 高度
- $lineArr = array(2);
- $line_x = 4;
+ $pic_h = $default_height; // 高度
+
+ for ($i = 0; $i < 3; $i++) {
+ $element = [
+ "x" => $start_x,
+ "y" => $start_y,
+ "w" => $pic_w,
+ "h" => $pic_h,
+ ];
+ $picElements[] = $element;
+
+ if ($i == 0) {
+ $pic_h = intval($pic_h / 2) - 5;
+ $start_x = $start_x + $pic_w + $space_x;
+ } else if ($i == 1) {
+ $start_y = $start_y + $pic_h + $space_y;
+ }
+ }
+
break;
- case 4:
- $start_x = 4; // 开始位置X
- $start_y = 5; // 开始位置Y
+ case 4: //OK
$pic_w = intval($default_width / 2) - 5; // 宽度
$pic_h = intval($default_height / 2) - 5; // 高度
- $lineArr = array(3);
- $line_x = 4;
+ $picElements = $this->buildImageElements(6, $start_x, $start_y, $pic_w, $pic_h, [2]);
break;
case 5:
- $start_x = 85.5; // 开始位置X
- $start_y = 85.5; // 开始位置Y
- $pic_w = intval($default_width / 3) - 5; // 宽度
- $pic_h = intval($default_height / 3) - 5; // 高度
- $lineArr = array(3);
- $line_x = 5;
+ $pic_w = intval($default_width / 2) - 5;
+ $pic_h = intval($default_height / 2) - 5;
+
+ $newLineArr = array(2);
+
+ for ($i = 0; $i < 5; $i++) {
+
+ $element = [
+ "x" => $start_x,
+ "y" => $start_y,
+ "w" => $pic_w,
+ "h" => $pic_h,
+ ];
+ $picElements[] = $element;
+
+ if (in_array($i + 1, $newLineArr)) {
+ $start_x = 0;
+ $start_y = $start_y + $pic_h + $space_y;
+ $pic_w = intval($default_width / 3) - 5;
+ } else {
+ $start_x = $start_x + $pic_w + $space_x;
+ }
+ }
+
break;
- case 6:
- $start_x = 5; // 开始位置X
- $start_y = 85.5; // 开始位置Y
+ case 6://ok
$pic_w = intval($default_width / 3) - 5; // 宽度
- $pic_h = intval($default_height / 3) - 5; // 高度
- $lineArr = array(4);
- $line_x = 5;
+ $pic_h = intval($default_height / 2) - 5; // 高度
+ $picElements = $this->buildImageElements(6, $start_x, $start_y, $pic_w, $pic_h, [3]);
break;
- case 7:
+ case 7://ok
$start_x = 166.5; // 开始位置X
- $start_y = 5; // 开始位置Y
$pic_w = intval($default_width / 3) - 5; // 宽度
$pic_h = intval($default_height / 3) - 5; // 高度
- $lineArr = array(2, 5);
- $line_x = 5;
+ $picElements = $this->buildImageElements(7, $start_x, $start_y, $pic_w, $pic_h, [1, 4]);
break;
- case 8:
+ case 8://ok
$start_x = 80.5; // 开始位置X
- $start_y = 5; // 开始位置Y
$pic_w = intval($default_width / 3) - 5; // 宽度
$pic_h = intval($default_height / 3) - 5; // 高度
- $lineArr = array(3, 6);
- $line_x = 5;
+ $picElements = $this->buildImageElements(8, $start_x, $start_y, $pic_w, $pic_h, [2, 5]);
break;
- case 9:
- $start_x = 5; // 开始位置X
- $start_y = 5; // 开始位置Y
+ case 9://ok
$pic_w = intval($default_width / 3) - 5; // 宽度
$pic_h = intval($default_height / 3) - 5; // 高度
- $lineArr = array(4, 7);
- $line_x = 5;
+ $picElements = $this->buildImageElements(9, $start_x, $start_y, $pic_w, $pic_h, [3, 6]);
break;
+ default:
+ return false;
}
+ //设置每张图片的尺寸
foreach ($picList as $k => $pic_path) {
- $kk = $k + 1;
- if (in_array($kk, $lineArr)) {
- $start_x = $line_x;
- $start_y = $start_y + $pic_h + $space_y;
- }
+ $element = $picElements[$k];
$resource = false;
$mime = mime_content_type($pic_path);
@@ -264,24 +285,54 @@ private function splicingGroupAvatar($picList = array(), $outImagePath)
if ($resource == false) {
continue;
}
- // $start_x,$start_y copy图片在背景中的位置
- // 0,0 被copy图片的位置 $pic_w,$pic_h copy后的高度和宽度
- imagecopyresized($background, $resource, $start_x, $start_y, 0, 0, $pic_w, $pic_h, imagesx($resource), imagesy($resource)); // 最后两个参数为原始图片宽度和高度，倒数两个参数为copy时的图片宽度和高度
- $start_x = $start_x + $pic_w + $space_x;
+ // $start_x,$start_y copy图片在背景中的位置 0,0 被copy图片的位置 $pic_w,$pic_h copy后的高度和宽度
+ imagecopyresized($defaultImage, $resource, $element['x'], $element['y'], 0, 0, $element['w'], $element['h'], imagesx($resource), imagesy($resource)); // 最后两个参数为原始图片宽度和高度，倒数两个参数为copy时的图片宽度和高度
}
- // header("Content-type: image/jpg");
- // imagejpeg($background);die;
+ header("Content-type: image/jpg");
+
+ $res = imagejpeg($defaultImage, $outImagePath);
+
+ // 释放内存
+ imagedestroy($defaultImage);
- // 保存图像为 $imagePath.'$fname'.'.jpg'
- $res = imagejpeg($background, $outImagePath);
if (false === $res) {
return false;
}
- // 释放内存
- imagedestroy($background);
-
return $outImagePath;
}
+
+ /**
+ * @param $imageSize
+ * @param $start_x
+ * @param $start_y
+ * @param $pic_w
+ * @param $pic_h
+ * @param $newLineArr
+ * @return array
+ */
+ private function buildImageElements($imageSize, $start_x, $start_y, $pic_w, $pic_h, $newLineArr)
+ {
+ $picElements = [];
+
+ for ($i = 0; $i < $imageSize; $i++) {
+ $element = [
+ "x" => $start_x,
+ "y" => $start_y,
+ "w" => $pic_w,
+ "h" => $pic_h,
+ ];
+ $picElements[] = $element;
+
+ if (in_array($i + 1, $newLineArr)) {
+ $start_x = 0;
+ $start_y = $start_y + $pic_h + 10;
+ } else {
+ $start_x = $start_x + $pic_w + 10;
+ }
+ }
+
+ return $picElements;
+ }
}
\ No newline at end of file
From 3d3ffef0584f439c8167ad7b94635a5db5f1b44b Mon Sep 17 00:00:00 2001
From: sisishiliu <4416@cunmou.com>
Date: Mon, 10 Sep 2018 19:06:46 +0800
Subject: [PATCH 011/302] change qq group number
---
README.md | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 46380d3d..434fbb3d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-> 此为内测版，正在进行功能增删、BUG及安全问题修正，请用于体验，勿用于生产环境。
# [DuckChat](http://duck.chat)
@@ -10,9 +9,9 @@
>
> **向我们提问、反馈问题**
>
-> QQ群 `131466613`
+> QQ群 `280519763`
-极速体验: 下载源码，安装到网站目录，浏览器打开访问，便可直接体验现在的内测体验版！
+极速体验: 下载源码安装到网站目录，第一个用户使用 "000000" 邀请码进入为管理员。
From 0c3573992c72491725de463c656a00c564809003 Mon Sep 17 00:00:00 2001 From: sisishiliu <4416@cunmou.com> Date: Mon, 10 Sep 2018 21:48:06 +0800 Subject: [PATCH 012/302] 1.0-beta-2 --- src/config.sample.php | 3 +- .../Api/Site/Api_Site_LoginController.php | 8 ++-- src/controller/BaseController.php | 2 +- ...MiniProgram_Passport_AccountController.php | 37 +++++-------------- src/lib/Util/ZalyHelper.php | 3 ++ src/model/Site/Site_Login.php | 9 +++-- src/public/css/login.css | 2 +- src/public/css/zaly_msg.css | 2 +- src/public/css/zaly_widget.css | 2 +- src/public/js/im/zalyAction.js | 1 + src/public/js/im/zalyIm.js | 4 ++ src/public/js/im/zalyKey.js | 2 + src/public/js/im/zalyMsg.js | 12 ++++-- src/views/miniProgram/passport/account.php | 22 ++++++----- src/views/passport/login.php | 16 ++++---- src/views/passport/template_login.php | 11 +++--- 16 files changed, 67 insertions(+), 69 deletions(-) diff --git a/src/config.sample.php b/src/config.sample.php index 29028040..4d406e68 100644 --- a/src/config.sample.php +++ b/src/config.sample.php @@ -14,9 +14,8 @@ 'loginPluginId' => '105', 'apiPageWidget' => './index.php?action=page.widget', 'apiPageSiteInit' => "./index.php?action=installDB", - 'apiSiteLogin' => './index.php?action=api.site.login&body_format=pb', 'session_verify_101' => 'http://open.akaxin.com:5208/index.php?action=api.session.verify&body_format=pb', - 'session_verify_102' => './index.php?action=api.session.verify&body_format=pb', + 'session_verify_102' => './index.php?action=api.session.verify&body_format=base64pb', "siteAddress" => '', 'passport_cookie_name' => "duckchat_passport_cookie", 'mail' => diff --git a/src/controller/Api/Site/Api_Site_LoginController.php b/src/controller/Api/Site/Api_Site_LoginController.php index 405b9c7f..d5e1a6ec 100644 --- a/src/controller/Api/Site/Api_Site_LoginController.php +++ b/src/controller/Api/Site/Api_Site_LoginController.php @@ -1,4 +1,4 @@ -cd @@ -49,7 +49,6 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf } $this->ctx->Wpf_Logger->info("api.site.login", "preSessionId=" . $preSessionId); -// $this->ctx->Wpf_Logger->info("api.site.login", " -devicePubkPem=" . $devicePubkPem); if (!$preSessionId) { $errorCode = $this->zalyError->errorSiteLogin; @@ -62,11 +61,11 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf $userProfile = $this->ctx->Site_Login->checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem, 1); $realSessionId = $userProfile['sessionId']; + $this->ctx->Wpf_Logger->info("api.site.login", "get platform sessionid=" . $realSessionId); $response = $this->buildApiSiteLoginResponse($userProfile, $realSessionId); - $this->ctx->Wpf_Logger->info("api.site.login", "response=" . $response->serializeToJsonString()); //back to request @@ -76,7 +75,6 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf $errorCode = $this->zalyError->errorSiteLogin; $errorInfo = $this->zalyError->getErrorInfo($errorCode); $this->ctx->Wpf_Logger->error($tag, "=========error=" . $ex->getMessage()); - $this->setRpcError($errorCode, $errorInfo); $this->rpcReturn($transportData->getAction(), new $this->classNameForResponse()); } @@ -92,9 +90,9 @@ private function buildApiSiteLoginResponse($userInfo, $sessionId) $publicUserProfile = $this->getPublicUserProfile($userInfo); if (\Zaly\Proto\Core\UserAvailableType::UserAvailableBlocked == $publicUserProfile->getAvailableType()) { + error_log("user profile failed"); throw new Exception("user is blocked"); } - $allUserProfile = new \Zaly\Proto\Core\AllUserProfile(); $allUserProfile->setPublic($publicUserProfile); diff --git a/src/controller/BaseController.php b/src/controller/BaseController.php index 458704b4..dd6cb955 100644 --- a/src/controller/BaseController.php +++ b/src/controller/BaseController.php @@ -112,7 +112,6 @@ public function rpcReturn($action, $response) $transData->setHeader($this->headers); $transData->setPackageId($this->requestTransportData->getPackageId()); - $body = ""; if ("json" == $this->bodyFormatType) { $body = $transData->serializeToJsonString(); @@ -126,6 +125,7 @@ public function rpcReturn($action, $response) return; } echo $body; + return; } // ignore.~ diff --git a/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php b/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php index c56632e4..44312609 100644 --- a/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php +++ b/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php @@ -37,8 +37,6 @@ public function doRequest() if($method == "post") { $loginName = $_POST['loginName']; - $newPassword = $_POST['newPassword']; - $oldPassword = $_POST['oldPassword']; $siteLoginName = $this->loginName; if($siteLoginName != $loginName) { @@ -47,14 +45,8 @@ public function doRequest() echo json_encode(["errCode" => $errorInfo]); return; } - if(strlen($newPassword)<5 || strlen($newPassword)>20) { - $errorCode = $this->zalyError->errorPassowrdLength; - $errorInfo = $this->zalyError->getErrorInfo($errorCode); - echo json_encode(["errCode" => $errorInfo]); - return; - } - $this->modifyPassportPassword($loginName, $oldPassword, $newPassword); + $this->modifyPassportPassword($loginName); echo json_encode(["errCode" => "success"]); return; } else { @@ -69,22 +61,15 @@ public function doRequest() } } - private function modifyPassportPassword($loginName, $oldPassword, $newPassword) + private function modifyPassportPassword($loginName) { $tag = __CLASS__ . "-". __FUNCTION__; try{ - $modifyPasswordReq = new \Zaly\Proto\Site\ApiPassportPasswordModifyPasswordRequest(); - $modifyPasswordReq->setLoginName($loginName); - $modifyPasswordReq->setPassword($oldPassword); - $modifyPasswordReq->setNewPassword($newPassword); - $updatePasswordUrl = "/index.php?action=" . $this->resetPassword . "&body_format=pb"; - $updatePasswordUrl = ZalyHelper::getFullReqUrl($updatePasswordUrl); - $this->sendReq( $this->resetPassword, $updatePasswordUrl, $modifyPasswordReq); $sessionClearRequest = new \Zaly\Proto\Plugin\DuckChatSessionClearRequest(); $sessionClearRequest->setUserId($this->userId); - $sessionClearUrl = "/index.php?action=" . $this->sessionClear . "&body_format=pb&miniProgramId=".$this->passporAccountPluginId; + $sessionClearUrl = "/index.php?action=" . $this->sessionClear . "&body_format=base64pb&miniProgramId=".$this->passporAccountPluginId; $sessionClearUrl = ZalyHelper::getFullReqUrl($sessionClearUrl); $this->sendReq($this->sessionClear, $sessionClearUrl, $sessionClearRequest); }catch (Exception $ex) { @@ -104,20 +89,16 @@ private function sendReq($action, $url, $dataReq) $transportData->setAction($action); $transportData->setHeader(["_".\Zaly\Proto\Core\TransportDataHeaderKey::HeaderUserClientLang => $this->language]); $data = $transportData->serializeToString(); + $data = base64_encode($data); $pluginProfile = $this->getMiniProgramProfile($this->passporAccountPluginId); - - if($action == $this->sessionClear) { - $authKey = $pluginProfile['authKey']; - $data = $this->ctx->ZalyAes->encrypt($data, $authKey); - } + $authKey = $pluginProfile['authKey']; + $data = $this->ctx->ZalyAes->encrypt($data, $authKey); $result = $this->ctx->ZalyCurl->request("post", $url, $data); - - if($action == $this->sessionClear) { - $authKey = $pluginProfile['authKey']; - $result = $this->ctx->ZalyAes->decrypt($data, $authKey); - } + $authKey = $pluginProfile['authKey']; + $result = $this->ctx->ZalyAes->decrypt($result, $authKey); + $result = base64_decode($result); //解析数据 $transportData = new \Zaly\Proto\Core\TransportData(); diff --git a/src/lib/Util/ZalyHelper.php b/src/lib/Util/ZalyHelper.php index 3ba57651..ca1755bb 100644 --- a/src/lib/Util/ZalyHelper.php +++ b/src/lib/Util/ZalyHelper.php @@ -175,6 +175,9 @@ public static function getFullReqUrl($reqUrl) } if(strpos($reqUrl, "/") == 0) { $fullUrl = "{$schema}://{$host}{$reqUrl}"; + } elseif(strpos($reqUrl, "./") == 0){ + $reqUrl = str_replace("./", "/", $reqUrl); + $fullUrl = "{$schema}://{$host}{$reqUrl}"; } else { $fullUrl = "{$schema}://{$host}/{$reqUrl}"; } diff --git a/src/model/Site/Site_Login.php b/src/model/Site/Site_Login.php index ebb3d313..bab8bce1 100644 --- a/src/model/Site/Site_Login.php +++ b/src/model/Site/Site_Login.php @@ -44,7 +44,6 @@ public function checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem = "" //get userProfile from platform $loginUserProfile = $this->getUserProfileFromPlatform($preSessionId, $sitePriKeyPem); - //get intivation first $uicInfo = $this->getIntivationCode($loginUserProfile->getInvitationCode()); @@ -91,14 +90,15 @@ private function getUserProfileFromPlatform($preSessionId, $sitePrikPem) $transportData->setBody($anyBody); $transportData->setAction($this->sessionVerifyAction); $data = $transportData->serializeToString(); - + $data = base64_encode($data); $pluginIds = $this->ctx->SiteConfigTable->selectSiteConfig(SiteConfig::SITE_LOGIN_PLUGIN_ID); $pluginId = $pluginIds[SiteConfig::SITE_LOGIN_PLUGIN_ID]; $sessionVerifyUrl = ZalyConfig::getSessionVerifyUrl($pluginId); $sessionVerifyUrl = ZalyHelper::getFullReqUrl($sessionVerifyUrl); - $this->ctx->Wpf_Logger->error("api.site.login", "get profile from platform url=" . $sessionVerifyUrl); + $result = $this->ctx->ZalyCurl->request("post", $sessionVerifyUrl, $data); + $result = base64_decode($result); //解析数据 $transportData = new \Zaly\Proto\Core\TransportData(); @@ -122,9 +122,10 @@ private function getUserProfileFromPlatform($preSessionId, $sitePrikPem) $aesData = $response->getEncryptedProfile(); $randomKey = $this->ctx->ZalyRsa->decrypt($key, $sitePrikPem); $serialize = $this->ctx->ZalyAes->decrypt($aesData, $randomKey); + //获取LoginUserProfile $loginUserProfile = unserialize($serialize); -// $this->ctx->Wpf_Logger->error("site: api.session.verify api.site.login", " profile=" . $loginUserProfile->serializeToJsonString()); + return $loginUserProfile; } catch (Exception $ex) { diff --git a/src/public/css/login.css b/src/public/css/login.css index 7522b2df..76530c95 100755 --- a/src/public/css/login.css +++ b/src/public/css/login.css @@ -5,7 +5,7 @@ body,html { padding:0; margin:0; -webkit-tap-highlight-color: transparent; - background:url("http://duckchat.akaxin.com/border_line.png") no-repeat; + background:url("https://duckchat.akaxin.com/border_line.png") no-repeat; } .zaly_container { diff --git a/src/public/css/zaly_msg.css b/src/public/css/zaly_msg.css index e5fc62bb..376f6c62 100755 --- a/src/public/css/zaly_msg.css +++ b/src/public/css/zaly_msg.css @@ -43,7 +43,7 @@ html, body{ width: 100%; height: 100%; font-size: 10.66px; - background: url("http://duckchat.akaxin.com/border_line.png") no-repeat ; + background: url("https://duckchat.akaxin.com/border_line.png") no-repeat ; } /**:focus {outline: none;}*/ diff --git a/src/public/css/zaly_widget.css b/src/public/css/zaly_widget.css index e8045893..6bb3080f 100755 --- a/src/public/css/zaly_widget.css +++ b/src/public/css/zaly_widget.css @@ -7,7 +7,7 @@ html, body{ width: 100%; height: 100%; font-size: 10.66px; - background:url("http://duckchat.akaxin.com/border_line.png") no-repeat; + background:url("https://duckchat.akaxin.com/border_line.png") no-repeat; } .widget { diff --git a/src/public/js/im/zalyAction.js b/src/public/js/im/zalyAction.js index 11f94437..cead90f1 100755 --- a/src/public/js/im/zalyAction.js +++ b/src/public/js/im/zalyAction.js @@ -40,6 +40,7 @@ var ZalyAction = { api_passport_passwordResetPassword :"site.ApiPassportPasswordResetPasswordRequest", duckchat_message_send : "plugin.DuckChatMessageSendRequest", api_passport_passwordUpdateInvitationCode:"site.ApiPassportPasswordUpdateInvitationCodeRequest", + api_passport_passwordModifyPassword : "site.ApiPassportPasswordModifyPasswordRequest", api_friend_search:"site.ApiFriendSearchRequest", diff --git a/src/public/js/im/zalyIm.js b/src/public/js/im/zalyIm.js index 94f10602..9f05e648 100755 --- a/src/public/js/im/zalyIm.js +++ b/src/public/js/im/zalyIm.js @@ -101,10 +101,14 @@ function handleImSendRequest(action, reqData, callback) if(resp) { handleReceivedImMessage(resp, callback); } + }, + fail: function () { + isSyncingMsg = false; } }); } } catch(e) { + isSyncingMsg = false; return false; } } diff --git a/src/public/js/im/zalyKey.js b/src/public/js/im/zalyKey.js index bcd540bf..a48ea52d 100755 --- a/src/public/js/im/zalyKey.js +++ b/src/public/js/im/zalyKey.js @@ -200,3 +200,5 @@ uploadFileUrl = './index.php?action=http.file.uploadWeb'; languageName = "zh"; languageNum = languageName == "en" ? UserClientLangEN : UserClientLangZH; +isSyncingMsg = false; +isPreSyncingMsgTime=""; diff --git a/src/public/js/im/zalyMsg.js b/src/public/js/im/zalyMsg.js index c1bbd777..472992b9 100755 --- a/src/public/js/im/zalyMsg.js +++ b/src/public/js/im/zalyMsg.js @@ -2,8 +2,6 @@ msgImageSize = ""; -isSyncingMsg = false; - function getRoomList() { var roomList = handleRoomListFromLocalStorage(undefined); @@ -269,7 +267,8 @@ function handleSetItemError(error) } enableWebsocketGw = localStorage.getItem(websocketGW); -if(enableWebsocketGw == "false") { + +if(enableWebsocketGw == "false" || enableWebsocketGw == null) { ///1秒 sync setInterval(function (args) { enableWebsocketGw = localStorage.getItem(websocketGW); @@ -298,9 +297,16 @@ function handleAuth() function syncMsgForRoom() { + + if((Date.parse(new Date()) - isPreSyncingMsgTime) > 10000) { + isSyncingMsg = false; + } + if(isSyncingMsg == true) { return ; } + + isPreSyncingMsgTime = Date.parse(new Date()); isSyncingMsg = true; var action = "im.cts.sync"; diff --git a/src/views/miniProgram/passport/account.php b/src/views/miniProgram/passport/account.php index 6c92515e..95e14f6a 100644 --- a/src/views/miniProgram/passport/account.php +++ b/src/views/miniProgram/passport/account.php @@ -23,7 +23,7 @@
@@ -40,7 +40,7 @@
@@ -49,7 +49,7 @@
@@ -188,7 +188,7 @@ function isPassword(password) {
var oldPassword = $(".forget_input_oldPwd").val();
var repassword = $(".forget_input_repwd").val();
var newPassword = $(".forget_input_pwd").val();
- var loginName = $(".forget_input_loginName").val();
+ loginName = $(".forget_input_loginName").val();
if(loginName == "" || loginName == undefined || loginName.length<0) {
$(".forget_input_loginName").focus();
@@ -242,13 +242,18 @@ function isPassword(password) {
var reqData = {
"loginName" : loginName,
"newPassword" :newPassword,
- "oldPassword" :oldPassword
+ "password" :oldPassword
};
+ var action = "api.passport.passwordModifyPassword"
+ handleClientSendRequest(action, reqData, handleModifyPassword);
+ });
+
+ function handleModifyPassword() {
$.ajax({
method: "POST",
url:"./index.php?action=miniProgram.passport.account&lang="+languageNum,
- data: reqData,
+ data: {"loginName" : loginName},
success:function (resp, status, request) {
var error = JSON.parse(resp);
if(error["errCode"].length>1) {
@@ -259,8 +264,7 @@ function isPassword(password) {
console.log(error);
}
});
- });
-
+ }
diff --git a/src/views/passport/login.php b/src/views/passport/login.php
index 27552b97..bd7c4173 100644
--- a/src/views/passport/login.php
+++ b/src/views/passport/login.php
@@ -23,7 +23,7 @@
@@ -79,7 +79,7 @@
@@ -88,7 +88,7 @@
@@ -114,7 +114,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/src/views/passport/template_login.php b/src/views/passport/template_login.php
index 7f14ad66..e46a3126 100644
--- a/src/views/passport/template_login.php
+++ b/src/views/passport/template_login.php
@@ -8,23 +8,22 @@
@@ -32,14 +31,14 @@
string invitationCode = 1;
- */
- private $invitationCode = '';
- /**
- *does the user allow the platform to share his realname with the site that he is on.
- *
- * Generated from protobuf field bool allowShareRealname = 2;
- */
- private $allowShareRealname = false;
- /**
- * Generated from protobuf field string siteIdPubkBase64 = 3;
- */
- private $siteIdPubkBase64 = '';
-
- public function __construct() {
- \GPBMetadata\Platform\ApiSessionLogin::initOnce();
- parent::__construct();
- }
-
- /**
- * Generated from protobuf field string invitationCode = 1;
- * @return string
- */
- public function getInvitationCode()
- {
- return $this->invitationCode;
- }
-
- /**
- * Generated from protobuf field string invitationCode = 1;
- * @param string $var
- * @return $this
- */
- public function setInvitationCode($var)
- {
- GPBUtil::checkString($var, True);
- $this->invitationCode = $var;
-
- return $this;
- }
-
- /**
- *does the user allow the platform to share his realname with the site that he is on.
- *
- * Generated from protobuf field bool allowShareRealname = 2;
- * @return bool
- */
- public function getAllowShareRealname()
- {
- return $this->allowShareRealname;
- }
-
- /**
- *does the user allow the platform to share his realname with the site that he is on.
- *
- * Generated from protobuf field bool allowShareRealname = 2;
- * @param bool $var
- * @return $this
- */
- public function setAllowShareRealname($var)
- {
- GPBUtil::checkBool($var);
- $this->allowShareRealname = $var;
-
- return $this;
- }
-
- /**
- * Generated from protobuf field string siteIdPubkBase64 = 3;
- * @return string
- */
- public function getSiteIdPubkBase64()
- {
- return $this->siteIdPubkBase64;
- }
-
- /**
- * Generated from protobuf field string siteIdPubkBase64 = 3;
- * @param string $var
- * @return $this
- */
- public function setSiteIdPubkBase64($var)
- {
- GPBUtil::checkString($var, True);
- $this->siteIdPubkBase64 = $var;
-
- return $this;
- }
-
-}
-
diff --git a/src/lib/proto/Zaly/Proto/Platform/ApiSessionLoginResponse.php b/src/lib/proto/Zaly/Proto/Platform/ApiSessionLoginResponse.php
deleted file mode 100644
index 4b1353ae..00000000
--- a/src/lib/proto/Zaly/Proto/Platform/ApiSessionLoginResponse.php
+++ /dev/null
@@ -1,55 +0,0 @@
-platform.ApiSessionLoginResponse
- */
-class ApiSessionLoginResponse extends \Google\Protobuf\Internal\Message
-{
- /**
- * return to site
- *
- * Generated from protobuf field string preSessionId = 1;
- */
- private $preSessionId = '';
-
- public function __construct() {
- \GPBMetadata\Platform\ApiSessionLogin::initOnce();
- parent::__construct();
- }
-
- /**
- * return to site
- *
- * Generated from protobuf field string preSessionId = 1;
- * @return string
- */
- public function getPreSessionId()
- {
- return $this->preSessionId;
- }
-
- /**
- * return to site
- *
- * Generated from protobuf field string preSessionId = 1;
- * @param string $var
- * @return $this
- */
- public function setPreSessionId($var)
- {
- GPBUtil::checkString($var, True);
- $this->preSessionId = $var;
-
- return $this;
- }
-
-}
-
diff --git a/src/lib/proto/Zaly/Proto/Platform/LoginUserType.php b/src/lib/proto/Zaly/Proto/Platform/LoginUserType.php
deleted file mode 100644
index 5b3570dd..00000000
--- a/src/lib/proto/Zaly/Proto/Platform/LoginUserType.php
+++ /dev/null
@@ -1,29 +0,0 @@
-Platform\LoginUserType
- */
-class LoginUserType
-{
- /**
- * Generated from protobuf enum UserTypeInvalid = 0;
- */
- const UserTypeInvalid = 0;
- /**
- *register, display userInfo
- *
- * Generated from protobuf enum UserTypeResiter = 1;
- */
- const UserTypeResiter = 1;
- /**
- *loginer, don't display userInfo
- *
- * Generated from protobuf enum UserTypeLoginer = 2;
- */
- const UserTypeLoginer = 2;
-}
-
diff --git a/src/public/img/group_cancle.png b/src/public/img/group_cancle.png
deleted file mode 100755
index 6f1bc71cc744a1026fece400f8fc1b3f38ddcfb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1250
zcmV<81ReW{P)
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/login/template_login.php b/src/views/login/template_login.php
deleted file mode 100644
index 7f14ad66..00000000
--- a/src/views/login/template_login.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
diff --git a/src/views/manage/dataReportIndex.php b/src/views/manage/dataReportIndex.php
deleted file mode 100755
index fa8b345c..00000000
--- a/src/views/manage/dataReportIndex.php
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Login
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Register
- Forget Password
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Find Password
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 输入邀请码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 输入邀请码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/manage/groupIndex.php b/src/views/manage/groupIndex.php
deleted file mode 100755
index fa8b345c..00000000
--- a/src/views/manage/groupIndex.php
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
- 站点设置
-
-
- 
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
- 小程序管理
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
- 用户管理
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
- 群组管理
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
- 邀请码
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
- 数据报表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/manage/miniProgramIndex.php b/src/views/manage/miniProgramIndex.php
deleted file mode 100755
index fa8b345c..00000000
--- a/src/views/manage/miniProgramIndex.php
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 站点设置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 小程序管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 用户管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 群组管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 邀请码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 数据报表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/manage/siteConfigIndex.php b/src/views/manage/siteConfigIndex.php
deleted file mode 100755
index 490fc774..00000000
--- a/src/views/manage/siteConfigIndex.php
+++ /dev/null
@@ -1,616 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 站点设置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 小程序管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 用户管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 群组管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 邀请码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 数据报表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/manage/uicIndex.php b/src/views/manage/uicIndex.php
deleted file mode 100755
index fa8b345c..00000000
--- a/src/views/manage/uicIndex.php
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Site Name
-
-
- 192.168.3.4
-
-
-
-
-
-
-
-
-
-
-
-
- Site Logo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Group Max Members
-
-
- 100
-
-
-
-
-
-
-
-
-
- Push Notice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Enable Phone Number
-
-
- 192.168.3.5555
-
-
-
-
-
-
-
-
-
- Enable Invite Code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Enable Add Friend
-
-
- 192.168.3.5555
-
-
-
-
-
-
-
-
-
- Enable Tmp Chat
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Open Web-Widget
-
-
- 192.168.3.5555
-
-
-
-
-
-
-
-
-
-
- Open PC-Web
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Open Mobile-Web
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Open SSL
-
-
- 192.168.3.5555
-
-
-
-
-
-
-
-
-
- Open Web Edition
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Site Public Key
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Site Manager
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Site Default Friends
-
-
-
-
-
-
-
-
-
-
-
-
-
- Site Default Groups
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/manage/userIndex.php b/src/views/manage/userIndex.php
deleted file mode 100755
index fa8b345c..00000000
--- a/src/views/manage/userIndex.php
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 站点设置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 小程序管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 用户管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 群组管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 邀请码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 数据报表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/miniProgram/gif/index.php b/src/views/miniProgram/gif/index.php
deleted file mode 100644
index bc3054cc..00000000
--- a/src/views/miniProgram/gif/index.php
+++ /dev/null
@@ -1,235 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 站点设置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 小程序管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 用户管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 群组管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 邀请码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 数据报表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/plugin/index.php b/src/views/plugin/index.php
deleted file mode 100644
index 4d2f1486..00000000
--- a/src/views/plugin/index.php
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/square/index.php b/src/views/square/index.php
deleted file mode 100755
index 63c9aded..00000000
--- a/src/views/square/index.php
+++ /dev/null
@@ -1,508 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From bf6def094ffdc09e9c8748b20cf9035fcc337af2 Mon Sep 17 00:00:00 2001
From: sisishiliu <4416@cunmou.com>
Date: Tue, 11 Sep 2018 09:35:06 +0800
Subject: [PATCH 015/302] update readme
---
README.md | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 434fbb3d..3fbff52a 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,26 @@
# [DuckChat](http://duck.chat)
-`私有部署，保证信息安全` - `长链接、大集群，支持500+服务器` - `也支持单机部署，非常灵活` - `iOS、Android、Web全端支持`
-
-> **当前版本**
->
-> 内测体验版
+> `私有部署，保证信息安全` - `长链接、大集群，支持500+服务器`
>
+> `也支持单机部署，非常灵活` - `iOS、Android、Web全端支持`
+
+## 当前版本(1.0-beta-4)
+
> **向我们提问、反馈问题**
>
-> QQ群 `280519763`
+> - QQ群 `280519763`
+> - 邮箱：hi@akaxin.com
-极速体验: 下载源码安装到网站目录，第一个用户使用 "000000" 邀请码进入为管理员。
+安装与使用教程：https://duckchat.akaxin.com/wiki/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 站点设置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 小程序管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 用户管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 群组管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 邀请码
-
-
-
-
-
- ## 简介 -`DuckChat` 是一款即时通讯解决方案，可以帮你拥有一套自己的微信、钉钉等类似的移动社交产品。因服务器掌握在自己手里，在获取便利的同时，还同时拥有对自己数据、业务的`100%`可控权，防止企业商业机密泄漏等。 +`DuckChat` 是一款即时通讯解决方案，用以搭建安全的私有聊天软件服务，可以帮你拥有一套自己的微信、钉钉等类似的移动社交产品。 + +因服务器掌握在自己手里，在获取便利的同时，还同时拥有对自己数据、业务的`100%`可控权，防止企业商业机密泄漏等。 **适用场景** @@ -78,5 +81,4 @@ ## 官方与联系方式 -- DuckChat官方网站 http://duckchat.akaxin.com -- QQ2群：`131466613` （Duckchat爱好者GaGa 2群） +- DuckChat官方网站 https://duckchat.akaxin.com From 1074997c3fa4a6676765ab4fb44a7b93e9063d14 Mon Sep 17 00:00:00 2001 From: sisishiliu <4416@cunmou.com> Date: Tue, 11 Sep 2018 11:13:49 +0800 Subject: [PATCH 016/302] 1.0-beta-4 --- src/public/css/login.css | 3 +-- src/public/css/zaly_msg.css | 6 +++--- src/public/js/im/zalyBaseWs.js | 1 + src/public/js/login/login.js | 6 +++++- src/views/passport/login.php | 5 ++--- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/public/css/login.css b/src/public/css/login.css index 76530c95..3dcb0ba8 100755 --- a/src/public/css/login.css +++ b/src/public/css/login.css @@ -141,12 +141,11 @@ input::-webkit-input-placeholder, .register_site::-webkit-input-placeholder{ font-size:1.31rem; font-family:PingFangSC-Regular; - color:rgba(223,223,223,1); + color:rgba(153,153,153,1); vertical-align:middle; width: 25rem; } - input:focus, input:active, .register_site:focus, diff --git a/src/public/css/zaly_msg.css b/src/public/css/zaly_msg.css index 376f6c62..9b47f104 100755 --- a/src/public/css/zaly_msg.css +++ b/src/public/css/zaly_msg.css @@ -503,12 +503,12 @@ html, body{ height:1.5rem; font-size:1.5rem; font-family:PingFangSC-Regular; - color:rgba(201,201,201,1); + color:rgba(153,153,153,1); line-height:1.5rem; } .input-line { height:0.19rem; - background:rgba(201,201,201,1); + color:rgba(153,153,153,1); margin-left: 2rem; overflow: hidden; margin-right: 16rem; @@ -721,7 +721,7 @@ html, body{ .create_group_box_div_input::-webkit-input-placeholder{ height:1.88rem; font-size:1.88rem; - color:rgba(201,201,201,1); + color:rgba(153,153,153,1); line-height:1.88rem; } diff --git a/src/public/js/im/zalyBaseWs.js b/src/public/js/im/zalyBaseWs.js index 91a90f79..282ee3a6 100755 --- a/src/public/js/im/zalyBaseWs.js +++ b/src/public/js/im/zalyBaseWs.js @@ -23,6 +23,7 @@ $(":input").attr("autocapitalize", "off"); function ZalyIm(params) { var config = params.config; + DefaultTitle = config.name; document.title = config.name; var loginPluginProfile = params.loginPluginProfile; var webSocketGwDomain = config[siteConfigKeys.serverAddressForIM]; diff --git a/src/public/js/login/login.js b/src/public/js/login/login.js index 6d4d7bb2..ae60519c 100644 --- a/src/public/js/login/login.js +++ b/src/public/js/login/login.js @@ -162,9 +162,13 @@ function registerForPassportPassword() $(".zaly_site_register-pwd")[0].style.display = "block"; } + function returnRegisterDiv() { - $(".zaly_site_register-pwd")[0].style.display = "block"; + $(".zaly_site_register-pwd")[0].style.display = "none"; $(".zaly_site_register-invitecode")[0].style.display = "none"; + $(".zaly_site_register-repwd")[0].style.display = "none"; + $(".zaly_site_update-invitecode")[0].style.display="none"; + $(".zaly_login_by_pwd")[0].style.display = "block"; } function handleHtmlLanguage(html) diff --git a/src/views/passport/login.php b/src/views/passport/login.php index cfbb439b..f05b10d2 100644 --- a/src/views/passport/login.php +++ b/src/views/passport/login.php @@ -106,7 +106,7 @@
-
+
+
@@ -121,13 +121,12 @@
-
-
+
+
From 7bb7ee6e064912cac9a8a476ac387608976b99cd Mon Sep 17 00:00:00 2001
From: childeYin
Date: Wed, 12 Sep 2018 10:48:20 +0800
Subject: [PATCH 017/302] add content-length
---
src/lib/Util/ZalyCurl.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/lib/Util/ZalyCurl.php b/src/lib/Util/ZalyCurl.php
index f33a130a..990135ae 100644
--- a/src/lib/Util/ZalyCurl.php
+++ b/src/lib/Util/ZalyCurl.php
@@ -39,6 +39,7 @@ public function requestDataByAction($action, $params, $url, $method)
$this->setRequestMethod($method);
curl_setopt($this->_curlObj, CURLOPT_URL, $url);
curl_setopt($this->_curlObj, CURLOPT_TIMEOUT, $this->timeOut);
+ curl_setopt($this->_curlObj, CURLOPT_HTTPHEADER, array('Content-Length: ' . strlen($this->_bodyContent)));
if (($resp = curl_exec($this->_curlObj)) === false) {
$this->wpf_Logger->error('when run Router, unexpected error :', curl_error($this->_curlObj));
@@ -79,6 +80,7 @@ public function requestWithActionByPb($action, $requestBody, $url, $method)
$this->setRequestMethod($method);
curl_setopt($this->_curlObj, CURLOPT_URL, $url);
curl_setopt($this->_curlObj, CURLOPT_TIMEOUT, $this->timeOut);
+ curl_setopt($this->_curlObj, CURLOPT_HTTPHEADER, array('Content-Length: ' . strlen($this->_bodyContent)));
if (($resp = curl_exec($this->_curlObj)) === false) {
$this->wpf_Logger->error('when run Router, unexpected error :', curl_error($this->_curlObj));
@@ -112,6 +114,7 @@ public function request($method, $url, $params = [], $headers = [])
try {
$this->_curlObj = curl_init();
$this->_getRequestParams($params);
+ $headers['Content-length'] = strlen($this->_bodyContent);
$this->_setHeader($headers);
$this->setRequestMethod($method);
curl_setopt($this->_curlObj, CURLOPT_URL, $url);
From 2b268de8306bd20f853500e8edea175ab4818481 Mon Sep 17 00:00:00 2001
From: sisishiliu <4416@cunmou.com>
Date: Fri, 14 Sep 2018 22:01:35 +0800
Subject: [PATCH 018/302] 1.0-beta-5
---
src/config.sample.php | 96 +-
.../Friend/Api_Friend_AcceptController.php | 43 +-
.../Friend/Api_Friend_SearchController.php | 12 +-
.../Api/Group/Api_Group_InviteController.php | 6 +-
.../Api_Group_RemoveMemberController.php | 11 +-
.../Api_Passport_PasswordRegController.php | 9 +-
...ssport_PasswordResetPasswordController.php | 2 +-
...PasswordUpdateInvitationCodeController.php | 1 -
.../Api/Plugin/Api_Plugin_ProxyController.php | 11 +-
.../Session/Api_Session_VerifyController.php | 4 +-
.../Api/Site/Api_Site_ConfigController.php | 20 +-
.../Api/Site/Api_Site_LoginController.php | 7 +-
src/controller/BaseController.php | 11 +-
src/controller/HttpBaseController.php | 98 +-
.../Im/Cts/Im_Cts_MessageController.php | 8 +-
.../Im/Cts/Im_Cts_SyncController.php | 18 +-
src/controller/InstallDBController.php | 567 ++++--------
.../Manage/Manage_UicController.php | 4 -
.../Manage/Manage_UserController.php | 44 +-
.../Manage_MiniProgram_ProfileController.php | 2 -
.../Manage_MiniProgram_UpdateController.php | 4 +
.../Manage/User/Manage_User_IdController.php | 22 +
...MiniProgram_Passport_AccountController.php | 2 +-
src/controller/MiniProgramController.php | 3 +-
src/controller/Page/Page_JsController.php | 3 -
src/controller/Page/Page_LogoutController.php | 2 +-
src/lib/Util/ZalyCurl.php | 188 ++--
src/lib/Util/ZalyErrorBase.php | 3 +
src/lib/Util/ZalyErrorEn.php | 4 +-
src/lib/Util/ZalyErrorZh.php | 5 +-
src/lib/Util/ZalyHelper.php | 38 +-
src/lib/wpf/Wpf_Controller.php | 84 +-
src/model/BaseCtx.php | 66 +-
src/model/BaseTable.php | 38 +-
src/model/DB/DB_Mysql.php | 122 +++
src/model/Message/Message_Client.php | 14 +-
src/model/Push/Push_Client.php | 74 +-
src/model/Site/Site_Login.php | 30 +-
src/model/SiteConfigTable.php | 2 +-
src/model/SiteFriendApplyTable.php | 15 +-
src/model/SiteGroupMessageTable.php | 4 +-
src/model/SiteGroupTable.php | 18 +-
src/model/SiteGroupUserTable.php | 72 +-
src/model/SitePluginTable.php | 24 +-
src/model/SiteSessionTable.php | 22 +-
src/model/SiteU2MessageTable.php | 4 +-
src/model/SiteUicTable.php | 20 +-
src/model/SiteUserFriendTable.php | 79 +-
src/model/SiteUserTable.php | 53 +-
src/model/database-sql/site_mysql.sql | 183 ++++
src/model/database-sql/site_sqlite.sql | 195 ++++
src/public/css/init.css | 180 +++-
src/public/css/zaly_msg.css | 4 +-
src/public/img/init/check_failed.png | Bin 0 -> 796 bytes
src/public/img/init/check_success.png | Bin 0 -> 815 bytes
src/public/img/init/failed.png | Bin 0 -> 557 bytes
src/public/img/init/select.png | Bin 0 -> 498 bytes
src/public/img/init/un_select.png | Bin 0 -> 265 bytes
src/public/img/manage/plugin_default.png | Bin 0 -> 5497 bytes
src/public/img/manage/site_default.png | Bin 0 -> 2348 bytes
src/public/img/msg/emotions.png | Bin 1911 -> 2256 bytes
src/public/img/msg/images.png | Bin 1528 -> 1697 bytes
src/public/js/im/zalyClient.js | 36 +-
src/public/js/im/zalyGroupMsg.js | 8 +-
src/public/js/im/zalyIm.js | 48 +-
src/public/js/im/zalyMsg.js | 30 +-
src/public/js/login/login.js | 58 +-
src/views/base/chatDialog.php | 2 +-
src/views/base/template_msg.php | 8 +-
src/views/init/installSite.php | 211 ++++-
src/views/manage/config/defaultFriends.php | 16 +-
src/views/manage/config/defaultGroups.php | 13 +-
src/views/manage/config/index.php | 11 +-
src/views/manage/config/siteManagers.php | 4 +-
src/views/manage/config/sitePublicKey.php | 2 +-
src/views/manage/group/indexList.php | 13 +-
src/views/manage/group/members.php | 4 +-
src/views/manage/group/profile.php | 9 +-
src/views/manage/home.php | 2 +-
src/views/manage/miniProgram/add.php | 865 +++++++++---------
src/views/manage/miniProgram/index.php | 14 +-
src/views/manage/miniProgram/list.php | 14 +-
src/views/manage/miniProgram/profile.php | 37 +-
src/views/manage/uic/index.php | 2 +-
src/views/manage/uic/usedList.php | 4 +-
src/views/manage/user/groups.php | 4 +-
src/views/manage/user/id.php | 126 +++
src/views/manage/user/indexList.php | 24 +-
src/views/manage/user/profile.php | 32 +-
src/views/widget/template_widget.php | 6 +-
90 files changed, 2588 insertions(+), 1566 deletions(-)
create mode 100644 src/controller/Manage/User/Manage_User_IdController.php
create mode 100644 src/model/DB/DB_Mysql.php
create mode 100644 src/model/database-sql/site_mysql.sql
create mode 100644 src/model/database-sql/site_sqlite.sql
create mode 100644 src/public/img/init/check_failed.png
create mode 100644 src/public/img/init/check_success.png
create mode 100644 src/public/img/init/failed.png
create mode 100644 src/public/img/init/select.png
create mode 100644 src/public/img/init/un_select.png
create mode 100644 src/public/img/manage/plugin_default.png
create mode 100644 src/public/img/manage/site_default.png
create mode 100755 src/views/manage/user/id.php
diff --git a/src/config.sample.php b/src/config.sample.php
index 4d406e68..88971e24 100644
--- a/src/config.sample.php
+++ b/src/config.sample.php
@@ -6,34 +6,68 @@
* Time: 1:41 PM
*/
- return array (
- 'apiPageIndex' => './index.php?action=page.index',
- 'apiPageLogin' => './index.php?action=page.login',
- 'apiPageLogout' => './index.php?action=page.logout',
- 'apiPageJump' => "./index.php?action=page.jump",
- 'loginPluginId' => '105',
- 'apiPageWidget' => './index.php?action=page.widget',
- 'apiPageSiteInit' => "./index.php?action=installDB",
- 'session_verify_101' => 'http://open.akaxin.com:5208/index.php?action=api.session.verify&body_format=pb',
- 'session_verify_102' => './index.php?action=api.session.verify&body_format=base64pb',
- "siteAddress" => '',
- 'passport_cookie_name' => "duckchat_passport_cookie",
- 'mail' =>
- array (
- 'host' => 'smtp.126.com',
- 'SMTPAuth' => true,
- 'emailAddress' => 'xxxx@126.com',
- 'password' => '',
- 'SMTPSecure' => '',
- 'port' => 25,
- ),
- 'sqlite' =>
- array (
- 'sqliteDBPath' => '.',
- 'sqliteDBName' => '',
- ),
- "dbVersion" => "2",
- 'logPath' => '.',
- "debugMode" => false,
- 'msectime' => 1535945699185.0,
- );
+return array(
+ 'siteVersionName' => 'site-beta-1',
+ 'siteVersionCode' => '0.1.1',
+ 'apiPageIndex' => './index.php?action=page.index',
+ 'apiPageLogin' => './index.php?action=page.login',
+ 'apiPageLogout' => './index.php?action=page.logout',
+ 'apiPageJump' => "./index.php?action=page.jump",
+ 'loginPluginId' => '105',
+ 'apiPageWidget' => './index.php?action=page.widget',
+ 'apiPageSiteInit' => "./index.php?action=installDB",
+ 'session_verify_101' => 'http://open.akaxin.com:5208/index.php?action=api.session.verify&body_format=base64pb',
+ 'session_verify_102' => './index.php?action=api.session.verify&body_format=base64pb',
+ "siteAddress" => '',
+ 'passport_cookie_name' => "duckchat_passport_cookie",
+ 'mail' =>
+ array(
+ 'host' => 'smtp.126.com',
+ 'SMTPAuth' => true,
+ 'emailAddress' => 'xxxx@126.com',
+ 'password' => '',
+ 'SMTPSecure' => '',
+ 'port' => 25,
+ ),
+ 'dbType' => 'sqlite',
+ 'dbVersion' => '2',
+ 'sqlite' =>
+ array(
+ 'sqliteDBPath' => '.',
+ 'sqliteDBName' => '',
+ ),
+ 'mysql' =>
+ array(
+ 'dbName' => 'duckchat_site',
+ 'dbHost' => '127.0.0.1',
+ 'dbPort' => '3306',
+ 'dbUserName' => 'duckchat',
+ 'dbPassword' => '1234567890',
+ ),
+ 'mysqlSlave' => array(
+// 'slave_0' => array(
+// 'dbName' => 'duckchat_site',
+// 'dbHost' => '127.0.0.1',
+// 'dbPort' => '3306',
+// 'dbUserName' => 'duckchat',
+// 'dbPassword' => '1234567890',
+// ),
+// 'slave_1' => array(
+// 'dbName' => 'duckchat_site',
+// 'dbHost' => '127.0.0.1',
+// 'dbPort' => '3306',
+// 'dbUserName' => 'duckchat',
+// 'dbPassword' => '1234567890',
+// ),
+// 'slave_2' => array(
+// 'dbName' => 'duckchat_site',
+// 'dbHost' => '127.0.0.1',
+// 'dbPort' => '3306',
+// 'dbUserName' => 'duckchat',
+// 'dbPassword' => '1234567890',
+// ),
+ ),
+ 'logPath' => '.',
+ "debugMode" => false,
+ 'msectime' => 1535945699185.0,
+);
diff --git a/src/controller/Api/Friend/Api_Friend_AcceptController.php b/src/controller/Api/Friend/Api_Friend_AcceptController.php
index e29b1b90..2b44f406 100644
--- a/src/controller/Api/Friend/Api_Friend_AcceptController.php
+++ b/src/controller/Api/Friend/Api_Friend_AcceptController.php
@@ -28,33 +28,34 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
$applyUserId = $request->getApplyUserId();
$isAgree = $request->getAgree();
- $result = false;
-
- $this->ctx->Wpf_Logger->info("---------------",
- "userId=" . $userId . " applyUserId=" . $applyUserId . " isAgree=" . $isAgree);
+ try {
+ $result = false;
+ if ($userId == $applyUserId) {
+ throw new Exception("unable add yourself as friend");
+ }
+ if ($isAgree) {
+ $result = $this->agreeFriendApply($userId, $applyUserId);
- if ($isAgree) {
- $result = $this->agreeFriendApply($userId, $applyUserId);
+ if ($result) {
+ $this->removeFriendApply($applyUserId, $userId);
+ $this->removeFriendApply($userId, $applyUserId);
+ }
+ } else {
+ $result = $this->removeFriendApply($applyUserId, $userId);
+ }
if ($result) {
- $this->removeFriendApply($applyUserId, $userId);
- $this->removeFriendApply($userId, $applyUserId);
+ $this->setRpcError("success", "");
+ } else {
+ $this->setRpcError("error.alert", "");
}
-
- } else {
- $this->ctx->Wpf_Logger->info("---------------", "do remove friend apply");
- $result = $this->removeFriendApply($applyUserId, $userId);
- }
-
-
- if ($result) {
- $this->setRpcError("success", "");
- } else {
- $this->setRpcError("error.alert", "");
+ $this->setRpcError($this->defaultErrorCode, "");
+ } catch (Exception $e) {
+ $this->setRpcError("error.alert", $e->getMessage());
+ $this->logger->error($this->action, $e);
}
-
- $this->setRpcError($this->defaultErrorCode, "");
$this->rpcReturn($this->action, new $this->classNameForResponse());
+ return;
}
protected function agreeFriendApply($userId, $applyUserId)
diff --git a/src/controller/Api/Friend/Api_Friend_SearchController.php b/src/controller/Api/Friend/Api_Friend_SearchController.php
index cb701929..15202701 100644
--- a/src/controller/Api/Friend/Api_Friend_SearchController.php
+++ b/src/controller/Api/Friend/Api_Friend_SearchController.php
@@ -36,7 +36,7 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
try {
if (empty($keyWords)) {
- throw new Exception();
+ throw new Exception("search keywords is empty");
}
$friendProfile = new Zaly\Proto\Core\FriendUserProfile();
@@ -50,6 +50,15 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
}
if (!empty($publicProfile) && !empty($publicProfile->getUserId())) {
+
+ if ($this->userId == $publicProfile->getUserId()) {
+ if ($this->language == Zaly\Proto\Core\UserClientLangType::UserClientLangEN) {
+ throw new Exception("unable to add yourself");
+ } else {
+ throw new Exception("不允许添加自己");
+ }
+ }
+
$friendProfile->setProfile($publicProfile);
$friendInfo = $this->getUserFriendInfo($userId, $publicProfile->getUserId());
@@ -72,6 +81,7 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
}
$this->rpcReturn($this->action, $response);
+ return;
}
private function getUserProfileByPhoneId($phoneId)
diff --git a/src/controller/Api/Group/Api_Group_InviteController.php b/src/controller/Api/Group/Api_Group_InviteController.php
index b63bc983..af543fb2 100644
--- a/src/controller/Api/Group/Api_Group_InviteController.php
+++ b/src/controller/Api/Group/Api_Group_InviteController.php
@@ -70,16 +70,16 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
$siteConfig = $this->ctx->SiteConfigTable->selectSiteConfig($siteConfigObj::SITE_MAX_GROUP_MEMBERS);
$siteMaxGroupMembers = $siteConfig[$siteConfigObj::SITE_MAX_GROUP_MEMBERS];
}
- if ($siteMaxGroupMembers <= $groupUserCount) {
+
+ $newGroupUserCount = $groupUserCount+count($userIds);
+ if ($siteMaxGroupMembers <= $groupUserCount || $siteMaxGroupMembers < $newGroupUserCount) {
$errorCode = $this->zalyError->errorGroupMemberCount;
$errorInfo = $this->zalyError->getErrorInfo($errorCode);
$this->setRpcError($errorCode, $errorInfo);
throw new Exception($errorInfo);
}
-
/// 公开的直接进入
- // TODO 用户怎么处理
$this->addMemberToGroup($userList, $groupId);
$this->setRpcError($this->defaultErrorCode, "");
diff --git a/src/controller/Api/Group/Api_Group_RemoveMemberController.php b/src/controller/Api/Group/Api_Group_RemoveMemberController.php
index 920fe8b9..5158e697 100644
--- a/src/controller/Api/Group/Api_Group_RemoveMemberController.php
+++ b/src/controller/Api/Group/Api_Group_RemoveMemberController.php
@@ -101,9 +101,16 @@ private function updateGroupAvatarWhenRemoveUser($groupId, $userList, $groupMemb
private function removeMemberFromGroup($userList, $ownerUserId, $groupId)
{
- ////把自己剔除， 自己不能移除自己, 不能移除群主
- $exceptUserId = $this->userId == $ownerUserId ? [$this->userId] : [$this->userId, $ownerUserId];
+ ////把自己剔除， 自己不能移除自己, 不能移除群主,管理员不能剔除管理员
+ ///
+ $adminType = \Zaly\Proto\Core\GroupMemberType::GroupMemberAdmin;
+ $adminIds = $this->ctx->SiteGroupUserTable->getGroupUserByMemberType($groupId, $adminType, ["userId"]);
+ if(!empty($adminIds)) {
+ $adminIds = array_column($adminIds, "userId");
+ }
+ $exceptUserId = $this->userId == $ownerUserId ? [$this->userId] : array_merge([$this->userId, $ownerUserId],$adminIds);
$userIds = array_diff($userList, $exceptUserId);
+
if (!count($userIds)) {
$errorCode = $this->zalyError->errorGroupRemoveMemberType;
$errorInfo = $this->zalyError->getErrorInfo($errorCode);
diff --git a/src/controller/Api/Passport/Api_Passport_PasswordRegController.php b/src/controller/Api/Passport/Api_Passport_PasswordRegController.php
index 22ea4ec8..6283c951 100644
--- a/src/controller/Api/Passport/Api_Passport_PasswordRegController.php
+++ b/src/controller/Api/Passport/Api_Passport_PasswordRegController.php
@@ -31,12 +31,19 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
$sitePubkPem = $request->getSitePubkPem();
$invitationCode = $request->getInvitationCode();
- if(!$loginName || mb_strlen($loginName) > 16 ) {
+ if(!$loginName || strlen($loginName) > 16 ) {
$errorCode = $this->zalyError->errorLoginNameLength;
$errorInfo = $this->zalyError->getErrorInfo($errorCode);
$this->setRpcError($errorCode, $errorInfo);
throw new Exception("loginName is not exists");
}
+ $isLoginName = ZalyHelper::isLoginName($loginName);
+ if(!$isLoginName) {
+ $errorCode = $this->zalyError->errorInvalidLoginName;
+ $errorInfo = $this->zalyError->getErrorInfo($errorCode);
+ $this->setRpcError($errorCode, $errorInfo);
+ throw new Exception("loginName is not exists");
+ }
if(!$password) {
$errorCode = $this->zalyError->errorPassowrdLength;
diff --git a/src/controller/Api/Passport/Api_Passport_PasswordResetPasswordController.php b/src/controller/Api/Passport/Api_Passport_PasswordResetPasswordController.php
index 8a169308..f716e87d 100644
--- a/src/controller/Api/Passport/Api_Passport_PasswordResetPasswordController.php
+++ b/src/controller/Api/Passport/Api_Passport_PasswordResetPasswordController.php
@@ -10,7 +10,7 @@ class Api_Passport_PasswordResetPasswordController extends BaseController
{
private $classNameForRequest = '\Zaly\Proto\Site\ApiPassportPasswordResetPasswordRequest';
private $classNameForResponse = '\Zaly\Proto\Site\ApiPassportPasswordResetPasswordResponse';
- private $tokenExipreTime = 10*60*1000;///10分钟
+ private $tokenExipreTime = 600000;///10分钟
public function rpcRequestClassName()
{
diff --git a/src/controller/Api/Passport/Api_Passport_PasswordUpdateInvitationCodeController.php b/src/controller/Api/Passport/Api_Passport_PasswordUpdateInvitationCodeController.php
index 1a7384cb..d83c5d36 100644
--- a/src/controller/Api/Passport/Api_Passport_PasswordUpdateInvitationCodeController.php
+++ b/src/controller/Api/Passport/Api_Passport_PasswordUpdateInvitationCodeController.php
@@ -10,7 +10,6 @@ class Api_Passport_PasswordUpdateInvitationCodeController extends BaseController
{
private $classNameForRequest = '\Zaly\Proto\Site\ApiPassportPasswordUpdateInvitationCodeRequest';
private $classNameForResponse = '\Zaly\Proto\Site\ApiPassportPasswordUpdateInvitationCodeResponse';
- private $tokenExipreTime = 10*60*1000;///10分钟
public function rpcRequestClassName()
{
diff --git a/src/controller/Api/Plugin/Api_Plugin_ProxyController.php b/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
index e6e2da8d..fda35226 100644
--- a/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
+++ b/src/controller/Api/Plugin/Api_Plugin_ProxyController.php
@@ -54,7 +54,7 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
$body = $request->getBody();
- $httpProxyResponse = $this->ctx->ZalyCurl->requestAndReturnHeaders($method, $requestUrl, $body, $headers);
+ $httpProxyResponse = $this->ctx->ZalyCurl->requestAndReturnHeaders($requestUrl, $method, $body, $headers);
$response = $this->buildApiPluginProxyResponse($httpProxyResponse["body"], $httpProxyResponse["httpCode"], $httpProxyResponse["header"]);
$this->setRpcError($this->defaultErrorCode, "");
$this->rpcReturn($transportData->getAction(), $response);
@@ -75,7 +75,14 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
*/
private function getPluginRequestUrl($reqUrl, $pluginId)
{
- $defaultScheme = $_SERVER['REQUEST_SCHEME'];
+ $defaultScheme = "http";
+
+ if ( (! empty($_SERVER['REQUEST_SCHEME']) && $_SERVER['REQUEST_SCHEME'] == 'https') ||
+ (! empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ||
+ (! empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == '443') ) {
+ $defaultScheme = 'https';
+ }
+
$defaultHost = $_SERVER['HTTP_HOST'];
$reqUrlStruct = parse_url($reqUrl);
diff --git a/src/controller/Api/Session/Api_Session_VerifyController.php b/src/controller/Api/Session/Api_Session_VerifyController.php
index 1b787895..e4f7edec 100644
--- a/src/controller/Api/Session/Api_Session_VerifyController.php
+++ b/src/controller/Api/Session/Api_Session_VerifyController.php
@@ -31,14 +31,13 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
$tag = __CLASS__ . "-" . __FUNCTION__;
try {
$preSessionId = $request->getPreSessionId();
+ $preSessionId = trim($preSessionId);
$errorCode = $this->zalyError->errorPreSessionId;
$errorInfo = $this->zalyError->getErrorInfo($errorCode);
if (!$preSessionId) {
$this->setRpcError($errorCode, $errorInfo);
throw new Exception("401 ");
}
- ////TODO 临时存储，切换到redis
-
$userInfo = $this->ctx->PassportPasswordPreSessionTable->getInfoByPreSessionId($preSessionId);
if (!$userInfo || !$userInfo['userId']) {
@@ -49,6 +48,7 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
$response = $this->buildApiSessionVerifyResponse($userInfo);
$this->ctx->PassportPasswordPreSessionTable->delInfoByPreSessionId($preSessionId);
+
$this->setRpcError($this->defaultErrorCode, "");
$this->rpcReturn($transportData->getAction(), $response);
} catch (Exception $ex) {
diff --git a/src/controller/Api/Site/Api_Site_ConfigController.php b/src/controller/Api/Site/Api_Site_ConfigController.php
index d56d6082..5cd05f14 100644
--- a/src/controller/Api/Site/Api_Site_ConfigController.php
+++ b/src/controller/Api/Site/Api_Site_ConfigController.php
@@ -38,6 +38,8 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
if (empty($url)) {
throw new Exception("api.site.config with no requestUrl in header");
}
+
+ $scheme = $url['scheme'];
$host = isset($url['host']) ? $url['host'] : "";
$port = isset($url['port']) ? $url['port'] : "";
if (empty($host)) {
@@ -65,7 +67,7 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
$loginPluginProfile = $this->getPluginProfileFromDB($configData[SiteConfig::SITE_LOGIN_PLUGIN_ID]);
- $response = $this->buildSiteConfigResponse($host, $port, $configData, $isValid, $randomBase64, $loginPluginProfile);
+ $response = $this->buildSiteConfigResponse($scheme, $host, $port, $configData, $isValid, $randomBase64, $loginPluginProfile);
$this->setRpcError($this->defaultErrorCode, "");
$this->rpcReturn($transportData->getAction(), $response);
@@ -167,8 +169,12 @@ private function buildRandomBase64($random, $siteIdPrikBase64)
* @return ApiSiteConfigResponse
* @throws Exception
*/
- private function buildSiteConfigResponse($host, $port, $configData, $isValid, $randomBase64, $pluginProfile)
+ private function buildSiteConfigResponse($scheme, $host, $port, $configData, $isValid, $randomBase64, $pluginProfile)
{
+ if (empty($scheme)) {
+ $scheme = "http";
+ }
+
////ApiSiteConfigResponse 对象
$response = new ApiSiteConfigResponse();
@@ -188,18 +194,18 @@ private function buildSiteConfigResponse($host, $port, $configData, $isValid, $r
$addressForAPi = "";
$addressForIM = "";
- if ($zalyPort && $zalyPort > 0 && $zalyPort < 65535) {
+ if (isset($zalyPort) && $zalyPort > 0 && $zalyPort < 65535) {
//support zaly protocol
$addressForAPi = "zaly://" . "$host" . ":" . $zalyPort;
$addressForIM = "zaly://" . "$host" . ":" . $zalyPort;
- } else if ($wsPort && $wsPort > 0 && $wsPort < 65535) {
+ } else if (isset($wsPort) && $wsPort > 0 && $wsPort < 65535) {
//support ws protocol
- $addressForAPi = "http://" . "$host" . ":" . $port;
+ $addressForAPi = $scheme . "://" . "$host" . ":" . $port;
$addressForIM = "ws://" . "$host" . ":" . "$wsPort";
} else {
//support http protocol
- $addressForAPi = "http://" . "$host" . ":" . $port;
- $addressForIM = "http://" . "$host" . ":" . $port;
+ $addressForAPi = $scheme . "://" . "$host" . ":" . $port;
+ $addressForIM = $scheme . "://" . "$host" . ":" . $port;
}
$this->ctx->Wpf_Logger->info("api.site.config", "addressForAPi=" . $addressForAPi);
diff --git a/src/controller/Api/Site/Api_Site_LoginController.php b/src/controller/Api/Site/Api_Site_LoginController.php
index b3a9cffe..38a4898e 100644
--- a/src/controller/Api/Site/Api_Site_LoginController.php
+++ b/src/controller/Api/Site/Api_Site_LoginController.php
@@ -31,7 +31,7 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
$loginName = $request->getLoginName();
$userExists = $this->checkUserExists($loginName);
$isRegister = $request->getIsRegister();
- $this->ctx->Wpf_Logger->info("api.site.login", " =========userExists=" . $userExists);
+// $this->ctx->Wpf_Logger->info("api.site.login", "userExists=" . $userExists);
if (!$userExists && $isRegister == false) {
$errorCode = $this->zalyError->errorUserNeedRegister;
@@ -58,7 +58,8 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
}
//get user profile from platform clientSiteType=1:mobile client
- $userProfile = $this->ctx->Site_Login->checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem, 1);
+ $clientType = Zaly\Proto\Core\UserClientType::UserClientMobileApp;
+ $userProfile = $this->ctx->Site_Login->checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem, $clientType);
$realSessionId = $userProfile['sessionId'];
@@ -74,7 +75,7 @@ public function rpc(\Google\Protobuf\Internal\Message $request, \Google\Protobuf
} catch (Exception $ex) {
$errorCode = $this->zalyError->errorSiteLogin;
$errorInfo = $this->zalyError->getErrorInfo($errorCode);
- $this->ctx->Wpf_Logger->error($tag, "=========error=" . $ex->getMessage());
+ $this->ctx->Wpf_Logger->error($tag, "error=" . $ex);
$this->setRpcError($errorCode, $errorInfo);
$this->rpcReturn($transportData->getAction(), new $this->classNameForResponse());
}
diff --git a/src/controller/BaseController.php b/src/controller/BaseController.php
index dd6cb955..247df874 100644
--- a/src/controller/BaseController.php
+++ b/src/controller/BaseController.php
@@ -283,6 +283,8 @@ public function checkSessionId($action)
$this->rpcReturn($this->action, null);
die();
}
+ //expire time
+ $sessionCreatedTime = $sessionInfo['timeWhenCreated'];
$timeActive = $sessionInfo['timeActive'];
$nowTime = $this->ctx->ZalyHelper->getMsectime();
@@ -307,11 +309,14 @@ public function checkSessionId($action)
$this->rpcReturn($this->action, null);
die();
}
+
+ //update session
+ $this->ctx->SiteSessionTable->updateSessionActive($this->sessionId);
}
public function getPublicUserProfile($userInfo)
{
- try{
+ try {
$publicUserProfile = new \Zaly\Proto\Core\PublicUserProfile();
$avatar = isset($userInfo['avatar']) ? $userInfo['avatar'] : "";
$publicUserProfile->setAvatar($avatar);
@@ -326,7 +331,7 @@ public function getPublicUserProfile($userInfo)
$publicUserProfile->setAvailableType(\Zaly\Proto\Core\UserAvailableType::UserAvailableNormal);
}
return $publicUserProfile;
- }catch (Exception $ex) {
+ } catch (Exception $ex) {
$this->ctx->Wpf_Logger->error("get public user profile", $ex);
$publicUserProfile = new \Zaly\Proto\Core\PublicUserProfile();
return $publicUserProfile;
@@ -336,7 +341,7 @@ public function getPublicUserProfile($userInfo)
public function getGroupMemberUserProfile($user)
{
$tag = __CLASS__ . "-" . __FUNCTION__;
- $this->ctx->Wpf_Logger->error($tag, "user userMemberType = " . $user['memberType']);
+ $this->ctx->Wpf_Logger->info($tag, "user userMemberType = " . $user['memberType']);
$publicUserProfile = $this->getPublicUserProfile($user);
diff --git a/src/controller/HttpBaseController.php b/src/controller/HttpBaseController.php
index 9093491d..981de205 100644
--- a/src/controller/HttpBaseController.php
+++ b/src/controller/HttpBaseController.php
@@ -33,18 +33,24 @@ abstract class HttpBaseController extends \Wpf_Controller
private $jumpRoomType = "";
private $jumpRoomId = "";
private $jumpRelation = "";
- private $siteCookieName = "zaly_site_user";
+ public $siteCookieName = "zaly_site_user";
- public function __construct(Wpf_Ctx $context)
+ public function __construct(BaseCtx $context)
{
- if(!$this->checkDBIsExist()) {
+
+ if (!$this->checkDBIsExist()) {
$initUrl = ZalyConfig::getConfig("apiPageSiteInit");
header("Location:" . $initUrl);
exit();
}
+ $this->ctx = $context;
- $this->ctx = new BaseCtx();
+ $flag = $this->ctx->Site_Config->getConfigValue(SiteConfig::SITE_OPEN_WEB_EDITION);
+ if($flag != 1) {
+ echo "该站点没有开起web版本";
+ die();
+ }
}
@@ -59,31 +65,19 @@ public function doIndex()
try {
parent::doIndex();
$preSessionId = isset($_GET['preSessionId']) ? $_GET['preSessionId'] : "";
-
- $x = isset($_GET['x']) ? $_GET['x'] : "";
$action = isset($_GET['action']) ? $_GET['action'] : "";
if ($preSessionId) {
$this->handlePreSessionId();
- $apiPageIndex = ZalyConfig::getConfig("apiPageIndex");
- if($x) {
- if (strpos($apiPageIndex, "?")) {
- header("Location:" . $apiPageIndex."&x=".$x);
- } else {
- header("Location:" . $apiPageIndex."?x=".$x);
- }
- } else {
- header("Location:" . $apiPageIndex);
- }
- exit();
}
- if(!in_array($action, $this->whiteAction)) {
+ if (!in_array($action, $this->whiteAction)) {
$this->getUserIdByCookie();
}
+
$this->getJumpUrl();
$this->index();
- }catch (Exception $ex){
+ } catch (Exception $ex) {
$this->ctx->Wpf_Logger->error($tag, "error msg =" . $ex->getMessage());
$this->setLogout();
}
@@ -91,13 +85,33 @@ public function doIndex()
public function handlePreSessionId()
{
- $preSessionId = isset($_GET['preSessionId']) ? $_GET['preSessionId'] : "";
- if ($preSessionId) {
+ try {
$preSessionId = isset($_GET['preSessionId']) ? $_GET['preSessionId'] : "";
- if($preSessionId) {
- $userProfile = $this->ctx->Site_Login->checkPreSessionIdFromPlatform($preSessionId);
- $this->setCookieBase64($userProfile["sessionId"], $this->siteCookieName);
+ if ($preSessionId) {
+ $preSessionId = isset($_GET['preSessionId']) ? $_GET['preSessionId'] : "";
+ if ($preSessionId) {
+ $clientType = Zaly\Proto\Core\UserClientType::UserClientWeb;
+ $userProfile = $this->ctx->Site_Login->checkPreSessionIdFromPlatform($preSessionId, "", $clientType);
+ $this->setCookie($userProfile["sessionId"], $this->siteCookieName);
+ }
+ }
+ $x = isset($_GET['x']) ? $_GET['x'] : "";
+ $apiPageIndex = ZalyConfig::getConfig("apiPageIndex");
+ if ($x) {
+ if (strpos($apiPageIndex, "?")) {
+ $apiPageIndex . "&x=" . $x;
+ } else {
+ $apiPageIndex . "?x=" . $x;
+ }
}
+ $successCallBack = $_GET['success_callback'] ? $_GET['success_callback'] : "";
+ echo "$successCallBack('" . $apiPageIndex . "');";
+ die();
+ } catch (Exception $ex) {
+ $errorInfo = $ex->getMessage();
+ $failCallBack = $_GET['fail_callback'] ? $_GET['fail_callback'] : "";
+ echo "$failCallBack('" . $errorInfo . "');";
+ die();
}
}
@@ -105,26 +119,26 @@ public function getJumpUrl()
{
$tag = __CLASS__ . "-" . __FUNCTION__;
- try{
+ try {
$x = isset($_GET['x']) ? $_GET['x'] : "";
- if(!$x) {
- return ;
+ if (!$x) {
+ return;
}
list($type, $id) = explode("-", $x);
- if($id == $this->userId) {
+ if ($id == $this->userId) {
return;
}
- if($type == $this->groupType) {
+ if ($type == $this->groupType) {
$this->jumpRoomType = "MessageRoomGroup";
$isInGroupFlag = $this->ctx->SiteGroupTable->getGroupProfile($id, $this->userId);
$this->jumpRelation = $isInGroupFlag != false ? 1 : 0;
- }elseif($type == $this->u2Type) {
+ } elseif ($type == $this->u2Type) {
$this->jumpRoomType = "MessageRoomU2";
$isFriendFlag = $this->ctx->SiteUserFriendTable->isFollow($this->userId, $id);
- $this->jumpRelation = $isFriendFlag > 0 ? 1 : 0;
+ $this->jumpRelation = $isFriendFlag > 0 ? 1 : 0;
}
$this->jumpRoomId = $id;
- }catch (Exception $ex) {
+ } catch (Exception $ex) {
$this->ctx->Wpf_Logger->error($tag, "error msg =" . $ex->getMessage());
}
}
@@ -144,8 +158,8 @@ public function checkUserCookie()
{
$tag = __CLASS__ . "-" . __FUNCTION__;
- $this->sessionId = isset($_COOKIE['zaly_site_user'] ) ? $_COOKIE['zaly_site_user'] : "";
- if(!$this->sessionId) {
+ $this->sessionId = isset($_COOKIE[$this->siteCookieName]) ? $_COOKIE[$this->siteCookieName] : "";
+ if (!$this->sessionId) {
throw new Exception("cookie is not found");
}
@@ -174,13 +188,13 @@ public function checkUserCookie()
public function setLogout()
{
$x = isset($_GET['x']) ? $_GET['x'] : "";
- setcookie ($this->siteCookieName, "", time()-3600, "/", "", false, true);
+ setcookie($this->siteCookieName, "", time() - 3600, "/", "", false, true);
$apiPageLogin = ZalyConfig::getConfig("apiPageLogin");
- if($x) {
+ if ($x) {
if (strpos($apiPageLogin, "?")) {
- header("Location:" . $apiPageLogin."&x=".$x);
+ header("Location:" . $apiPageLogin . "&x=" . $x);
} else {
- header("Location:" . $apiPageLogin."?x=".$x);
+ header("Location:" . $apiPageLogin . "?x=" . $x);
}
} else {
header("Location:" . $apiPageLogin);
@@ -204,12 +218,12 @@ public function display($viewName, $params = [])
{
// 自己实现实现一下这个方法，加载view目录下的文件
$params['session_id'] = $this->sessionId;
- $params['user_id'] = $this->userId;
- $params['nickname'] = $this->userInfo['nickname'] ? $this->userInfo['nickname'] : "匿名";
+ $params['user_id'] = $this->userId;
+ $params['nickname'] = $this->userInfo['nickname'] ? $this->userInfo['nickname'] : "匿名";
$params['loginName'] = ZalyHelper::hideMobile($this->userInfo['loginName']);
- $params['avatar'] = $this->userInfo['avatar'];
+ $params['avatar'] = $this->userInfo['avatar'];
$params['jumpPage'] = ZalyConfig::getApiPageJumpUrl();
- if(!isset($params['login'])) {
+ if (!isset($params['login'])) {
$params['login'] = '';
}
$params['jumpRoomId'] = $this->jumpRoomId;
diff --git a/src/controller/Im/Cts/Im_Cts_MessageController.php b/src/controller/Im/Cts/Im_Cts_MessageController.php
index 6a2939d9..2db85be1 100644
--- a/src/controller/Im/Cts/Im_Cts_MessageController.php
+++ b/src/controller/Im/Cts/Im_Cts_MessageController.php
@@ -111,19 +111,17 @@ private function returnU2MessageIfNotFriend($msgId, $msgRoomType, $fromUserId, $
$this->finish_request();
- //get
+ //get user name
$toUserName = $this->ctx->SiteUserTable->getUserNickName($toUserId);
$title = '[notice]';
- $noticeText = '8r1ur@1j3|&Hyo^0bi}F1?d)Jwnf{2KT`r#kbzX)
zG8er7g#H^=dP2a($mfyv%tZm4SDH=EpJ&A!7o_HOfkmqCE2cT#k?9oQl&mvxFR-;x
zvQ$sT%$kjNwH>T2e34^MiA_Y{39c#EYkS(~=P!4f&f5L(qlMdKQtUpR$(
z;@FVlF=GjD+=}_&BL;swfW338yb9Hw(wnTkf{-fP4TT7;Xr!Wf1JBQ$#68tY<@Ozz
zIdd7<_Z_zDW^ikiUnQHW{aayLpg|&pzGxxbv=;4o1hF^+d%nfq&W!4(2;DxkS0Os;
zsdvXwb?`7!Jq7pjc?Q4V9jx#rKp-o<%Rc@Gm8pTySe(kQcjZfVf4fF#;U`0_`04Pd
zV1awmo2u&sO_V{4T+Ww#=hjdw8rK9*#jsMj9_)U64B?h^xyvJ`qV?xs_xqFcXSm|{
zvoRbVPQwbqo6^B97fnTOQ!_k%R5YjjYs4m`d*S<4<0IAk6+f9?hKS=pd~C^Jmq{8o
zp#F{hLDp4uWKR0IT9T*P`nu0hJ*28r{#Tx=
zDk2XIl8$s_P6USZTS@-HOPcsFmUSv?(254om13wtnV|4kkiSrS38UvDxo3aMjX$1^
aH1P#1bw_4CXcqAR0000|cRu(B!IW=dEx#0-ooK3^NjDAqIRw$@cHxkJkR_6e4h8`
z^A=J>@K(9UeczK8SG!7-T?iXdazIBAxrxyW>ei-_f5rwr-SX4qVhEX^2nMk-_V_nr
z)}p5T9!o(aREw26|A|J6We;)0ztUC%YM*`s)!MK`71IN_GAru8c-#
zAO0%EEZXNxdJkCXoH~1|DL71)D~GnfPth~cxuEI!tZh{0y~E9WzjAT#OQuXL1u-!R
zb@_Wi3TIDq-A}W#;0Pi%k%1H3ehBRImhy(LE(sLw4RI$voN{Ag(eGTp9i@DJMXtMq
z-9j&E@&~4slSiR&)odO@edqgf6AB_iEI8
zK3p44Eb!BhqSbzdQ>yAq&sNkl~0cv_kCoyY;Cq%8>;Vdc;+|r?98lSoyS7KT->g#RCmS<
zB)+5E?A)9!Gc&EE6p05}EM{$sWr38ma6f>&0zgO&;3rTjR+oAxPu|S0&TRv6bTDVT
z{tXDq0D6-ullY~;=P=Am*0Wc$k!A%HLOlO5fWzzAZSO!n_OWS0(|qEffwb_Dn;TA!n^K{0Lv*ca>85#ow9
z{cb{n>DYPe8U$ApEPXcUp72~aVy2z~a$v27cj^oJqAU&;az@&^55cj`f$*`()=619
zUd#i00buXuK>Y4e4@aPv0QPh;tpv>vkACT|)&v_&ZJD}kjs5-IcHfTc058X@buhJH
zfJ%|J+^XCx_0mrTB_c#CVLWWB@a&$Me
z_kiHR4nKNT`BKhQ-u_%Uktne~G_+F;XF`Ax0GUJ}(E#vTX*nN3)_|hB`{&=t>JDZH
v1~R=lz0LJiI*6MvoAsK#u&Y|NlREtk1Zn!X35M;{00000NkvXXu0mjf{cQnw
literal 0
HcmV?d00001
diff --git a/src/public/img/init/select.png b/src/public/img/init/select.png
new file mode 100644
index 0000000000000000000000000000000000000000..d053eecf4567b7940c671ff2a35b4e1fb93b2661
GIT binary patch
literal 498
zcmVXz($%G5Y_(~82&Ia
zGBq;#*lfHws!tm?YKhh1-F%V)XYcyea^ZExvOT|fscW-{8
zgb3V4EUZincFs}^=T5$6`0yT8k*op_LqU}x!@vLk8Ty*fGdzFt6(d;T1{qt3f^7sj
zd*0Nm4Bx*&{LjP7%Fx(n0j9g^&obP-`4MZ}poCFWvN}UxgfhdHwf7lT%)iCJ%)-b}
zQfI`Vr7sK)lfBy?Y`pd9l!7YaMEABG<{ewTb;f(&EC}jo(Wj=-(eV4&5
zBLr|71WLi|94rjqzY#VBWC=+L5}&I;20db6V2~x`bOQ2EsaK4II_&59{`*TN1H=Dp
o28RFgB)aVBe@4aytSontmjD0&07*qoM6N<$g7;|RdjJ3c
literal 0
HcmV?d00001
diff --git a/src/public/img/init/un_select.png b/src/public/img/init/un_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..eaec03c921245cc85d3bd1956617e1078d191d8a
GIT binary patch
literal 265
zcmV+k0rvihP)o
zfq}uFfstt%qmRwTdkp^>PyPMFlD7S%*C$d8a?{(%&CdIyR(8TAuzQ*mK*aKm>4FE8iYIaM#G43${HbI^oW6h;n1(o9O=6*xql@bDhL%04*NNH
zet&9WU|@)%UNI8tu%GAq?=P7Q4F9tk82-zX;vxnHhNu4-85gj!{Oth%Q!%0W{R~tq
P00000NkvXXu0mjf(ZO;?
literal 0
HcmV?d00001
diff --git a/src/public/img/manage/plugin_default.png b/src/public/img/manage/plugin_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..08c7cbefbda637d80cfc8623eaea88934139f332
GIT binary patch
literal 5497
zcmV-<6^81GP)005u}1^@s6i_d2*000$0Nkl3^f>G1FgK$%kKpN3)qbU%q(n#anpxcI~qbHEdj5eXE&*+#2D1z
zMjL1$unGdY2w1=uD8S_6)|l|%AZx!{epdq4j(Syi$_9GrRx0TQfm8%6V0mE?hPsW0
zhY;}ES$4M?8*^=-gFq<=goS_wY%MIppy|V`HOXbxBVgUgw^GO#7VJ_^3fV})9?2u&
z*95Fx^HpGpOuIswC=uXvTwIL4i8bNZ1ROcr9%t9!jwmaavIPMmU=?8ejNw*U?Z5d~
z-PF55cDq85Od!DBabXcUaVoAQ;KBE_De4M4$i|XpNj@PqA%`7DxnvOe0`fm`Vbc+cx@U
zx^k&c5U?yPApzIfHck;Z1c6K=U|CpijhJQc5tph=LofB!B0yKJ5i@OD;1C4jLO=)@
z7xGfCGYHBEC`^bG0U=ML8PK|^^Rrb`psE_E{0i8$@0*|Re+sPm2>7Zh#zu!+wGc35
zKpQHqkp-OI4(MJ2bUy|-%7?UPbq%n7C-ByG;H_=Iw%r;0fC#D*0!9F8YLS)&TyP>V
z^bDY_57IT%#5cAAkFN%{?8?B0L{NngFal5$MN)R6*YUuWU4eEHYRmFb#flGsCs$|R
zh$sY%h=814f7u&2;qZtma4ELN1{SOXX1@vW-`QY7zzBM&TYKQ==L0PoM^Lyzk!wE&
z9$W_OaTUc?C?JDLgn%J~J-7>S)tNwnr~G@!6{i&U=@-E7UjjCN9&J5AOBVtLMX)Y^
zqXJ;mdCr>86gyB2Onn)6ZL29QI0_SMOG&^t*7{3tsx1l4U5HKKP
ziW&jG?gMb$XR1|v36w1WD!wwWg+jmpebTrQaMOj(;c^h;jmN5wfRA-s
zbu*w%Q{d#bK+9MMxU36s@{#`PT=s9^&#(B)8&xhLpbuo5k$k1VDQ)#L^U#>2duk2v*_ZnHnS)n(
zS9b@FZKI$6&IQ26&-C*}l|u-qiEOhX;MP*0laEn|P6Ql*UJqec%8kztdjfq<())mS
zKL#c&(#sQNY9XKoy3HE{zqtrF(Z}t^j@`iIrNH)(od+&C1-RxMy>rKV%YoG&X?%Eu
zNrixl;2uWu^#hJCR?Lu;Y-=TO_abL=5rtiL8Zi7U^^&(#0Arp9Ot`HR0xI-dt0oTl
z{H(b?+yzWr6#cc>PkQN1$KziB*6mdI_=uAT0X+bwlj!aJfMZ(g_rwPk&d9e{DRi@b
z`N=uBCcO7@bsxijtOfq>tzdPAky{AZ0E+ZZ9@Ee9Sk|>op8@xj17BuchX`Q(#hgJg)N-E>&Nr-t-*s@gDu}3p0lh
z&;`vSTR7zN<1$ZodG0dz9SpOZ)XN%hs%yZf$33ZKU
zZ1=qg?2n0jY%kmYz!0^TFM1#N-<4`+NOhWdsCcwA>{zksHcL0-L1n2@4x7~Xg
zP@=GD;(_=BOXF>=5U>t^zF6Z?i=VsQ)!TswUNYyRpWZp=bnqq?ujF_&7pDmU>(Kx4
zxj^5J`d#tnHsB900S9aJ^G229KYIZEPWCRHchSFk+B;p8DTIIkF6|7AI9nfPPGNss
z2Jo$}Nyb-rL%Vvnh#ooDJ?fn<$`pA|K%VhU8Uz#+=)t^V3ozwnpxT7{tdyp67tGzT
zm+jsMjDFH9RkXj)djkII0-(pSdLX~D8JPBpxlbRj?+u)LocA~JPWblcz0*aRBCiS9
z@d)6q0ebM#sq=r9113k<8{1#aU5uNjdza{af7q$>nt(j-JMCz7NMGFo{ArmPUL@&S
zO_#B0R{(sa=VePb0S_(rN)_$z^Ok^Jj&^Q4RE=*c=s{w_IbTCKP#O-Stm^l5cTZ-V*Q+-vy3nt_J<|mB7OH)2A(N
z=Ddz$XHuJGM@$#|CmrG3
zHz)tv3_Q9D_}u5CBb9c!rQwo-OA8eq|5Z)iEv8()62jc+q~;lP0^vX_@;X}B|mbtT6g{Zb!S(bY8-VYU9MI}aw;wbCM*m`
znSi4^ml7>C$j7!!`xo%?X8pEDl_Tc}$b(qw^d+1No_zEhisABYRcAGN)qdRbU7nKs+(@?dPw<>-%0X*xYG>ESJ@8126^XbQX{kJ=c
zoH;WBUU(AlqjL|HsCfEqCyYVDcy#j6_tc<#WCgHzgUb}$8W?ygz-N$Dt@2}Z=b|s6
zj!_khqDU(1*W_}!-s3v>-A{CC%S_swAmBxv0A8&z9!ILB5|F>=8jx#2FY~%9rBD&$
ze+)hy;BAPm-M7REIHO{xwsqv-nksCbQp-#CA4#R&sMBOU0V&RN?K$q`BX~SS=3#QO
z@zt10z?j!QbcDXWj3d&>bM&M!SSDpVZlCAvUBh#}n@Bz%qwW0nfEjOieL;M`&uRj4
z8f3>eWUICxdJcH!C64N-m+@`ysKOWtpzM!YP8lw-X8s8Yx)n7GC
zm)nk5M`9znU8(1us%?%dT~-lr*qOkP)AgZp^XJofj6`o}o}uZ)U*p=1Hx(+juL}6t
z6ZNOzPDcP^6@B{>bx?QuiI_c{RlYYlP1X>Q3ZPu~=^Cft`(Feoosn!jKH;IYs`**a
zt9Z*K>Zh6(gHb1pqx4^{QV-4W*ec+ecT~T|oOD@1z>#MI13T-3#=FLW(VIl
zSWkrLZ?6IWT(8~^Iz-&uS1tVu>w&+%RzK}MgMbbSO869-q~k<3n(+kG*|8>f0KHG>
z0`*SH$QNW3LD>vl
z3=Lo6T4PQYeUmLAu6R96YQ7
z@_2nsX*cq68SwC{PPC<5FyjbFe?6X|wbXDiXGeT-0GPD6{&}Bj2Q_H~l=WBFR(2~l
z-TB+MIyko(D#q7$$s|r40c&c2hhA;?>Q1E|lhPPPK(5Kg4^%(EO#sQz^mI3(!=+#2
z8)3ewWrRvU#wn3UHL1n`*1u3xD&QKBYr%x^JqshS(?~u(ZhGYdKdm!2k5L4qL+L2R
zFarrlsakONV#l*2sPXW3%*Fn$zfwo9L|b(3hPehze!-Wx(xX2grQlW=@QgAj#;N&@
zAt1$c?z>#gO)BvbjI%p&F|e&NJXk1gOKlY$2LRT8>sq9uk=;$ru9a-hFb~WdLRdc@Ep?c}zzD)pcmPw%6PVX$yhd{~e$SMl>78Yh
z^YFl&ONnH2dsH7*$D2})5d_rPDH6Db;&Y|%akkBreEFwlq~@09u<>&~DQdSh;ba
zSkQ@wtG7tk<66CB^Hau7K-KjhcfO;Zh$jT9YBzE@K|v&y5DAGg8Q^fjBGnplFJ0^e
zyrnPDt;8ExdbjZ0&s5{)OIoz4Zf&Wq+I$25!@YESG0
zoPM?1!y7N1mN-D?{q-+;zN|m*DnjCoB;Bl*30&H(UU8KSn>d
zn_i86DY=m&b^_A*lrh`9%%t@a9~&_sjMsx9w{PP8_1%lijI!y~2T}Y!b^@wK_Sw1%
zxGhEFB?>^i%B152m8w+ZaU_@b$zJCshhmXp4g#?gP$y&-qkHq(DlX&mO1emOK1#m@
z6d~eyU$V!uekr+^BX$DncntI5c3jU8n~{8_-tJj$6yeB6aq>9-^O#EA*a^rGSN9KA
zgNNG6zn!m^Hq2BMprkHy$0PMit@WB&l=-k-`YnwoN9+XTXR8K|VOkzW^H4fdMlo=@
z#_QbeCfY`SL6WZ_ubE7JhpF`#K|s}a69lm~c;MX31X^MAAu3!kxS_6Xt#o#~mHTva
z=2vD{2`4@$%A15X
zO`T}!C9U=8!*wb>w)Y;;&zp}qj36L^*OAR-dP-DKF0G+J(tbLWVYv7rE)oA%r;JUX
z0r!;Gm)FqApO0ycAt1qL;OEm611={zi_UTeH)ttdPAx(|ao_a1DmPObM?hZmmubGK
zNbQ<~)xdi@0TOc8K7bM))Lda)-8RjfVAWi6`V}Hd)W;{H3}~1dkv%u563tf`M?iii
zUzJg*s3%3?m6hpgBF>ak0M;RZ(};o7)^$`Y<*=QMc9f
z@{J`Rf#a@}k+jH56-EkQ@+BT!zht?mikg19tRrCJ6OU`-gls*_$E&o4V50Xj
zgZ?es3{Z_rELsGzmVn74;#nO42ArYN7T@aX8hs3@!OXKgDwWC(R~JG5>9d}I$)Db=
z2c+-*i$r~0b>eD-!PNMwDX_myJ+q_sj2;>w2}Lck#CN#4K+2mu2_CFS41%8I4UB*gFffEt
zKoA6kfI-lcynzw0M$EGJz{X*LOOgTv0ZjxfV2?F&mc7olaf)VMNiGNkM!>SLo&+qn
zZS)OXniL=iXd+-)SV96$v2Bdj%qz(Sfxrk@7N%O)%(Ms805L@02;6=tAj=Ub00vrP
z=h%%mRAHwLw94}Dk>+O+0v52lQxV$Mid>AGZBMmpFe;1MFHOyI1gru~n=#xPT}#00
z=Gg5HR$+q;#H>M;<)}*Yl@PFiFA9s$Y5Fj0$Ja7HBWK&=>>AvmRDvWD1Ogyn6=3{~
z;Z_-o_?m#%&$F9URA7k>^a@b6WEBJ&M8E=;7Z;=NgM+NvI8yb5&g!P(l{U~pa1;c>
zM!*8L78aogr`|-_hbZk`JIn4?V`Hw6Fl_kqySzH`4Vpg8T9b@~tJGuNNcfaY$N5c~
zu)dztZebCICXak+N5I4{YS)C77=s$zD7)jZx+1^I;cgcNm|WZ%6B28_R0KT5Zfi%w
zYLuY{Bjm6;zX;^_YkA0w0?aIIgmG@8p63+oRxxi(Hddk3wlD-h7XT$TP$I5ee!D40
v@>$qx0o&pHS!>yNwqp^>#}2cU0@nUNO71T`PYv~000000NkvXXu0mjfrz};T
literal 0
HcmV?d00001
diff --git a/src/public/img/manage/site_default.png b/src/public/img/manage/site_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f48b6600d99add261be002769288fc39c5258d8
GIT binary patch
literal 2348
zcmcImdpy(M8{cQPW?L*KN@y<4h*HFcW@THS2g@hC$t1*3Z`69QH
zHAzLeL^PMyid>7bTnhDD_51tx-|vre&g(qq{eC~^d0wyQJm;dblbsw&6$ODnyhlTnJQxy^_N!8_8df{K}+X1xtqbT~}H$@+(#?d+&u
z2{S9UfwH}B*R5iLx#S^MkC)a#3J3cRZzO`ZJ5E_+LAbP8z
zc7W#6pBEaf7_UgQpP
zeqF#}ui#xXAn+1=%#_6xEO)DVWGOQ8B>Bs0W6E+?>zY>*$iir_xHg~lF9tCCdG}?k
z_2BL*lvN8PeA4OOuM3^-Y;t`5S@@*tWjY7
z^i)~w%=Wv!>2cG+iT|qG>5A8#U|si-+qk^KU$Sf_P|5RcFFkbcl9M1PPjEHxO`V#-dXDtV;rn@UV+W{njCi|d2qky_o)rndP!81(lFP{b_gcNf3`E+YYjk0W$VL&=Lg*g6MHl*27I^xS%cQNLfcg
z1q?ld{eQN^xb;3TzYM(m2EK0Qi9JX&k}HeDpHuRpR&&C
z$%@XzB*VJGmidYvrB2=v#!{qwfTTIb1a6|0BF9ls@iOu%uiaU5rXmLHV+Zl;QhA_l
z!EZe}+8;f4;Q4{gH5e(RO=bR-QfH!xDQJ6$(a2~Nq53A8=Kz0n&G!%F9H?sA(?5=~
z4252rUJXLBfYE5`GibM;qTMBgsGh2T--AbQJW{MOfRI8)k`@C{0aVp>6zxqlv>IA)
zJY$x=2)PFzkXFeaAjRG$;I7Xo#um2`nj(Sy-+om&&H*QT$B7MbSd@YO?GlDUmqfvdqgc=p9y=s-1ZoOR@Um8KX*9cQvNSY<(z2g#hA;;5oSyb|C
zzo_WzxobTmvOw$fFGd3uql!2ru`EP)7Ls0AhgbdtQgRe&-5j|Y8VF7K}upzIc
z3Xx_Jm<+%yLXmtuo#x_j
zc>Z5V%0P1m1k~Ev>OFe&!`rk@uOl%Hz%f9cCDr4>p!M8f!Lk!XA`w+lF||^Ji%HA`
zPy*nefZShReyLkoS((b7a}JihXGs;;6sv|N=k~>W*^}>fMPMX3ecMYj0Etah;L3feCPY01W5KA*LBAv5_&s;
z>&@|dJX~E}U9}<8uOFaTtodpHjR2;SYz0z_ZQFk9LV)Ru;W*nTXr0(X@+JW9Xss92
z)CB+BH+~k7>$;_hgggt#l_dTKq^oS(K71j;^u>zDw_UDv$_4NR0Q;5Fw*-U156$>l
zK#tS$u!yVz_-~~=w*-Up{_+0+(-+fq-HJp)o(H6i#75f=EISJ*9^W=Y>(tW#$^dNa
z=xDol#flX}^2MhGTUS@-8#%K0dm?f_fD-^_heCn9j6@>dii&CX0`ee<4y`dO91gsa
znJ^NG_$N=Eegl~q>2H~_!)
z`_(G;KFJmUw~9!8I9z?VA=u1>j?=QX=Qzy~^Hnl6b2tj;@vmX*i`q|~u@
zds)^D9Vcnqc9q%cL9MZ|*|4*T>o-nHaYry%H8*>Lsg
zZ9A}FpbU=F6c(Xb?M0;8m`HT4T(oG>nV|sH*Ee03pN~e79=`EVE&
zBx(Wv)|}zNULss)+f{1@OX4_AiO=WrT9(zG%Y`;RBEoq5$?-m4`ahOseLQ&V7W3NH
z8&zO-$P~_EfJ;N6s>gFpb|L+GPasP21RbX(*>hoKekfGE?LsEXHJ0PF%oLGlNT$q@
z8B!WWswK8--5b=R(P$x=_Yf)H24FbI4ut|nQS`I_$sWAo@yP7nYCnAqpbaUuDdoK}
z7@TLw@~lN7qADufrGPwQItUTGsg$a+ZR@WCAu@{ue49n|9RN~Fsr6nj)?1d9&h$6x
z5lH^Y6ku~l{eCX(7HH9E(^X2T9f0XV@r%yR6ZbD!vLu-~xuKyo-|KDrE-9wGOaPEJ
zGMB_IrPSM6Yc0Yut<%?&{2G8_Q!)U?lF3u+vrCPklVnm>0QjMZoHPpz2Cd!QfK1zS
zEd*pvM!_{bn~^Mio$N>5b&2@R;lr=(8Hj%z
zXWJB!~FdE=%rKLq*9IDG~ZEejzdbB+N=<5JpE+Pux
zL8W9*S=rd8?8}?E+dUP2?8|_B9zaJ|SLbJIYimy$pMG73giZNFzxTdfE1AYeLAgH*3?*L=RUO=
zNs^bRer)7U?-8%<=xFWnble}I}
z0O)>EhJ4#d{=l~TcdP>*S%2;^-N=lu0%_BxT-UqBh74Z-__Eh4ds3-UZ`=0QPiB-G
z?%cU^VJ&AseUW-0000WUIDwK^mqhIQ?}H#1hcO$v${9Q+6o
zlrFZ;_}=c8Vj3D_fr45=sA-5%|FAWR_5*0uTDE8_P{iHY*?IS8&gRW#I^EfwX=%g#
z_nv#s@1E~-1Wle*t5(e!A0O`^d4aX|qX6DR@*)wLPjZfkjFJ40i0lTi(-`xFi0n@!
z5=YjoSu@s*IBAsF^SpKuSpwi{k{<@}7648I?;`-uh{%%weok^*7>1(_yhB6a`uh4V
zG{$^~q=GxUitz-1XGP?Iwf3NhydWY;0E+;eNAk@8+$ws#|FyODYlDM>PtOK$MsS|z
zy-q~3ByR)I2EYRNw}?Ci;6cZ6w&e5q=j#bcr_<+1*v2G;>d0C*0-1CHZtTCiZjA9A@|dA6Td?o+8$Yez@NrPkW(W1w9C
z#zkb4<2bkF^Z9>H$7@<}nM~$_D2jdx;GMBqehc7BiA3VBYuBzFZxmE5od#2}SX>-M
zQ69j%0q6(+>^M%UP$=xLr9TdwYOGu?Z_y|OFlvn1Vy*3K)QKAbuI@teJ`uSxc9)&5
z>n^R;;4$E09~&Tf1Avk-X22M8M?Rl_r4gac(5Nf`-vE$N>xjrklKs^_cnmn-_irVs
z4-&?h`;9UFsQ^~_L{Cr8yhI{#FUh5`58fUG!5x+RDR7!DMC4Dgn$^d;Urkfi(`sz3
zZ6x2TQA~1iCCyBNixcd9BtH{J__Ijts96x}s6G_(f*t7Uke
zcNu`q02YWy*xugWFLCPl6@a&i$m0taF1)HX!LC@b;`~ynq%>NNAR>P+m&@J5!^6+c
zrX|nwQULA+FgFJDaC>|E=LZG`UaC<*YciSqCCMuQ>~UT9W0J{aE{~#UTda{x5ClJ}
z73lkZH_6B1(ldGOy6%vjuIrvVU9HSyGH;Ed=r;g5VunW?$GNOfDC}(jT$*cFE1CDRG(>FH@pBodz`d9B_XV}4RB7VqD%VMB2?
zaG6ZzY-{b!BtHn?U&fexS6A1Qxm-@0h~tj$`@2c1i)|Ip^R%X&58%--3_np%ST2`y
z45t3H}c)C<7
zEp8-*)C$h!a;+mHBRYFr2w-CvhFZ>!IoWKst6VN0&={D^bB$Dp<;$0U$QZK~z!@U)
zJ?;6LX{U6CNG6kCA$dE={~2StgCO`_EjZuzHDMQ~Dnui-Rei;AoOL3i1$<0Iv>{y6
z2tdt`BO@c%ipUR0&J&RzPfSd#T)%$(f2+YM-JwH=wvz0gs;xC$$@A9QPt|rM$|Rf3
zUQ{lZAJhf`fVS-q09ZNGXh%}CUIO^4_G(&%9LHHUT`*`*7e&!S8hBG(i3*PUxeWm3
z8DrKJi^VTb=U2Y(Urh4hxT0w5v|mK-G{$J-@JhK{E?a9I*LCMuYu_azHTD_tly+t{~sF*6K%In(F72u$fLc26z(yok7oxOOejB&uLaCIafrwNS+t3D|Bey
zC?fX+L7)JSJD%t1r1uDbbB^nTmAaW3V)g3Pb4N!<7njTB8v*Db+5D5ep;jQ
zgttr;fG4}3(^?rtk(zE9$#(#Fy>|I0y`QVj300d-9ouwsSvk7d)ZBG|q~^I7NG3%@
xHFIvfn$`u5E>2YA_7~0<;t-
z$TUfnw6%~bH*H;e_wIUEj-!^Bln+T8QGo!Zyee86P$3n9&|r++P3*h({L#tAm1FJN
zo8b6-ym!vb@661ZnIiy@&*x)7pzjh1Z#Ra^RpHq0S9%#E0clP-PVKKFk@2@&*A1n&
zx3?x5t!)?KP7*7wG(-jcuZmz-ef`QoNvE@$M5LF*5&(Y$cvMy1o)54v#ML5lH^7yE
zykQLQ7T+H@LE?6jFRWTscjvlw>x%OMGif88KD0`t_%g}m0QQOR=gyIg0l2HFsqx4Z
z80qcJuZ%{`^^QZkPI;bp8UW`S*!Oe0Nq$EJKazBMz#21v+|k_J_}fWisZ`Dt;dT<&
zi&zMGLj;c|lMO$ad!T`PN%V-|$ax?Dp{lvV^Ss|#W4@o;LGnO(!}__VCU(hM><&`)i{LNOsNQUgl{MVg*SE}ZVm~9X
zn$+*Mv@|?CPe21n5(h~ZNPf1tIdOc~u3fTb&Du`_CI#>+5q>F|OgvjHP$rXEZj2sK
z#j)}6v)R_x)^k($&KR=({``%q=6RC0s_M%m4vD~C{7nGf58xG%a6>Yg{A)Ep`Fwui
z#6-AsQ0BjLK+}1D=46Cv=kw`pWEzo(nOlI&s#uWFExJ5*4X?RUF-06AVtJT0*&jbOx
zNOssm0eDG7-c8chwYLFjsIR~Fi0ursdFUN`Jv}|q#f$4!00q?5)t#=kt=NVgi`DKV
z`E>wsTY**CUMym@h;{?K4ZvwYzY>dKFbuh^VjZgH^s~wMe(pgM-vGEsM2@MNEr~?p
zRA*MtV4!*F~<
zOH0c|(?cqi{kW>;OAVF(26O;md&Sl<-JtLLOO0`Mi`ab9uO*Z2Z>Gz1cX!8^F1@xL
zK&J>6Ool0uNc_Fr0aB^#N2Y|&=BQQ$^z_ruEvl(G*H7{;05yR8p5)f%=Ef6K4f%e4
zJ85jOw3YmwFjeyAwD7I6a%aY!iRcq9t2M
zdD2b|mBLgB>_Yesk-TO`pj0ZqMwO3{++gzoz+qJ}#<0Ock#ZE^R{`9nibpR@oJSmo
zZ8m{tOZ29(ulonL16Zg_#yy1me_S77SoTp
zt~++AFf#&?&eg_nzp8wIguUMTVljElb=|X54L$QrenmXay(C+#2TAxrpgXp0bN@9b
zKsFgwwaXZKB3KRBej^>DqqReAZ5s;ZjFiTa_=5nxT>3AERKpI>^Zt3MP~}24MF-DB
zqxzYKhKA#_DK52$1&@%puXJrCJvLUmz0x5n>8l7NfH!iS0DJ8ZEL>RAwQ=Ld(Q5Wr$|3vxSB~S{-`KeM=NGzrwffN4H?%Ag2_7POpMAop
z%2Po2Kr)#eu0~1OTPC6(N+#W3R->StOljOO50lsq*k_eK5d?*u)2G97d#3~0S;bM+
zb)M(Gc)37!pG|bt_zzTNvoW;I^`Rgrbk7ErPUpS_@cRIMYM;`7Ah8yZY%C`CUT!U!
zJjl?{(6T~dVmE+$L=ckPKQiL%ZEr7Mqq5oT4Phuh1n^!}dCUUYp}x;1q-~r4kBLat
z30cmg#$bsmH<7pjkb;Q(7~m^qWUnE)9@jP!k
zfLlfZ$WU7_5j8RMI>&KNQ#2aQXXbZ_=w1MA05)oxcEb04Ims2jlv3k--!Eb2H9?kM
z>gwuxk;==wX2`bWTpr-BeaqR^t2qegHo?j&qS?
zrfJS$W*a~;fLs8*0L~K8E?w83wJd8yQyq)NW_zCZJ%B%zQVRzKR#sLv#rOT=0Im@*
z0R9TV6#^IoV7*}&wIc~GEih&lu-llq3c#;K^h|DU?%`xId7bOJ7BjDq@@D4J#>U2z
zBbCy$z^baMCL|JxLjV>KQKPQw75$NkMxzS>d`v_a0Iarc`@^dW7=UhOUftN(_`#?F
z%P^Hc19;SNoF7IFm~50vej+-{%zpzI2cVz)mSGq#j4Jv2BQS_uh&*%wcrP3dudl1C
zOJozRXf&EbL`y=U(3ygQg6{@uVOsJJC9nYgVdmq8VSJsfz*?52+S=M42JkvFk7Z`_
z+_`gynwpxt{{6B7mQ6&4TN{Z)7Ad9nGP546`;CZ9+qORez;bU?fr*`JYiqj)z(Hmf
zj&>4J4l_>x@H>DK$8k;wxKRUET3V`2oH+3TX5I$idH|=0XuYHoz-9o~N?#am7~hUWeQ2U__gfGx~CiHLpyu!))98n%fK7O|R|
zn!I>CUg7(GG8_(XA51O;R9;@*QX;AYaHI58P1Dxw*s6O8v?-BD)b8HBJ1(d1=;*lJ^E_$(lL54bLZKD)_4Qw7z*liIrBWo!
zES)7iu!@R`>8|U(%*@LJqxd<1n*mG_!4<&-@G3LUS4!10^G!tbBY+y)wm;1PRNoTe
zTr3uQ%J+RIEwJk9>dD>R-R~=<<}z~#z`jr@v<|=|*L4pDyhsqy5dhPfdAdYODfL8W
zXXh8Gs-6kJv^o~(Pcbte2=u21!2a>$$D6gawenq5`YzA&b^(|XyaM)dgNRCP+x{jK
zAOqJ73#_ZFt2jSDf2rqrQYkZ~Qj}6#3kwT3r%Hrys=d8^vG4n$MSbrHL{zWqdR4Z4
zG^1XrY1&%f_Zykn5KbwjD&z6^+d}YxClp>(RaMPMCXl3|wAR@)&6&*n4uIL>YyoUA48yT3D>+iY`U(WV3F&E>R+U695{b-J
zN{Oi60ic73p0{ngek6g(ThB_vFivL46{@VPEb8s;J;2O!L`sOrvTb`yrr?H4Wk)<7
zzje=^J)N08Y~Z@;>guUIJw2lQa{(lY=xJTo-^?Vf{{uGMh~P2+N{g8tSe->g)DGY|
z+qN6hJu78I@Q3Gli>|~_MXGg5B9RcwGatZtBHECSbNxdVWb}%5
zl>00001) {
+ if(msgContent != undefined && msgContent.length>0) {
$(childrens[2]).html(msgContent);
}
@@ -403,13 +403,12 @@ function handleMsgStatusResult(msgId, msgStatus)
{
var msgIdInChatSession = msgIdInChatSessionKey + msgId;
var chatSessionId = sessionStorage.getItem(msgIdInChatSession);
-
if(msgStatus == MessageStatus.MessageStatusFailed) {
$(".msg_status_failed_"+msgId)[0].style.display = "flex";
$(".msg_status_loading_"+msgId)[0].style.display = "none";
$(".msg_status_loading_"+msgId).attr("is-display", "none");
updateMsgStatus(msgId, chatSessionId, MessageStatus.MessageStatusFailed);
- } else if(msgStatus == MessageStatus.MessageStatusServer) {
+ } else {
$(".msg_status_loading_"+msgId)[0].style.display = "none";
$(".msg_status_loading_"+msgId).attr("is-display", "none");
}
@@ -661,16 +660,13 @@ function sendMsg( chatSessionId, chatSessionType, msgContent, msgType)
var msgIdInChatSession = msgIdInChatSessionKey + msgId;
sessionStorage.setItem(msgIdInChatSession, chatSessionId);
- handleImSendRequest(action, reqData, handleMsgSendStatus);
+ handleImSendRequest(action, reqData, "");
message['chatSessionId'] = chatSessionId;
appendOrInsertRoomList(message, true);
handleMsgForMsgRoom(chatSessionId, message);
addMsgToChatDialog(chatSessionId, message);
};
-function handleMsgSendStatus(results) {
- console.log("results ===" + JSON.parse(results));
-}
function addMsgToChatDialog(chatSessionId, msg)
{
@@ -679,19 +675,23 @@ function addMsgToChatDialog(chatSessionId, msg)
var node = $(".chat_dession_id_"+chatSessionId);
sortRoomList(node);
+
setTimeout(function () {
var msgLoadings = $("[is-display='yes']");
var length = msgLoadings.length;
var i;
for(i=0;i= 10000) {
+ handleMsgStatusResult(msgId, MessageStatus.MessageStatusFailed);
+ }
}
}, 10000);///10秒执行
+
msgBoxScrollToBottom();
}
@@ -740,7 +740,8 @@ function appendMsgHtml(msg)
msgStatus:msgStatus,
avatar:userAvatar,
userAvatarSrc:userAvatarSrc,
- userId:token
+ userId:token,
+ timeServer:msg.timeServer
});
break;
case MessageType.MessageImage :
@@ -755,7 +756,8 @@ function appendMsgHtml(msg)
width:imgObject.width,
height:imgObject.height,
userAvatarSrc:userAvatarSrc,
- userId:token
+ userId:token,
+ timeServer:msg.timeServer
});
break;
case MessageType.MessageWebNotice:
@@ -773,13 +775,15 @@ function appendMsgHtml(msg)
avatar:userAvatar,
hrefURL:hrefUrl,
userAvatarSrc:userAvatarSrc,
- userId:token
+ userId:token,
+ timeServer:msg.timeServer
});
break;
case MessageType.MessageNotice:
var msgContent = msg["notice"].body;
html = template("tpl-receive-msg-notice", {
msgContent:msgContent,
+ timeServer:msg.timeServer
});
break;
}
diff --git a/src/public/js/login/login.js b/src/public/js/login/login.js
index ae60519c..11cfb0af 100644
--- a/src/public/js/login/login.js
+++ b/src/public/js/login/login.js
@@ -46,6 +46,7 @@ refererUrl = document.referrer;
secondNum = 120;
isSending = false;
refererUrlKey = "documentReferer";
+updateInvitationCodeType = "update_invitation_code";
if(refererUrl.length>0) {
localStorage.setItem(refererUrlKey, refererUrl);
@@ -83,11 +84,28 @@ function handleRedirect()
} else {
refererUrl = refererUrl+"?preSessionId="+preSessionId+"&isRegister="+isRegister;
}
- localStorage.clear();
- window.location.href = refererUrl;
+ // window.location.href = refererUrl;
+ refererUrl = refererUrl + " &fail_callback=failedCallBack&&success_callback=successCallBack";
+ addJsByDynamic(refererUrl);
}
}
+function failedCallBack(result) {
+ zalyjsAlert(result);
+ $(".register_button").attr("is_type", updateInvitationCodeType);
+ apiPassportPasswordLogin(failedApiPassportPasswordLogin);
+}
+
+function failedApiPassportPasswordLogin(results) {
+ isRegister = false;
+ preSessionId = results.preSessionId;
+}
+
+function successCallBack(result) {
+ console.log(result);
+ localStorage.clear();
+ window.location.href = result;
+}
function loginFailed()
{
@@ -286,6 +304,8 @@ function checkRegisterInfo()
zalyjsAlert($.i18n.map["emailJsTip"]);
return false;
}
+ loginName = registerLoginName;
+ loginPassword = registerPassword;
return true;
}
@@ -333,17 +353,28 @@ function loginNameNotExist()
}
$(document).on("click", ".register_button", function () {
+ var isType = $(this).attr("is_type");
invitationCode = $(".register_input_code").val();
- var flag = checkRegisterInfo();
- if(flag == false) {
- return false;
+
+ if(isType == updateInvitationCodeType) {
+ updatePassportPassword();
+ } else {
+ var flag = checkRegisterInfo();
+ if(flag == false) {
+ return false;
+ }
+ var jsUrl = "./index.php?action=page.js&loginName="+registerLoginName+"&success_callback=loginNameExist&fail_callback=loginNameNotExist";
+ addJsByDynamic(jsUrl);
}
- var jsUrl = "./index.php?action=page.js&loginName="+registerLoginName+"&success_callback=loginNameExist&fail_callback=loginNameNotExist";
- addJsByDynamic(jsUrl);
});
$(document).on("click", ".update_code_btn", function () {
invitationCode = $(".update_input_code").val();
+ updatePassportPassword();
+});
+
+function updatePassportPassword()
+{
var action = "api.passport.passwordUpdateInvitationCode";
var reqData = {
sitePubkPem:sitePubkPem,
@@ -351,7 +382,7 @@ $(document).on("click", ".update_code_btn", function () {
preSessionId:preSessionId,
}
handleClientSendRequest(action, reqData, handlePassportPasswordUpdateInvationCode);
-});
+}
function handlePassportPasswordUpdateInvationCode(results)
{
@@ -383,7 +414,6 @@ function validateEmail(email)
$(document).on("click", ".login_button", function () {
-
loginName = $(".login_input_loginName").val();
loginPassword = $(".login_input_pwd").val();
var isFocus = false;
@@ -411,14 +441,20 @@ $(document).on("click", ".login_button", function () {
zalyjsAlert("站点公钥获取失败");
return false;
}
+ apiPassportPasswordLogin(handleApiPassportPasswordLogin);
+});
+
+
+function apiPassportPasswordLogin(callback)
+{
var action = "api.passport.passwordLogin";
var reqData = {
loginName:loginName,
password:loginPassword,
sitePubkPem:sitePubkPem,
};
- handleClientSendRequest(action, reqData, handleApiPassportPasswordLogin);
-});
+ handleClientSendRequest(action, reqData, callback);
+}
function handleApiPassportPasswordLogin(results)
{
diff --git a/src/views/base/chatDialog.php b/src/views/base/chatDialog.php
index 44e031f1..1a738ba3 100755
--- a/src/views/base/chatDialog.php
+++ b/src/views/base/chatDialog.php
@@ -111,7 +111,7 @@
- 
+
diff --git a/src/views/base/template_msg.php b/src/views/base/template_msg.php
index eb54e0e1..5e627967 100755
--- a/src/views/base/template_msg.php
+++ b/src/views/base/template_msg.php
@@ -16,7 +16,7 @@
{{ if msgStatus == "MessageStatusSending"}}
- "{}" is not your friend, add friend to chat
send a friend apply
';
- $code = str_replace("{}", $toUserName, $noticeText);
+ $code = 'send a friend apply
' . $toUserName . ' is not your friend, add friend to chat
send a friend apply
';
$hrefUrl = 'zaly://0.0.0.0/goto?page=friend_apply&userId=' . $toUserId;
$height = '135';
+
//代发一个web消息给from
$this->ctx->Message_Client->proxyU2WebNoticeMessage($fromUserId, $toUserId, $fromUserId, $title, $code, $hrefUrl, $height);
-
-
$this->ctx->Message_News->tellClientNews(false, $fromUserId);
}
diff --git a/src/controller/Im/Cts/Im_Cts_SyncController.php b/src/controller/Im/Cts/Im_Cts_SyncController.php
index 990e58d2..666802ff 100644
--- a/src/controller/Im/Cts/Im_Cts_SyncController.php
+++ b/src/controller/Im/Cts/Im_Cts_SyncController.php
@@ -95,18 +95,12 @@ public function doRequest(\Google\Protobuf\Internal\Message $request, Zaly\Proto
private function syncU2Message($userId, $deviceId, $limitCount)
{
- $this->ctx->Wpf_Logger->info("U2Pointer", "sync u2 message limitCount=" . $limitCount);
-
+ $isFirst = false;
//u2 pointer
$currentPointer = $this->ctx->SiteU2MessageTable->queryU2Pointer($userId, $deviceId);
if (empty($currentPointer)) {
- $currentPointer = 0;
- }
-
- $this->ctx->Wpf_Logger->info("U2Pointer", "get u2 pointer=" . $currentPointer);
-
- if ($currentPointer == 0) {
+ $isFirst = true;
$currentPointer = $this->ctx->SiteU2MessageTable->queryMaxU2Pointer($userId);
}
@@ -114,12 +108,12 @@ private function syncU2Message($userId, $deviceId, $limitCount)
$currentPointer = 0;
}
- $this->ctx->Wpf_Logger->info("U2Pointer", "get finally u2 pointer=" . $currentPointer);
-
$u2MessageList = $this->ctx->SiteU2MessageTable->queryMessage($userId, $currentPointer, $limitCount);
- $tag = __CLASS__ . "->" . __FUNCTION__;
- $this->ctx->Wpf_Logger->info($tag, "userId=" . $userId . " sync u2 message count=" . count($u2MessageList));
+ if ($isFirst) {
+ //update pointer
+ $this->ctx->SiteU2MessageTable->updatePointer($userId, $deviceId, "1", $currentPointer);
+ }
return $u2MessageList;
}
diff --git a/src/controller/InstallDBController.php b/src/controller/InstallDBController.php
index 288cdad3..441dc52c 100644
--- a/src/controller/InstallDBController.php
+++ b/src/controller/InstallDBController.php
@@ -1,6 +1,9 @@
logger = new Wpf_Logger();
+ $this->logger = $content->getLogger();
$this->helper = new ZalyHelper();
+
+ $this->logger->info("---------------------", "iniiiiiiiii");
}
public function doIndex()
{
+ $result = [
+ 'errCode' => 'error'
+ ];
+
$configFileName = dirname(__FILE__) . "/../" . $this->configName;
$sampleFileName = dirname(__FILE__) . "/../" . $this->sampleConfigName;
if (file_exists($configFileName)) {
@@ -55,22 +65,81 @@ public function doIndex()
$method = $_SERVER['REQUEST_METHOD'];
if ($method == 'POST') {
+ //install site
try {
$serverHost = $_SERVER['HTTP_HOST'];
$port = $_SERVER['SERVER_PORT'];
+ $dbType = $_POST['dbType'];
+ $this->uic = isset($_POST['uic']) && $_POST['uic'] !=""? $_POST['uic'] : $this->defaultUic;
+
+ $isUic = ZalyHelper::isUicNumber($this->uic);
+ if(!$isUic) {
+ echo "邀请码格式不正确，长度6-20位的数字";
+ return;
+ }
+
$hosts = explode(":", $serverHost);
$host = array_shift($hosts);
$scheme = isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : "http";
$siteAddress = $scheme . "://" . $serverHost;
$loginPluginId = $_POST['pluginId'];
- $dbNameKey = ZalyHelper::generateStrKey(8);
- $sqliteName = "db." . md5($dbNameKey) . ".sqlite3";
- $config['sqlite']['sqliteDBName'] = $sqliteName;
+
+ if (isset($dbType) && "mysql" == $dbType) {
+ $config['dbType'] = "mysql";
+ if (isset($_POST['dbName'])) {
+ $config['mysql']['dbName'] = $_POST['dbName'];
+// $config['mysqlSlave']['slave_0']['dbName'] = $_POST['dbName'];
+ }
+ if (isset($_POST['dbHost'])) {
+ $config['mysql']['dbHost'] = $_POST['dbHost'];
+// $config['mysqlSlave']['slave_0']['dbHost'] = $_POST['dbHost'];;
+ }
+ if (isset($_POST['dbPort'])) {
+ $config['mysql']['dbPort'] = $_POST['dbPort'];
+// $config['mysqlSlave']['slave_0']['dbPort'] = $_POST['dbPort'];
+ }
+ if (isset($_POST['dbUserName'])) {
+ $config['mysql']['dbUserName'] = $_POST['dbUserName'];
+// $config['mysqlSlave']['slave_0']['dbUserName'] = $_POST['dbUserName'];
+ }
+ if (isset($_POST['dbPassword'])) {
+ $config['mysql']['dbPassword'] = $_POST['dbPassword'];
+// $config['mysqlSlave']['slave_0']['dbPassword'] = $_POST['dbPassword'];
+ }
+
+ } else {
+ $config['dbType'] = "sqlite";
+
+ $dbNameKey = ZalyHelper::generateStrKey(8);
+ $sqliteName = "db." . md5($dbNameKey) . ".sqlite3";
+
+ if (isset($_POST['sqliteDbFile']) && $_POST['sqliteDbFile']!="") {
+ $dbFileInfos = pathinfo($_POST['sqliteDbFile']);
+ $dbFileDir = $dbFileInfos['dirname'];
+ $dbFileName = $dbFileInfos['basename'];
+
+ if (isset($dbFileDir)) {
+ $config['sqlite']['sqliteDBPath'] = $dbFileDir;
+ }
+
+ if (isset($dbFileName)) {
+ $sqliteName = $dbFileName;
+ }
+ $config['sqlite']['sqliteDBName'] = $sqliteName;
+ } else {
+ //create new site db sqlite
+ $config['sqlite']['sqliteDBName'] = $sqliteName;
+ }
+
+ }
+
$config['loginPluginId'] = in_array($loginPluginId, $this->loginPluginIds) ? $loginPluginId : 101;
+
$config['msectime'] = ZalyHelper::getMsectime();
$config['siteAddress'] = $siteAddress;
+ //write to file
$contents = var_export($config, true);
file_put_contents($configFileName, "initSite($sqliteName, $siteName, $host, $port);
+
+ if ("mysql" == $config['dbType']) {
+ $this->initSiteWithMysql($config, $siteName, $host, $port);
+ } else {
+ $this->initSiteWithSqlite($sqliteName, $siteName, $host, $port);
+ }
+
+ $result['errCode'] = "success";
+// echo $result;
echo "success";
} catch (Exception $ex) {
- echo "fail";
+ $this->logger->error("do install site", $ex);
+ $result['errInfo'] = $ex->getMessage();
+// echo $result;
+ echo $ex->getMessage();
return;
}
- } elseif ($method == "GET") {
-
+ } else if ($method == "GET") {
+ //check system
$permissionDirectory = is_writable(dirname(dirname(__FILE__)));
$configFile = dirname(dirname(__FILE__)) . "/config.php";
$attachDir = dirname(dirname(__FILE__)) . "/attachment";
@@ -101,9 +181,25 @@ public function doIndex()
"isPhpVersionValid" => version_compare(PHP_VERSION, "5.6.0") >= 0,
"isLoadOpenssl" => extension_loaded("openssl") && false != ZalyRsa::newRsaKeyPair(2048),
"isLoadPDOSqlite" => extension_loaded("pdo_sqlite"),
+ "isLoadPDOMysql" => extension_loaded("pdo_mysql"),
"isLoadCurl" => extension_loaded("curl"),
"isWritePermission" => $permissionDirectory,
];
+
+
+ //get db file
+ $dbDir = dirname(__DIR__);
+ $dbFiles = scandir($dbDir);
+
+ if (!empty($dbFiles)) {
+ foreach ($dbFiles as $dbFile) {
+ $fileExt = pathinfo($dbFile, PATHINFO_EXTENSION);
+ if (isset($fileExt) && ($fileExt == "sqlite" || $fileExt == "sqlite3")) {
+ $params['dbFiles'][] = $dbFile;
+ }
+ }
+ }
+
echo $this->display("init_installSite", $params);
return;
}
@@ -125,393 +221,107 @@ private function display($viewName, $params = [])
return $var;
}
- private function initSite($sqliteName, $siteName, $siteHost, $Port)
- {
- $this->_dbName = $sqliteName;
- $this->checkDBExists();
- $this->_checkDBAndTable($siteName, $siteHost, $Port);
- }
-
- private function checkDBExists()
- {
- $dbInfo = $this->_dbPath . "/" . $this->_dbName;
- $this->db = new \PDO("sqlite:{$dbInfo}");
- }
-
- private function _checkDBAndTable($siteName, $siteHost, $Port)
- {
- $this->_checkDBTables();
- $this->_checkConfigDefaultValue($siteName, $siteHost, $Port);
- }
-
-
- private function _checkDBTables()
- {
- ////TODO 检测数据表是否存在
-// $sql = 'sqlite3 $this->_dbName ".read {$this->_dbSqlFile}"';
-// $this->db->exec($sql);
- $this->_checkSiteConfigTable();
- $this->_checkSiteGroupTable();
- $this->_checkSiteGroupUserTable();
- $this->_checkSitePluginTable();
- $this->_checkSiteSessionTable();
- $this->_checkSiteUserTable();
-
- $this->_checkSiteU2MessageTable();// check table + index
- $this->_checkSiteU2MessagePointerTable();// check table + index
-
- $this->_checkSiteGroupMessageTable();// check table + index
- $this->_checkSiteGroupMessagePointerTable();// check table + index
- $this->_checkSiteUicTable();
-
- $this->_checkSiteUserFriendTable();
- $this->_checkSiteFriendApplyTable();
-
- $this->_checkPassportPasswordTable();
- $this->_checkPassportPasswordPreSessionTable();
- $this->_checkPassportPasswordTokenTable();
-
- }
-
- private function _checkConfigDefaultValue($siteName, $siteHost, $Port)
- {
-// $loginPluginId = 100;
- $loginPluginId = ZalyConfig::getConfig("loginPluginId");
- $this->_insertSiteConfig($siteName, $loginPluginId);
-
- $ownerUic = '000000';
- $this->_insertSiteOwnerUic($ownerUic);
-
- $this->initPluginMiniProgram();
-
- return;
- }
-
- private function _checkSiteFriendApplyTable()
- {
- $sql = "CREATE TABLE if not EXISTS siteFriendApply(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- userId VARCHAR(100) NOT NULL,
- friendId VARCHAR(100) NOT NULL,
- greetings VARCHAR(100),
- applyTime BIGINT,
- UNIQUE(userId, friendId)
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
- }
-
- private function _checkSiteConfigTable()
- {
- $sql = "CREATE TABLE IF NOT EXISTS siteConfig(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- configKey VARCHAR(100) NOT NULL,
- configValue TEXT ,
- UNIQUE (configKey)
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
- }
-
- private function _checkSitePluginTable()
- {
- $sql = "
- CREATE TABLE sitePlugin(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- pluginId INTEGER NOT NULL,
- name VARCHAR(100) NOT NULL, /*名字*/
- logo TEXT NOT NULL,/*logo*/
- sort INTEGER,/*排序 数值越小，排位靠前*/
- landingPageUrl TEXT,/*落地页*/
- landingPageWithProxy LONG, /*是否使用resp加载落地页*/
- usageType INTEGER, /*功能类型*/
- loadingType INTEGER,/*展现方式*/
- permissionType INTEGER , /*使用权限*/
- authKey VARCHAR(32) NOT NULL,
- addTime BIGINT,
- UNIQUE(pluginId,usageType)
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
-
- $indexSql = "CREATE INDEX IF NOT EXISTS indexSitePluginSort ON sitePlugin(sort);";
- $prepare = $this->db->prepare($indexSql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
-
- }
-
- private function _checkSiteUserTable()
+ /**
+ * init site with mysql
+ * @param array $config
+ * @param $siteName
+ * @param $siteHost
+ * @param $sitePort
+ * @throws Exception
+ */
+ private function initSiteWithMysql(array $config, $siteName, $siteHost, $sitePort)
{
- $sql = "CREATE TABLE IF NOT EXISTS siteUser (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- userId VARCHAR(100) UNIQUE NOT NULL,
- loginName VARCHAR(100) UNIQUE NOT NULL,
- loginNameLowercase VARCHAR(100) NOT NULL,
- nickname VARCHAR(100) NOT NULL,
- nicknameInLatin VARCHAR(100),
- avatar VARCHAR(256),
- availableType INTEGER,
- countryCode VARCHAR(10),
- phoneId VARCHAR(11),
- friendVersion INTEGER,
- timeReg BIGINT
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
- }
+ $dbName = $config['mysql']['dbName'];
+ $dbHost = $config['mysql']['dbHost'];
+ $dbPort = $config['mysql']['dbPort'];
+ $dbUserName = $config['mysql']['dbUserName'];
+ $dbPwssword = $config['mysql']['dbPassword'];
- private function _checkSiteUserFriendTable()
- {
- $sql = "CREATE TABLE IF NOT EXISTS siteUserFriend(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- userId VARCHAR(100) NOT NULL,
- friendId VARCHAR(100) NOT NULL,
- aliasName VARCHAR(100),
- aliasNameInLatin VARCHAR(100),
- relation INTEGER,
- mute BOOLEAN,/*1互为好友 2我删除了对方 3临时会话 */
- version INTEGER,
- addTime BIGINT,/*是否静音 1表示静音，0表示没有静音*/
- UNIQUE(userId, friendId)
- );";
+ $dbDsn = "mysql:host=$dbHost;port=$dbPort;dbname=$dbName;";
+ $options = array(
+ PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+ );
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
- }
+ $this->logger->error("site.install.db", $dbDsn);
+ $this->logger->error("site.install.db", $dbUserName);
+ $this->logger->error("site.install.db", $dbPwssword);
- private function _checkSiteSessionTable()
- {
- $sql = "create table IF NOT EXISTS siteSession(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- sessionId VARCHAR(100) UNIQUE NOT NULL,
- userId VARCHAR(100) NOT NULL,
- deviceId VARCHAR(100) NOT NULL,
- devicePubkPem TEXT, -- DEVICE PUBK PEM
- clientSideType INTEGER, -- 0:手机客户端 1:web客户端
- timeWhenCreated BIGINT,/*创建时间*/
- ipWhenCreated VARCHAR(100),/*创建时候的ip*/
- timeActive BIGINT,/*最后活跃时间*/
- ipActive VARCHAR(100),/*活跃时间的IP*/
- userAgent VARCHAR(100),
- userAgentType INTEGER,
- gatewayURL VARCHAR(100),
- gatewaySocketId VARCHAR(100),
- UNIQUE(sessionId,userId),
- UNIQUE(userId,deviceId));";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
+ $this->db = new PDO($dbDsn, $dbUserName, $dbPwssword, $options);//创建一个pdo对象
- $indexSql = "CREATE INDEX IF NOT EXISTS indexSiteSessionUserId ON siteSession('userId');";
- $prepare = $this->db->prepare($indexSql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
+ if (!$this->db) {
+ throw new Exception("connect mysql error");
+ }
+ //init table by sql script
+ $this->_executeMysqlScript();
+ $this->_checkConfigDefaultValue($siteName, $siteHost, $sitePort);
}
- private function _checkSiteGroupTable()
- {
- $sql = "
- CREATE TABLE IF NOT EXISTS siteGroup (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- groupId VARCHAR(100) NOT NULL,/*6到16位*/
- `name` VARCHAR(100) NOT NULL,/*群名*/
- nameInLatin VARCHAR(100) NOT NULL,
- owner VARCHAR(100) NOT NULL,
- avatar VARCHAR(256),/*群头像*/
- description TEXT,/*群描述*/
- descriptionType INTEGER default 0,/*descrption type， 0 text, 1 md*/
- permissionJoin INTEGER,/*加入方式*/
- canGuestReadMessage BOOLEAN,/*游客是否允许读群消息*/
- maxMembers INTEGER,/*群最大成员数*/
- speakers TEXT, /*发言人*/
- status INTEGER default 1,/*表示群的状态， 1表示正常*/
- isWidget INTEGER default 0, /*表示1是挂件，0不是挂件*/
- timeCreate BIGINT,
- UNIQUE(groupId)
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
- }
- private function _checkSiteGroupUserTable()
+ private function _executeMysqlScript()
{
- $sql = "CREATE TABLE IF NOT EXISTS siteGroupUser(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- groupId VARCHAR(100) NOT NULL,
- userId VARCHAR(100) NOT NULL,
- memberType INTEGER,
- isMute BOOLEAN default 0 ,/*是否静音 1表示静音，0表示没有静音*/
- timeJoin BIGINT,
- UNIQUE(groupId, userId)
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
- }
+ $tag = __CLASS__ . "->" . __FUNCTION__;
+ $mysqlScriptPath = dirname(__DIR__) . "/model/database-sql/site_mysql.sql";
+ $_sqlContent = file_get_contents($mysqlScriptPath);//写自己的.sql文件
+ $_sqlArr = explode(';', $_sqlContent);
- private function _checkSiteU2MessageTable()
- {
- $sql = "CREATE TABLE IF NOT EXISTS siteU2Message(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- msgId VARCHAR(100) UNIQUE NOT NULL,
- userId VARCHAR(100) NOT NULL,
- fromUserId VARCHAR(100),
- toUserId VARCHAR(100) NOT NULL,
- roomType INTEGER,
- msgType INTEGER,
- content TEXT, -- 可能是一个json，可能是一个proto toString
- msgTime BIGINT
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
+ try {
+ $this->db->beginTransaction();
+ foreach ($_sqlArr as $sql) {
+ $this->db->exec($sql);
+ }
+ $this->db->commit();
+ } catch (Exception $e) {
+ $this->db->rollBack();
+ $this->logger->error($tag, $e);
+ throw $e;
+ }
- $indexSql = "CREATE INDEX IF NOT EXISTS indexSiteU2MessageUserId ON siteU2Message(userId);";
- $prepare = $this->db->prepare($indexSql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
}
- private function _checkSiteU2MessagePointerTable()
- {
- $sql = "CREATE TABLE IF NOT EXISTS siteU2MessagePointer(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- userId VARCHAR(100) NOT NULL,
- deviceId VARCHAR(100),
- clientSideType INTEGER, -- 0:无效，1:手机客户端 2:web客户端
- pointer INTEGER
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
- $indexSql = "CREATE UNIQUE INDEX IF NOT EXISTS indexSiteU2MessagePointerUd ON siteU2MessagePointer(userId,deviceId);";
- $prepare = $this->db->prepare($indexSql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
- }
-
- private function _checkSiteGroupMessageTable()
+ private function initSiteWithSqlite($sqliteName, $siteName, $siteHost, $Port)
{
- $sql = "CREATE TABLE IF NOT EXISTS siteGroupMessage(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- msgId VARCHAR(100) UNIQUE NOT NULL,
- groupId VARCHAR(100) NOT NULL,
- fromUserId VARCHAR(100),
- msgType INTEGER,
- content TEXT,
- msgTime BIGINT
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
+ $dbInfo = $this->_dbPath . "/" . $sqliteName;
+ $this->db = new \PDO("sqlite:{$dbInfo}");
- $indexSql = "CREATE INDEX IF NOT EXISTS indexSiteGroupMessageGroupId ON siteGroupMessage(groupId);";
- $prepare = $this->db->prepare($indexSql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
+ $this->_executeSqliteScript();
+ $this->_checkConfigDefaultValue($siteName, $siteHost, $Port);
}
- private function _checkPassportPasswordTable()
+ private function _executeSqliteScript()
{
- $sql = "CREATE TABLE IF NOT EXISTS passportPassword(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- userId VARCHAR(100) NOT NULL,
- email VARCHAR(100) NOT NULL,
- password VARCHAR(100) NOT NULL,
- nickname VARCHAR(100) NOT NULL,
- loginName VARCHAR(100) NOT NULL,
- invitationCode VARCHAR(100),
- timeReg BIGINT,
- unique(userId),
- unique(email),
- unique(loginName)
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
- }
+ $tag = __CLASS__ . "->" . __FUNCTION__;
+ $mysqlScriptPath = dirname(__DIR__) . "/model/database-sql/site_sqlite.sql";
+ $_sqlContent = file_get_contents($mysqlScriptPath);//写自己的.sql文件
+ $_sqlArr = explode(';', $_sqlContent);
- private function _checkPassportPasswordPreSessionTable()
- {
- $sql = "CREATE TABLE IF NOT EXISTS passportPasswordPreSession(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- userId VARCHAR(100) NOT NULL,
- preSessionId VARCHAR(100) NOT NULL,
- sitePubkPem TEXT,
- unique(userId)
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
- }
+ try {
+ $this->db->beginTransaction();
+ foreach ($_sqlArr as $sql) {
+ $this->db->exec($sql);
+ }
+ $this->db->commit();
+ } catch (Exception $e) {
+ $this->db->rollBack();
+ $this->logger->error($tag, $e);
+ throw $e;
+ }
- private function _checkPassportPasswordTokenTable()
- {
- $sql = "CREATE TABLE IF NOT EXISTS passportPasswordToken(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- loginName VARCHAR(100) NOT NULL,
- token VARCHAR(100) NOT NULL,
- timeReg BIGINT,
- UNIQUE(loginName)
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
}
-
- private function _checkSiteGroupMessagePointerTable()
+ private function _checkConfigDefaultValue($siteName, $siteHost, $Port)
{
- $sql = "CREATE TABLE IF NOT EXISTS siteGroupMessagePointer(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- groupId VARCHAR(100) NOT NULL,
- userId VARCHAR(100) NOT NULL,
- deviceId VARCHAR(100),
- clientSideType INTEGER, -- 0:无效，1:手机客户端 2:web客户端
- pointer INTEGER
- );";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
-
- $indexSql = "CREATE INDEX IF NOT EXISTS indexSiteGroupMessagePointerGud ON siteGroupMessagePointer(groupId,userId,deviceId);";
- $prepare = $this->db->prepare($indexSql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
-
- }
-
+ $loginPluginId = ZalyConfig::getConfig("loginPluginId");
+ $this->_insertSiteConfig($siteName, $loginPluginId);
- private function _checkSiteUicTable()
- {
- $sql = "CREATE TABLE IF NOT EXISTS siteUic(
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- code VARCHAR(50) unique NOT NULL,
- userId VARCHAR(100),
- status INTEGER, -- 0：无效，1：所有人可用 2：会员可用等
- createTime BIGINT,
- useTime BIGINT
- );";
+ $ownerUic = $this->uic;
+ $this->_insertSiteOwnerUic($ownerUic);
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
+ $this->initPluginMiniProgram();
- $indexSql = "CREATE INDEX IF NOT EXISTS indexSiteUicUserId ON siteUic(userId);";
- $prepare = $this->db->prepare($indexSql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
+ return;
}
-
private function _insertSiteConfig($siteName, $loginPluginId)
{
$siteConfig = SiteConfig::$siteConfig;
@@ -533,13 +343,11 @@ private function _insertSiteConfig($siteName, $loginPluginId)
$sqlStr .= "('$configKey','$configVal'),";
}
$sqlStr = trim($sqlStr, ",");
- $sql = "insert into
- siteConfig(configKey, configValue)
- values
- $sqlStr;";
- $prepare = $this->db->prepare($sql);
- $this->handelPrepareError($prepare);
- $prepare->execute();
+
+ $this->logger->info("site.install.db", "config sql=" . $sqlStr);
+
+ $sql = "insert into siteConfig(configKey, configValue) values $sqlStr;";
+ $this->db->exec($sql);
}
private function _insertSiteOwnerUic($code = "000000")
@@ -576,7 +384,7 @@ private function initPluginMiniProgram()
'logo' => "",
'sort' => 101,
'landingPageUrl' => "http://open.akaxin.com:5208/index.php?action=page.login",
- 'landingPageWithProxy' => 1, //1 表示走site代理
+ 'landingPageWithProxy' => 0, //1 表示走site代理
'usageType' => Zaly\Proto\Core\PluginUsageType::PluginUsageLogin,
'loadingType' => Zaly\Proto\Core\PluginLoadingType::PluginLoadingNewPage,
'permissionType' => Zaly\Proto\Core\PluginPermissionType::PluginPermissionAll,
@@ -644,12 +452,12 @@ private function initPluginMiniProgram()
],
];
- $this->_insertSiteLoginPlugin($miniPrograms);
+ $this->_insertSitePlugin($miniPrograms);
}
- private function _insertSiteLoginPlugin($miniPrograms)
+ private function _insertSitePlugin($miniPrograms)
{
$tag = __CLASS__ . "->" . __FUNCTION__;
$this->db->beginTransaction();
@@ -697,14 +505,13 @@ public function insertData($tableName, $data)
function handelPrepareError($prepare)
{
- $this->wpf_Logger = new Wpf_Logger();
$tag = __CLASS__ . ' - ' . __FUNCTION__;
if (!$prepare) {
$error = [
"error_code" => $this->db->errorCode(),
"error_info" => $this->db->errorInfo(),
];
- $this->wpf_Logger->error($tag, "error_msg=" . json_encode($error));
+ $this->logger->error($tag, "error_msg=" . json_encode($error));
}
}
}
\ No newline at end of file
diff --git a/src/controller/Manage/Manage_UicController.php b/src/controller/Manage/Manage_UicController.php
index ac01d020..1e869ebf 100644
--- a/src/controller/Manage/Manage_UicController.php
+++ b/src/controller/Manage/Manage_UicController.php
@@ -14,8 +14,6 @@ public function doRequest()
$page = $_GET['page'];
$params = ["lang" => $this->language];
- $this->ctx->Wpf_Logger->info("--------------", "page=" . $page);
-
switch ($page) {
case "index":
$this->toPageIndex($params);
@@ -27,8 +25,6 @@ public function doRequest()
$this->toPageIndex($params);
}
- $this->ctx->Wpf_Logger->info("--------------", json_encode($params));
-
return;
}
diff --git a/src/controller/Manage/Manage_UserController.php b/src/controller/Manage/Manage_UserController.php
index bfaf9e42..80bcd841 100644
--- a/src/controller/Manage/Manage_UserController.php
+++ b/src/controller/Manage/Manage_UserController.php
@@ -13,21 +13,33 @@ public function doRequest()
{
$params = ["lang" => $this->language];
- //get user list by page
- $offset = $_POST['offset'];
- $length = $_POST['length'];
+ $method = $_SERVER['REQUEST_METHOD'];
+ if ($method == 'POST') {
- if (!$offset) {
- $offset = 0;
- }
+ //get user list by page
+ $offset = $_POST['offset'];
+ $length = $_POST['length'];
- if (!$length) {
- $length = 50;
- }
- $params['userList'] = $this->getUserListByOffset($offset, $length);
+ } else {
+ //get user list by page
+ $offset = $_GET['offset'];
+ $length = $_GET['length'];
+
+ if (empty($offset)) {
+ $offset = 0;
+ }
+
+ if (empty($length)) {
+ $length = 50;
+ }
+
+ $params['userList'] = $this->getUserListByOffset($offset, $length);
+
+ $params['totalUserCount'] = $this->getTotalUsers();
- echo $this->display("manage_user_indexList", $params);
+ echo $this->display("manage_user_indexList", $params);
+ }
return;
}
@@ -36,4 +48,14 @@ private function getUserListByOffset($offset, $length)
return $this->ctx->SiteUserTable->getSiteUserListByOffset($offset, $length);
}
+ private function getTotalUsers()
+ {
+ $tag = __CLASS__ . "->" . __FUNCTION__;
+ try {
+ return $this->ctx->SiteUserTable->getSiteUserCount();
+ } catch (Exception $e) {
+ $this->logger->error($tag, $e);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/src/controller/Manage/MiniProgram/Manage_MiniProgram_ProfileController.php b/src/controller/Manage/MiniProgram/Manage_MiniProgram_ProfileController.php
index 760e07ad..deec1cc7 100644
--- a/src/controller/Manage/MiniProgram/Manage_MiniProgram_ProfileController.php
+++ b/src/controller/Manage/MiniProgram/Manage_MiniProgram_ProfileController.php
@@ -16,8 +16,6 @@ protected function doRequest()
$miniProgramProfile = $this->getPluginProfile($pluginId);
$miniProgramProfile['lang'] = $this->language;
- $this->ctx->Wpf_Logger->info("===============", json_encode($miniProgramProfile));
-
echo $this->display("manage_miniProgram_profile", $miniProgramProfile);
return;
}
diff --git a/src/controller/Manage/MiniProgram/Manage_MiniProgram_UpdateController.php b/src/controller/Manage/MiniProgram/Manage_MiniProgram_UpdateController.php
index 24cada2f..2dfa17c5 100644
--- a/src/controller/Manage/MiniProgram/Manage_MiniProgram_UpdateController.php
+++ b/src/controller/Manage/MiniProgram/Manage_MiniProgram_UpdateController.php
@@ -25,6 +25,10 @@ protected function doRequest()
throw new Exception("error parameters");
}
+ if ($pluginId == 100) {
+ throw new Exception("no permission");
+ }
+
if ($name == "pluginId") {
return;
}
diff --git a/src/controller/Manage/User/Manage_User_IdController.php b/src/controller/Manage/User/Manage_User_IdController.php
new file mode 100644
index 00000000..19beb164
--- /dev/null
+++ b/src/controller/Manage/User/Manage_User_IdController.php
@@ -0,0 +1,22 @@
+display("manage_user_id", $params);
+ return;
+ }
+
+}
\ No newline at end of file
diff --git a/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php b/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php
index 44312609..e56065e9 100644
--- a/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php
+++ b/src/controller/MiniProgram/Passport/MiniProgram_Passport_AccountController.php
@@ -95,7 +95,7 @@ private function sendReq($action, $url, $dataReq)
$authKey = $pluginProfile['authKey'];
$data = $this->ctx->ZalyAes->encrypt($data, $authKey);
- $result = $this->ctx->ZalyCurl->request("post", $url, $data);
+ $result = $this->ctx->ZalyCurl->request( $url, "POST", $data);
$authKey = $pluginProfile['authKey'];
$result = $this->ctx->ZalyAes->decrypt($result, $authKey);
$result = base64_decode($result);
diff --git a/src/controller/MiniProgramController.php b/src/controller/MiniProgramController.php
index d3ea163b..63f66ff2 100644
--- a/src/controller/MiniProgramController.php
+++ b/src/controller/MiniProgramController.php
@@ -157,8 +157,7 @@ public function requestDuckChatInnerApi($miniProgramId, $action, $requestProtoDa
$this->ctx->Wpf_Logger->error($action, "fihttp request url =" . $requestUrl);
- $encryptedHttpTransportResponse = $this->ctx->ZalyCurl->requestDataByAction($action, $encryptedTransportData, $requestUrl, 'POST');
-
+ $encryptedHttpTransportResponse = $this->ctx->ZalyCurl->request( $requestUrl,"POST", $encryptedTransportData);
//解密结果
$httpResponse = $this->ctx->ZalyAes->decrypt($encryptedHttpTransportResponse, $authKey);
diff --git a/src/controller/Page/Page_JsController.php b/src/controller/Page/Page_JsController.php
index b153ae68..5f0819a6 100644
--- a/src/controller/Page/Page_JsController.php
+++ b/src/controller/Page/Page_JsController.php
@@ -30,11 +30,8 @@ public function index()
if($isReqType == "proxy") {
if($userInfo) {
- error_log("page-js isReqType ==success");
echo "success";
} else {
- error_log("page-js isReqType ==fail");
-
echo "fail";
}
} else {
diff --git a/src/controller/Page/Page_LogoutController.php b/src/controller/Page/Page_LogoutController.php
index 0013040d..81f9a694 100644
--- a/src/controller/Page/Page_LogoutController.php
+++ b/src/controller/Page/Page_LogoutController.php
@@ -11,7 +11,7 @@ class Page_LogoutController extends HttpBaseController
public function index()
{
- setcookie ("zaly_site_user", "", time()-3600, "/", "", false, true);
+ setcookie ($this->siteCookieName, "", time()-3600, "/", "", false, true);
$apiPageIndex = ZalyConfig::getConfig("apiPageIndex");
header("Location:".$apiPageIndex);
exit();
diff --git a/src/lib/Util/ZalyCurl.php b/src/lib/Util/ZalyCurl.php
index f33a130a..7570856a 100644
--- a/src/lib/Util/ZalyCurl.php
+++ b/src/lib/Util/ZalyCurl.php
@@ -12,47 +12,15 @@ class ZalyCurl
protected $_bodyContent = '';
protected $timeOut = 3;///单位秒
protected $wpf_Logger;
+ protected $_delHeaders = array("host", "content-length", "connection" ,"accept-encoding", "content-encoding");
+ protected $contentEncoding = "content-encoding";
+ protected $acceptEncoding = "accept-encoding";
public function __construct()
{
$this->wpf_Logger = new Wpf_Logger();
}
- public function requestPBDataByAction($action, $transportData, $url, $method = "post")
- {
- $this->requestDataByAction($action, $transportData->serializeToString(), $url, $method);
- }
-
-
- public function requestPBJsonDataByAction($action, $transportData, $url, $method = "POST")
- {
- $this->requestDataByAction($action, $transportData->serializeToJsonString(), $url, $method);
- }
-
- public function requestDataByAction($action, $params, $url, $method)
- {
- $tag = __CLASS__ . '-' . __FUNCTION__;
- try {
- $this->_curlObj = curl_init();
- $this->_getRequestParams($params);
-// $this->_setHeader($headers);
- $this->setRequestMethod($method);
- curl_setopt($this->_curlObj, CURLOPT_URL, $url);
- curl_setopt($this->_curlObj, CURLOPT_TIMEOUT, $this->timeOut);
-
- if (($resp = curl_exec($this->_curlObj)) === false) {
- $this->wpf_Logger->error('when run Router, unexpected error :', curl_error($this->_curlObj));
- throw new Exception(curl_error($this->_curlObj));
- }
- curl_close($this->_curlObj);
- return $resp;
- } catch (\Exception $e) {
- $message = sprintf("msg:%s file:%s:%d", $e->getMessage(), $e->getFile(), $e->getLine());
- $this->wpf_Logger->error($tag, 'when run Router, unexpected error :', $message);
- throw new Exception($e->getMessage());
- }
- }
-
/**
* @param $action
* @param $requestBody
@@ -61,10 +29,12 @@ public function requestDataByAction($action, $params, $url, $method)
* @return mixed
* @throws Exception
*/
- public function requestWithActionByPb($action, $requestBody, $url, $method)
+ public function requestWithActionByPb($action, $requestBody, $url, $method, $isBase64Pb = false, $timeOut=3)
{
$tag = __CLASS__ . '-' . __FUNCTION__;
try {
+ $this->timeOut = $timeOut;
+
$anyBody = new \Google\Protobuf\Any();
$anyBody->pack($requestBody);
@@ -72,19 +42,10 @@ public function requestWithActionByPb($action, $requestBody, $url, $method)
$transportData->setAction($action);
$transportData->setBody($anyBody);
$params = $transportData->serializeToString();
-
- $this->_curlObj = curl_init();
- $this->_getRequestParams($params);
-// $this->_setHeader($headers);
- $this->setRequestMethod($method);
- curl_setopt($this->_curlObj, CURLOPT_URL, $url);
- curl_setopt($this->_curlObj, CURLOPT_TIMEOUT, $this->timeOut);
-
- if (($resp = curl_exec($this->_curlObj)) === false) {
- $this->wpf_Logger->error('when run Router, unexpected error :', curl_error($this->_curlObj));
- throw new Exception(curl_error($this->_curlObj));
+ if($isBase64Pb == true) {
+ $params = base64_encode($params);
}
- curl_close($this->_curlObj);
+ $resp = $this->_curl($url, $method, $params, []);
return $resp;
} catch (\Exception $e) {
$message = sprintf("msg:%s file:%s:%d", $e->getMessage(), $e->getFile(), $e->getLine());
@@ -106,20 +67,12 @@ public function requestWithActionByPb($action, $requestBody, $url, $method)
* @return bool|mix
* @throws Exception
*/
- public function request($method, $url, $params = [], $headers = [])
+ public function request($url, $method, $params = [], $headers = [], $timeOut = 3)
{
$tag = __CLASS__ . '-' . __FUNCTION__;
try {
- $this->_curlObj = curl_init();
- $this->_getRequestParams($params);
- $this->_setHeader($headers);
- $this->setRequestMethod($method);
- curl_setopt($this->_curlObj, CURLOPT_URL, $url);
-
- if (($resp = curl_exec($this->_curlObj)) === false) {
- $this->wpf_Logger->error($tag, 'when run Router, unexpected error :' . curl_error($this->_curlObj));
- throw new Exception(curl_error($this->_curlObj));
- }
+ $this->timeOut = $timeOut;
+ $resp = $this->_curl($url, $method, $params, $headers);
curl_close($this->_curlObj);
return $resp;
} catch (\Exception $e) {
@@ -129,7 +82,7 @@ public function request($method, $url, $params = [], $headers = [])
}
}
- public function requestAndReturnHeaders($method, $url, $params = [], $headers = [])
+ public function requestAndReturnHeaders($url, $method, $params = [], $headers = [])
{
try {
$urlParams = parse_url($url);
@@ -159,30 +112,20 @@ public function requestAndReturnHeaders($method, $url, $params = [], $headers =
$params = $transportData->serializeToString();
break;
case 'base64pb':
+ trigger_error("TO DO", E_USER_ERROR);
break;
}
}
- $this->_curlObj = curl_init();
- $this->_getRequestParams($params);
- $this->_setHeader($headers);
- $this->setRequestMethod($method);
- curl_setopt($this->_curlObj, CURLOPT_ENCODING, "gzip");
- curl_setopt($this->_curlObj, CURLOPT_URL, $url);
- curl_setopt($this->_curlObj, CURLOPT_FOLLOWLOCATION, true);
- curl_setopt($this->_curlObj, CURLOPT_MAXREDIRS, 6);
- curl_setopt($this->_curlObj, CURLOPT_HEADER, true);
-
- if (($resp = curl_exec($this->_curlObj)) === false) {
- $this->wpf_Logger->error('when run Router, unexpected error :', curl_error($this->_curlObj));
- throw new Exception(curl_error($this->_curlObj));
- }
+ $resp = $this->_curl($url, $method, $params, $headers, true);
$curl_info = curl_getinfo($this->_curlObj);
- $httpCode = curl_getinfo($this->_curlObj, CURLINFO_HTTP_CODE);
+ $httpCode = curl_getinfo($this->_curlObj, CURLINFO_HTTP_CODE);
+
curl_close($this->_curlObj);
$header_size = $curl_info['header_size'];
+
$header = substr($resp, 0, $header_size);
$body = substr($resp, $header_size);
@@ -213,71 +156,82 @@ public function requestAndReturnHeaders($method, $url, $params = [], $headers =
}
}
- public function convertUrlQuery($query)
+ private function _curl($url, $method, $params, $headers, $isReturnHeader = false)
{
- if (empty($query)) {
- return [];
+ $tag = __CLASS__. "-".__FUNCTION__;
+
+ $this->_curlObj = curl_init();
+
+ if (!empty($params)) {
+ $this->_bodyContent = $params;
+ if (is_array($params)) {
+ $this->_bodyContent = http_build_query($params, '', '&');
+ }
}
+ $newHeaders = array();
+
+ $acceptEncoding = '';
+ if(!empty($headers) ) {
+ foreach ($headers as $key => $value) {
+ $delKey = strtolower($key);
+ if($delKey == $this->acceptEncoding) {
+ $acceptEncoding = $value;
+ }
+ if(in_array($delKey, $this->_delHeaders)) {
+ continue;
+ }
+ $newHeaders[] = $key . ': ' . $value;
- $queryParts = explode('&', $query);
- $params = array();
- foreach ($queryParts as $param) {
- $item = explode('=', $param);
- $params[$item[0]] = $item[1];
+ }
+ curl_setopt($this->_curlObj, CURLOPT_HTTPHEADER, $newHeaders);
}
- return $params;
- }
- protected function setRequestMethod($method)
- {
+ curl_setopt($this->_curlObj, CURLOPT_URL, $url);
curl_setopt($this->_curlObj, CURLOPT_TIMEOUT, $this->timeOut);
+ if($acceptEncoding != "") {
+ curl_setopt($this->_curlObj, CURLOPT_ENCODING, $acceptEncoding);
+ }
+ curl_setopt($this->_curlObj, CURLOPT_FOLLOWLOCATION, true);
+ curl_setopt($this->_curlObj, CURLOPT_MAXREDIRS, 6);
+ curl_setopt($this->_curlObj, CURLOPT_RETURNTRANSFER, true);
+
switch (strtoupper($method)) {
case 'HEAD':
curl_setopt($this->_curlObj, CURLOPT_NOBODY, true);
break;
- case 'GET':
-
- //TRUE to reset the HTTP request method to GET. Since GET is the default, this is only necessary if the request method has been changed.
- curl_setopt($this->_curlObj, CURLOPT_HTTPGET, true);
- //TRUE to return the transfer as a string of the return value of curl_exec() instead of outputting it directly.
- curl_setopt($this->_curlObj, CURLOPT_RETURNTRANSFER, true);
- break;
case 'POST':
+ curl_setopt($this->_curlObj, CURLOPT_POSTFIELDS, $this->_bodyContent);
curl_setopt($this->_curlObj, CURLOPT_NOBODY, false);
curl_setopt($this->_curlObj, CURLOPT_POST, true);
- curl_setopt($this->_curlObj, CURLOPT_POSTFIELDS, $this->_bodyContent);
- curl_setopt($this->_curlObj, CURLOPT_RETURNTRANSFER, true);
break;
default:
+ ////GET
curl_setopt($this->_curlObj, CURLOPT_HTTPGET, true);
- curl_setopt($this->_curlObj, CURLOPT_RETURNTRANSFER, true);
}
- }
- protected function _getRequestParams($params)
- {
- if (empty($params)) {
- return '';
+ if($isReturnHeader == true) {
+ curl_setopt($this->_curlObj, CURLOPT_HEADER, true);
}
- $this->_bodyContent = $params;
- if (is_array($params)) {
- $this->_bodyContent = http_build_query($params, '', '&');
+
+ if (($resp = curl_exec($this->_curlObj)) === false) {
+ $this->wpf_Logger->error($tag, 'when run Router, unexpected error :' . curl_error($this->_curlObj));
+ throw new Exception(curl_error($this->_curlObj));
}
+ return $resp;
}
- protected function _setHeader($baseHeaders)
+ public function convertUrlQuery($query)
{
- $headers = array();
- if (!$baseHeaders) {
- return false;
+ if (empty($query)) {
+ return [];
}
- $delHeaders = array("host");
- foreach ($baseHeaders as $key => $value) {
- if(in_array(strtolower($key), $delHeaders)) {
- continue;
- }
- $headers[] = $key . ': ' . $value;
+
+ $queryParts = explode('&', $query);
+ $params = array();
+ foreach ($queryParts as $param) {
+ $item = explode('=', $param);
+ $params[$item[0]] = $item[1];
}
- curl_setopt($this->_curlObj, CURLOPT_HTTPHEADER, $headers);
+ return $params;
}
-}
+}
\ No newline at end of file
diff --git a/src/lib/Util/ZalyErrorBase.php b/src/lib/Util/ZalyErrorBase.php
index 1a5dce87..4c5ea0ee 100644
--- a/src/lib/Util/ZalyErrorBase.php
+++ b/src/lib/Util/ZalyErrorBase.php
@@ -53,6 +53,7 @@ abstract class ZalyErrorBase
public $errorExistEmail = "error.exist.email";
public $errorExistLoginName = "error.exist.loginName";
+ public $errorInvalidLoginName = "error.invalid.loginName";
public $errorLoginNameLength = "error.loginName.length";
public $errorPassowrdLength = "error.password.length";
public $errorNicknameLength = "error.nickname.length";
@@ -70,6 +71,8 @@ abstract class ZalyErrorBase
public $errorSessionClear = "error.session.clear";
+ public $errorInvitationCode = "error.invitation.code";
+
public $errorUpdatePasswordLoginName = "error.updatePassword.loginName";
diff --git a/src/lib/Util/ZalyErrorEn.php b/src/lib/Util/ZalyErrorEn.php
index 46e1a006..28fbbdcc 100644
--- a/src/lib/Util/ZalyErrorEn.php
+++ b/src/lib/Util/ZalyErrorEn.php
@@ -47,7 +47,7 @@ class ZalyErrorEn extends ZalyErrorBase
"error.exist.email" => "The mailbox already exists",
"error.exist.loginName" => "LoginName already exists",
"error.site.pubkPem" => "sitePubkPem is not available",
-
+ "error.invalid.loginName" => "Invalid loginName",
"error.match.login" => "Account password does not match",
"error.exist.user" => "Account does not exist",
"error.preSessionId" => "Login failed",
@@ -63,6 +63,8 @@ class ZalyErrorEn extends ZalyErrorBase
"error.updatePassword.loginName" => "LoginName unavailable",
+ "error.invitation.code" => "Invitation code is error ",
+
];
public function getErrorInfo($errorCode)
diff --git a/src/lib/Util/ZalyErrorZh.php b/src/lib/Util/ZalyErrorZh.php
index 9a83df15..3a572405 100644
--- a/src/lib/Util/ZalyErrorZh.php
+++ b/src/lib/Util/ZalyErrorZh.php
@@ -46,7 +46,8 @@ class ZalyErrorZh extends ZalyErrorBase
"error.invalid.email" => "无效邮箱",
"error.exist.email" => "邮箱已经存在",
- "error.exist.loginName" => "用户名已经存在",
+ "error.exist.loginName" => "登录名已经存在",
+ "error.invalid.loginName" => "登录名格式不正确",
"error.match.login" => "账号密码不匹配",
"error.exist.user" => "账号不存在",
@@ -66,6 +67,8 @@ class ZalyErrorZh extends ZalyErrorBase
"error.updatePassword.loginName" => "登录名不正确",
+ "error.invitation.code" => "邀请码不正确",
+
];
public function getErrorInfo($errorCode)
diff --git a/src/lib/Util/ZalyHelper.php b/src/lib/Util/ZalyHelper.php
index ca1755bb..df844e22 100644
--- a/src/lib/Util/ZalyHelper.php
+++ b/src/lib/Util/ZalyHelper.php
@@ -98,7 +98,6 @@ public function judgeOrigin()
}
-
public static function quickSortMsg($arr)
{
$len = count($arr);
@@ -150,7 +149,7 @@ public static function isPhoneNumber($phoneNumber)
public static function getFullReqUrl($reqUrl)
{
- try{
+ try {
$reqUrlStruct = parse_url($reqUrl);
if (!empty($reqUrlStruct["scheme"])) {
@@ -158,33 +157,48 @@ public static function getFullReqUrl($reqUrl)
$reqUrl = $reqUrlStruct["path"] . $query;
}
- $urlInfo = parse_url($reqUrl);
- $defaultScheme = $_SERVER['REQUEST_SCHEME'];
+ $defaultScheme = "http";
+ if ((!empty($_SERVER['REQUEST_SCHEME']) && $_SERVER['REQUEST_SCHEME'] == 'https') ||
+ (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ||
+ (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == '443')) {
+ $defaultScheme = 'https';
+ }
+
$defaultHost = $_SERVER['HTTP_HOST'];
$schema = "";
$host = "";
// 必须用scheme，防止用户多输//
- if (empty($urlInfo["scheme"]) && empty($urlInfo['host'])) {
+ if (empty($reqUrlStruct["scheme"]) && empty($reqUrlStruct['host'])) {
$schema = $defaultScheme;
$host = $defaultHost;
} else {
- $schema = $urlInfo["scheme"];
- $host = $urlInfo["host"];
- $port = empty($urlInfo["port"]) ? "" : ":{$urlInfo["port"]}";
+ $schema = $reqUrlStruct["scheme"];
+ $host = $reqUrlStruct["host"];
+ $port = empty($reqUrlStruct["port"]) ? "" : ":{$reqUrlStruct["port"]}";
$host = $host . $port;
}
- if(strpos($reqUrl, "/") == 0) {
+
+ if (strpos($reqUrl, "/") == 0) {
$fullUrl = "{$schema}://{$host}{$reqUrl}";
- } elseif(strpos($reqUrl, "./") == 0){
+ } elseif (strpos($reqUrl, "./") == 0) {
$reqUrl = str_replace("./", "/", $reqUrl);
$fullUrl = "{$schema}://{$host}{$reqUrl}";
} else {
$fullUrl = "{$schema}://{$host}/{$reqUrl}";
}
-
return $fullUrl;
- }catch (Exception $ex) {
+ } catch (Exception $ex) {
return $reqUrl;
}
}
+
+ public static function isUicNumber($str)
+ {
+ return preg_match("/^[0-9]{6,20}$/", $str);
+ }
+
+ public static function isLoginName($str)
+ {
+ return preg_match("/^[A-Za-z0-9_]+$/", $str);
+ }
}
\ No newline at end of file
diff --git a/src/lib/wpf/Wpf_Controller.php b/src/lib/wpf/Wpf_Controller.php
index a324dad4..ae3ec2e8 100644
--- a/src/lib/wpf/Wpf_Controller.php
+++ b/src/lib/wpf/Wpf_Controller.php
@@ -2,33 +2,38 @@
use \Zaly\Proto\Core\TransportDataHeaderKey;
-abstract class Wpf_Controller {
+abstract class Wpf_Controller
+{
- protected $ctx;
+ protected $ctx;
public $zalyError;
- public function __construct(Wpf_Ctx $context) {
- $this->ctx = $context;
- }
- public function doIndex()
+ public function __construct(Wpf_Ctx $context)
{
- }
+ $this->ctx = $context;
+ }
+ public function doIndex()
+ {
+ }
- public function response($data=array(), $errorCode=0, $errorInfo="") {
- $output = array(
- 'errorCode' => $errorCode,
- 'errorInfo' => $errorInfo,
- 'data' => $data
- );
- echo json_encode($output);
- }
- public function display($viewName, $params = []) {
+ public function response($data = array(), $errorCode = 0, $errorInfo = "")
+ {
+ $output = array(
+ 'errorCode' => $errorCode,
+ 'errorInfo' => $errorInfo,
+ 'data' => $data
+ );
+ echo json_encode($output);
+ }
+
+ public function display($viewName, $params = [])
+ {
// 自己实现实现一下这个方法，加载view目录下的文件
ob_start();
$fileName = str_replace("_", "/", $viewName);
- $path = dirname(dirname(__DIR__)).'/views/'.$fileName.'.php';
+ $path = dirname(dirname(__DIR__)) . '/views/' . $fileName . '.php';
if ($params) {
extract($params, EXTR_SKIP);
}
@@ -37,32 +42,47 @@ public function display($viewName, $params = []) {
return $var;
}
- final public function parseUrlParamByPattern($urlParamPattern) {
- $m = $this->ctx->Wpf_Router->parseUrlParamByPattern($urlParamPattern);
- $_REQUEST = array_merge($_REQUEST, $m);
- }
+ final public function parseUrlParamByPattern($urlParamPattern)
+ {
+ $m = $this->ctx->Wpf_Router->parseUrlParamByPattern($urlParamPattern);
+ $_REQUEST = array_merge($_REQUEST, $m);
+ }
- public function getParam($key) {
- return isset($_REQUEST[$key]) ? $_REQUEST[$key] : null;
- }
+ public function getParam($key)
+ {
+ return isset($_REQUEST[$key]) ? $_REQUEST[$key] : null;
+ }
public function checkDBIsExist()
{
- $sqliteInfo = ZalyConfig::getConfig("sqlite");
- $sqliteName = $sqliteInfo['sqliteDBName'];
- if(empty($sqliteName)) {
- return false;
+ $dbType = ZalyConfig::getConfig("dbType");
+
+ if (empty($dbType)) {
+ $dbType = "sqlite";
}
- $sqliteName = dirname(__FILE__).'/../../'.$sqliteName;
- if(file_exists($sqliteName)) {
- return true;
+ switch ($dbType) {
+ case "sqlite":
+ $sqliteInfo = ZalyConfig::getConfig("sqlite");
+ $sqliteName = $sqliteInfo['sqliteDBName'];
+ if (empty($sqliteName)) {
+ return false;
+ }
+ $sqliteName = dirname(__FILE__) . '/../../' . $sqliteName;
+ if (file_exists($sqliteName)) {
+ return true;
+ }
+
+ break;
+ case "mysql":
+ return true;
+
}
return false;
}
- public function setCookieBase64($val, $cookieName)
+ public function setCookie($val, $cookieName)
{
setcookie($cookieName, $val, time() + $this->sessionIdTimeOut, "/", "", false, true);
}
diff --git a/src/model/BaseCtx.php b/src/model/BaseCtx.php
index 6c3f1d08..683a7bd2 100644
--- a/src/model/BaseCtx.php
+++ b/src/model/BaseCtx.php
@@ -41,39 +41,73 @@
*/
class BaseCtx extends Wpf_Ctx
{
- public $db;
+ private $logger;
+ public $dbType;
private $_dbName = "openzalySiteDB.sqlite3";
private $_dbPath = ".";
- private $_dbSqlFile = "./database-sql/site.sql";
- public $dbVersion = 1;
- private $dbName = "openzalySiteDB";
- private $dbUser = "root";
- private $dbPwd = "root";
- private $dbHost = "127.0.0.1";
- private $dbType = "sqlite";
- private $suffix = ".sqlite3";
+
+ public $db;
public function __construct()
{
- $this->checkDBExists();
+ $this->logger = new Wpf_Logger();
+ $this->loadDatabase();
}
- private function checkDBExists()
+ // 加载数据库
+ private function loadDatabase()
{
- $sqliteConfig = ZalyConfig::getConfig("sqlite");
- $this->_dbName = $sqliteConfig['sqliteDBName'];
- if (!empty($this->_dbName) && file_exists(dirname(__FILE__) . "/../" . $this->_dbName)) {
+ $this->dbType = ZalyConfig::getConfig("dbType");
+ try {
+ if (empty($this->dbType)) {
+ $this->dbType = "sqlite";
+ }
switch ($this->dbType) {
case "sqlite":
+ $sqliteConfig = ZalyConfig::getConfig("sqlite");
+ $this->_dbName = $sqliteConfig['sqliteDBName'];
+
+ if (empty($this->_dbName) || !file_exists(dirname(__FILE__) . "/../" . $this->_dbName)) {
+ throw new Exception("sqlite db file is not exist");
+ }
+
$dbInfo = $this->_dbPath . "/" . $this->_dbName;
$this->db = new \PDO("sqlite:{$dbInfo}");
break;
case "mysql":
- $dsn = "mysql:dbname=$this->dbName;host=$this->dbHost";
- $this->db = new \PDO($dsn, $this->dbUser, $this->dbPwd);
+ $mysqlConfig = ZalyConfig::getConfig("mysql");
+ $dbName = $mysqlConfig['dbName'];
+ $dbHost = $mysqlConfig['dbHost'];
+ $dbPort = $mysqlConfig['dbPort'];
+ $dbUserName = $mysqlConfig['dbUserName'];
+ $dbPwssword = $mysqlConfig['dbPassword'];
+ $dbDsn = "mysql:host=$dbHost;port=$dbPort;dbname=$dbName;";
+ $options = array(
+ PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+ PDO::ATTR_PERSISTENT => true,
+ );
+ try{
+ $this->db = new \PDO($dbDsn, $dbUserName, $dbPwssword, $options);//创建一个pdo对象
+ } catch (Exception $ex) {
+ throw new Exception($ex->getMessage());
+ }
+
break;
}
+ } catch (Exception $e) {
+ $this->logger->error("BaseCtx", $e);
}
+
+ }
+
+ public function getLogger()
+ {
+ return $this->logger;
+ }
+
+ public function isMysqlDB()
+ {
+ return isset($this->dbTypeb) && $this->dbType == "mysql";
}
}
diff --git a/src/model/BaseTable.php b/src/model/BaseTable.php
index 4fca2a3a..7db329b0 100644
--- a/src/model/BaseTable.php
+++ b/src/model/BaseTable.php
@@ -8,23 +8,55 @@
class BaseTable
{
+
+ /**
+ * @var BaseCtx
+ */
+ public $ctx;
+
/**
* @var \PDO
*/
public $db;
+
/**
- * @var BaseCtx
+ * @var \PDO
*/
- public $ctx;
+ public $dbSlave;
- public function __construct(Wpf_Ctx $context)
+ public function __construct(BaseCtx $context)
{
$this->ctx = $context;
$this->db = $this->ctx->db;
+ $this->dbSlave = $this->ctx->db;
+ if ($context->isMysqlDB()) {
+ $this->initSlaveDb();
+ }
$this->init();
}
+ public function initSlaveDb()
+ {
+ $mysqlSlaveArr = ZalyConfig::getConfig("mysqlSlave");
+ if (!empty($mysqlSlaveArr)) {
+ $slaveDbName = array_rand($mysqlSlaveArr, 1);
+ $slaveConfig = $mysqlSlaveArr[$slaveDbName];
+
+ $dbName = $slaveConfig['dbName'];
+ $dbHost = $slaveConfig['dbHost'];
+ $dbPort = $slaveConfig['dbPort'];
+ $dbUserName = $slaveConfig['dbUserName'];
+ $dbPwssword = $slaveConfig['dbPassword'];
+ $dbDsn = "mysql:host=$dbHost;port=$dbPort;dbname=$dbName;";
+ $options = array(
+ PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+ PDO::ATTR_PERSISTENT => true,
+ );
+ $this->dbSlave = new PDO($dbDsn, $dbUserName, $dbPwssword, $options);//创建一个pdo对象
+ }
+ }
+
public function init()
{
diff --git a/src/model/DB/DB_Mysql.php b/src/model/DB/DB_Mysql.php
new file mode 100644
index 00000000..dddae530
--- /dev/null
+++ b/src/model/DB/DB_Mysql.php
@@ -0,0 +1,122 @@
+db = new PDO("mysql:host=$host;dbname=$dbName;", $userName, $passwd);//创建一个pdo对象
+ }
+
+
+ public function checkDBAndTable()
+ {
+ $this->_checkDBTables();
+ }
+
+ private function _checkDBTables()
+ {
+ $this->_checkPlatformUserTable();
+ $this->_checkPlatformSessionTable();
+ $this->_checkPlatformSiteTable();
+ $this->_checkPlatformUserDeviceTable();
+ }
+
+
+ // platform user
+ private function _checkPlatformUserTable()
+ {
+ $sql = 'CREATE TABLE if Not EXISTS platformUser (
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ userId VARCHAR(100) not null,
+ phoneNumber VARCHAR(11) not null ,/* comment "用户手机号"*/
+ phoneCountryCode VARCHAR(10) not null default \'86\',
+ loginName VARCHAR(100) not null,
+ timeReg BIGINT ,/*comment "创建时间"*/
+ UNIQUE (userId),
+ UNIQUE (phoneNumber),
+ UNIQUE (loginName)
+ );';
+
+ $prepare = $this->db->prepare($sql);
+ $prepare->execute();
+
+ echo "check table platformUser table finish ";
+ }
+
+ // platform session
+ private function _checkPlatformSessionTable()
+ {
+ $sql = 'create table if not EXISTS platformSession (
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ userId INTEGER not null ,
+ sessionId VARCHAR(100) not null,/*平台session*/
+ sitePubkBase64 TEXT not null,
+ createTime Long ,/*comment "创建时间"*/
+ UNIQUE (userId, sessionId)
+ );';
+ $prepare = $this->db->prepare($sql);
+ $prepare->execute();
+ echo "check table platformSession table finish ";
+ }
+
+ private function _checkPlatformSiteTable()
+ {
+ $sql = "create table if not EXISTS platformSite (
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ siteId VARCHAR(100) not null ,
+ sitePubkPem TEXT not null,/*平台session*/
+ siteAddress VARCHAR(100),
+ siteName VARCHAR(100),
+ siteLogo TEXT ,
+ status INTEGER, -- 0:关闭 1：普通站点 2:推荐站点 3：官方站点
+ updateTime BIGINT , -- 更新时间
+ UNIQUE (siteId)
+ );";
+
+ $prepare = $this->db->prepare($sql);
+ $prepare->execute();
+
+ echo "check table platformSite table finish ";
+ }
+
+ private function _checkPlatformUserDeviceTable()
+ {
+ $sql = "create table if not EXISTS platformUserDevice (
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ siteId VARCHAR(100) not null,/*平台session*/
+ siteUserId VARCHAR(100), -- null 只会影响静音
+ deviceId VARCHAR(100) not null,
+ devicePubkPem text not null,
+ siteAddress VARCHAR(50),
+ siteName VARCHAR(50),
+ pushToken VARCHAR(100),
+ pushTokenType INTEGER, -- push os type /android/IOS/xiaomi/huawei/umeng
+ pushMark VARCHAR(50), -- siteUserToken + pushToken + pushTokenType -> pushMark
+ mute boolean, -- pushToken 是否可用
+ lang INTEGER, -- 0:en 1:zh
+ updateTime BIGINT,
+ UNIQUE (siteId,deviceId,pushToken),
+ INDEX (siteId,siteUserId)
+ );";
+
+ $prepare = $this->db->prepare($sql);
+ $prepare->execute();
+
+ echo "check table platformUserDevice table finish ";
+ }
+
+
+}
\ No newline at end of file
diff --git a/src/model/Message/Message_Client.php b/src/model/Message/Message_Client.php
index 99a6782e..6ac47fe9 100644
--- a/src/model/Message/Message_Client.php
+++ b/src/model/Message/Message_Client.php
@@ -46,9 +46,12 @@ public function sendU2Message($msgId, $userId, $fromUserId, $toUserId, $msgType,
case \Zaly\Proto\Core\MessageType::MessageText:
$text = $message->getText();
$textBody = $text->getBody();
- //# TODO limit body length 2KB = 2048 Byte
$textBody = substr($textBody, 0, 2048);
- $text->setBody($textBody);
+ $trimBody = trim($textBody);
+ if (empty($trimBody)) {
+ return false;
+ }
+ $text->setBody($trimBody);
$result = $this->saveU2Message($msgId, $userId, $fromUserId, $toUserId, $msgType, $text, $roomType);
break;
case \Zaly\Proto\Core\MessageType::MessageImage:
@@ -113,9 +116,12 @@ public function sendGroupMessage($msgId, $fromUserId, $groupId, $msgType, $messa
case \Zaly\Proto\Core\MessageType::MessageText:
$text = $message->getText();
$textBody = $text->getBody();
- //# TODO limit body length 2KB = 2048 Byte
$textBody = substr($textBody, 0, 2048);
- $text->setBody(trim($textBody));
+ $trimBody = trim($textBody);
+ if (empty($trimBody)) {
+ return false;
+ }
+ $text->setBody($trimBody);
$result = $this->saveGroupMessage($msgId, $fromUserId, $groupId, $msgType, $text);
break;
case \Zaly\Proto\Core\MessageType::MessageImage:
diff --git a/src/model/Push/Push_Client.php b/src/model/Push/Push_Client.php
index 853cab56..c883f038 100644
--- a/src/model/Push/Push_Client.php
+++ b/src/model/Push/Push_Client.php
@@ -31,6 +31,8 @@ public function sendNotification($roomType, $msgType, $fromUserId, $toId, $pushT
$pushRequest = new \Zaly\Proto\Platform\ApiPushNotificationRequest();
try {
+// $this->ctx->Wpf_Logger->info("api.push.notification", "pushText=" . $pushText);
+
$siteConfig = $this->getSiteConfig();
$pushType = $siteConfig[SiteConfig::SITE_SUPPORT_PUSH_TYPE];
@@ -78,15 +80,16 @@ public function sendNotification($roomType, $msgType, $fromUserId, $toId, $pushT
$pushBody->setToDevicePubkPemIds($deviceIds);
$pushRequest->setPushBody($pushBody);
- $this->ctx->Wpf_Logger->info("api.push.notification", "request=" . $pushRequest->serializeToJsonString());
+// $this->ctx->Wpf_Logger->info("api.push.notification", "request=" . $pushRequest->serializeToJsonString());
} catch (Exception $e) {
- $this->ctx->Wpf_Logger->error("api.push.notification.build.payload", $e);
+ $this->ctx->Wpf_Logger->error("api.push.notification.payload", $e);
+ return;
}
try {
$pushURL = "http://open.akaxin.com:5208/?action=" . $this->pushAction . "&body_format=pb";
- $this->ctx->ZalyCurl->requestWithActionByPb($this->pushAction, $pushRequest, $pushURL, 'post');
+ $this->ctx->ZalyCurl->requestWithActionByPb($this->pushAction, $pushRequest, $pushURL, 'POST');
$this->ctx->Wpf_Logger->info("api.push.notification.response", "roomType=" . $pushRequest->serializeToJsonString());
} catch (Exception $e) {
$this->ctx->Wpf_Logger->error("api.push.notification.error", $e);
@@ -129,15 +132,9 @@ private function getPushDeviceIdList($roomType, $fromUserId, $toId)
$deviceIdList = [];
if (\Zaly\Proto\Core\MessageRoomType::MessageRoomU2 == $roomType) {
-
- $this->ctx->Wpf_Logger->info("api.push.notification", "userId=" . $toId);
- // u2
- $pushDeviceId = $this->getUserDeviceId($toId);
-
- $this->ctx->Wpf_Logger->info("api.push.notification", "u2 deviceId=" . $pushDeviceId);
-
- if (isset($pushDeviceId)) {
- $deviceIdList[] = $pushDeviceId;
+ //get user deviceIds without muted
+ if (!$this->isUserFriendMute($toId, $fromUserId)) {
+ $deviceIdList = $this->getUserDeviceIds($toId);
}
} else {
@@ -154,13 +151,19 @@ private function getPushDeviceIdList($roomType, $fromUserId, $toId)
continue;
}
- $pushDeviceId = $this->getUserDeviceId($toUserId);
+ if ($this->isUserGroupMute($toId, $toUserId)) {
+ continue;
+ }
- if (!empty($pushDeviceId)) {
- $deviceIdList[] = $pushDeviceId;
+ $pushDeviceIds = $this->getUserDeviceIds($toUserId);
+
+ if (!empty($pushDeviceIds)) {
+ $deviceIdList = array_merge($deviceIdList, $pushDeviceIds);
}
}
}
+
+// $this->ctx->Wpf_Logger->info("api.push.notification", "group DeviceIds=" . json_encode($deviceIdList));
} catch (Exception $e) {
$this->ctx->Wpf_Logger->error($tag, $e);
}
@@ -174,27 +177,46 @@ private function getPushDeviceIdList($roomType, $fromUserId, $toId)
* @param $userId
* @return null|\Zaly\Proto\Platform\PushTo
*/
- private function getUserDeviceId($userId)
+ private function getUserDeviceIds($userId)
{
$tag = __CLASS__ . "->" . __FUNCTION__;
try {
- return $this->ctx->SiteSessionTable->getUserLatestDeviceId($userId);
+ $deviceIds = $this->ctx->SiteSessionTable->getUserLatestDeviceId($userId, 2);
+
+ if (!empty($deviceIds)) {
+ $deviceList = [];
+ foreach ($deviceIds as $deviceId) {
+ $deviceList[] = $deviceId['deviceId'];
+ }
+ return $deviceList;
+ }
} catch (Exception $e) {
$this->ctx->Wpf_Logger->error($tag, $e);
}
return null;
}
- private function curl($url, $body)
+ private function isUserFriendMute($userId, $friendUserId)
{
- $ch = curl_init($url);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($ch, CURLOPT_POST, true);
- curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
-
- $ret = curl_exec($ch);
- curl_close($ch);
- return $ret;
+ $mute = $this->ctx->SiteUserFriendTable->queryUserFriendMute($userId, $friendUserId);
+
+ if (isset($mute) && $mute == 1) {
+ return true;
+ }
+
+ return false;
+ }
+
+
+ private function isUserGroupMute($groupId, $userId)
+ {
+ $isMute = $this->ctx->SiteGroupUserTable->getGroupUserMute($groupId, $userId);
+
+ if (isset($isMute) && $isMute == 1) {
+ return true;
+ }
+
+ return false;
}
}
\ No newline at end of file
diff --git a/src/model/Site/Site_Login.php b/src/model/Site/Site_Login.php
index bab8bce1..4d4e5400 100644
--- a/src/model/Site/Site_Login.php
+++ b/src/model/Site/Site_Login.php
@@ -12,6 +12,7 @@ class Site_Login
private $zalyError;
private $sessionVerifyAction = "api.session.verify";
private $pinyin;
+ private $timeOut = 10;
public function __construct(BaseCtx $ctx)
{
@@ -34,7 +35,7 @@ public function __construct(BaseCtx $ctx)
* @return array
* @throws Exception
*/
- public function checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem = "", $clientSideType = 1)
+ public function checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem = "", $clientSideType = Zaly\Proto\Core\UserClientType::UserClientMobileApp)
{
try {
@@ -56,7 +57,7 @@ public function checkPreSessionIdFromPlatform($preSessionId, $devicePubkPem = ""
} catch (Exception $ex) {
$tag = __CLASS__ . "-" . __FUNCTION__;
$this->ctx->Wpf_Logger->error($tag, " errorMsg = " . $ex->getMessage());
- throw new Exception($ex);
+ throw new Exception($ex->getMessage());
}
}
@@ -83,23 +84,13 @@ private function getUserProfileFromPlatform($preSessionId, $sitePrikPem)
$sessionVerifyRequest = new \Zaly\Proto\Platform\ApiSessionVerifyRequest();
$sessionVerifyRequest->setPreSessionId($preSessionId);
- $anyBody = new \Google\Protobuf\Any();
- $anyBody->pack($sessionVerifyRequest);
-
- $transportData = new \Zaly\Proto\Core\TransportData();
- $transportData->setBody($anyBody);
- $transportData->setAction($this->sessionVerifyAction);
- $data = $transportData->serializeToString();
- $data = base64_encode($data);
-
$pluginIds = $this->ctx->SiteConfigTable->selectSiteConfig(SiteConfig::SITE_LOGIN_PLUGIN_ID);
$pluginId = $pluginIds[SiteConfig::SITE_LOGIN_PLUGIN_ID];
$sessionVerifyUrl = ZalyConfig::getSessionVerifyUrl($pluginId);
$sessionVerifyUrl = ZalyHelper::getFullReqUrl($sessionVerifyUrl);
- $result = $this->ctx->ZalyCurl->request("post", $sessionVerifyUrl, $data);
+ $result = $this->ctx->ZalyCurl->requestWithActionByPb($this->sessionVerifyAction, $sessionVerifyRequest, $sessionVerifyUrl, "POST", true, $this->timeOut);
$result = base64_decode($result);
-
//解析数据
$transportData = new \Zaly\Proto\Core\TransportData();
$transportData->mergeFromString($result);
@@ -230,7 +221,9 @@ private function verifyUicAndRealName($userId, $phoneNumber, $uicInfo)
if ($config[SiteConfig::SITE_ENABLE_INVITATION_CODE]) {
if (empty($uicInfo) || $uicInfo['status'] == 0 || $uicInfo['userId']) {
- throw new Exception("invitation code is error");
+ $errorCode = $this->zalyError->errorInvitationCode;
+ $errorInfo = $this->zalyError->getErrorInfo($errorCode);
+ throw new Exception($errorInfo);
}
//update uic used
@@ -285,8 +278,8 @@ private function insertOrUpdateUserSession($userProfile, $devicePubkPem, $client
"ipWhenCreated" => "",
"timeActive" => $this->ctx->ZalyHelper->getMsectime(),
"ipActive" => "",
- "userAgent" => "",
- "userAgentType" => "",
+// "userAgent" => "",
+// "userAgentType" => "",
"clientSideType" => $clientSideType,
];
$this->ctx->SiteSessionTable->insertSessionInfo($sessionInfo);
@@ -296,8 +289,9 @@ private function insertOrUpdateUserSession($userProfile, $devicePubkPem, $client
"sessionId" => $sessionId,
"timeActive" => $this->ctx->ZalyHelper->getMsectime(),
"ipActive" => "",
- "userAgent" => "",
- "userAgentType" => "",
+// "userAgent" => "",
+// "userAgentType" => "",
+ "clientSideType" => $clientSideType,
];
$where = [
"userId" => $userId,
diff --git a/src/model/SiteConfigTable.php b/src/model/SiteConfigTable.php
index ed489b48..9bea738e 100644
--- a/src/model/SiteConfigTable.php
+++ b/src/model/SiteConfigTable.php
@@ -74,7 +74,7 @@ public function selectSiteConfig($configKey = false)
$configKeyStr = implode("','", $configKey);
$sql = "select $this->columns from $this->table where configKey in ('$configKeyStr');";
}
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
if ($configKey !== false && is_string($configKey)) {
$prepare->bindValue("configKey", $configKey);
diff --git a/src/model/SiteFriendApplyTable.php b/src/model/SiteFriendApplyTable.php
index 6f502049..f51612dc 100644
--- a/src/model/SiteFriendApplyTable.php
+++ b/src/model/SiteFriendApplyTable.php
@@ -77,7 +77,7 @@ public function getDataByWhere($where, $limit = 0, $offset = 1)
}
$whereStr = trim($whereStr, "and");
$sql = "select $this->selectColumns from $this->table where $whereStr limit :limit, :offset";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
foreach ($where as $key => $val) {
$prepare->bindValue(":$key", $val);
@@ -107,7 +107,7 @@ public function getApplyData($userId, $applyUserId)
where
userId=:userId and friendId=:friendId order by applyTime desc limit 1;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
@@ -144,13 +144,12 @@ public function getApplyList($friendId, $offset, $limit)
order BY
siteFriendApply.applyTime DESC
limit
- :offset, :limit;
- ";
- $prepare = $this->db->prepare($sql);
+ :offset, :limit;";
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":friendId", $friendId);
- $prepare->bindValue(":offset", $offset);
- $prepare->bindValue(":limit", $limit);
+ $prepare->bindValue(":offset", $offset, PDO::PARAM_INT);
+ $prepare->bindValue(":limit", $limit, PDO::PARAM_INT);
$prepare->execute();
$results = $prepare->fetchAll(\PDO::FETCH_ASSOC);
$this->ctx->Wpf_Logger->dbLog($tag, $sql, [$friendId, $offset, $limit], "", "");
@@ -174,7 +173,7 @@ public function getApplyListCount($friendId)
where
siteFriendApply.friendId = :friendId
";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":friendId", $friendId);
$prepare->execute();
diff --git a/src/model/SiteGroupMessageTable.php b/src/model/SiteGroupMessageTable.php
index 0aa05f4a..47048cbd 100644
--- a/src/model/SiteGroupMessageTable.php
+++ b/src/model/SiteGroupMessageTable.php
@@ -52,8 +52,8 @@ public function queryMessage($groupId, $offset, $limitCount)
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
- $prepare->bindValue(":offset", $offset);
- $prepare->bindValue(":limitCount", $limitCount);
+ $prepare->bindValue(":offset", $offset, PDO::PARAM_INT);
+ $prepare->bindValue(":limitCount", $limitCount, PDO::PARAM_INT);
$prepare->execute();
return $prepare->fetchAll(\PDO::FETCH_ASSOC);
} finally {
diff --git a/src/model/SiteGroupTable.php b/src/model/SiteGroupTable.php
index 440de559..540e55b9 100644
--- a/src/model/SiteGroupTable.php
+++ b/src/model/SiteGroupTable.php
@@ -83,7 +83,7 @@ public function getGroupInfo($groupId)
$tag = __CLASS__ . "-" . __FUNCTION__;
$startTime = microtime(true);
$sql = "select $this->selectColumns from $this->table where groupId=:groupId";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
$prepare->execute();
@@ -104,7 +104,7 @@ public function getGroupListByGroupIds(array $groupIdList)
$groupIdStr = implode("','", $groupIdList);
$sql = "select $this->selectColumns from $this->table where groupId in ('$groupIdStr')";
try {
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->execute();
$result = $prepare->fetchAll(\PDO::FETCH_ASSOC);
@@ -123,7 +123,7 @@ public function getGroupName($groupId)
$startTime = microtime(true);
$sql = "select name from $this->table where groupId=:groupId";
try {
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
$flag = $prepare->execute();
@@ -162,7 +162,7 @@ public function getGroupCount($userId)
and
siteGroup.status>0
;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
@@ -221,7 +221,7 @@ public function getGroupList($userId, $offset, $pageSize)
;
";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
@@ -238,7 +238,7 @@ public function getSiteGroupListByOffset($offset, $pageSize)
$sql = "select $this->selectColumns from $this->table ORDER BY id ASC limit $offset,$pageSize;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->execute();
@@ -288,7 +288,7 @@ public function getGroupProfile($groupId, $userId)
limit 1
";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
$prepare->bindValue(":userId", $userId);
@@ -336,7 +336,7 @@ public function getUserWidgetGroupProfile($userId, $groupId)
siteGroupUser.userId = :userId
limit 1
";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
$prepare->bindValue(":groupId", $groupId);
@@ -373,7 +373,7 @@ public function getWidgetGroupProfile($groupId)
siteGroup.groupId=:groupId
limit 1
";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$prepare->bindValue(":groupId", $groupId);
$this->handlePrepareError($tag, $prepare);
diff --git a/src/model/SiteGroupUserTable.php b/src/model/SiteGroupUserTable.php
index 98053b87..f297e66c 100644
--- a/src/model/SiteGroupUserTable.php
+++ b/src/model/SiteGroupUserTable.php
@@ -72,7 +72,7 @@ public function getGroupUser($groupId, $userId, $memberType = false)
if ($memberType !== false) {
$sql .= " and memberType=:memberType";
}
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
@@ -124,7 +124,7 @@ public function getGroupUsers($groupId, $userIds, $memberType = false)
if ($memberType !== false) {
$sql .= " and memberType=:memberType";
}
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
if ($memberType !== false) {
@@ -176,12 +176,12 @@ public function getGroupUserList($groupId, $offset, $pageSize, $memberType = fal
$sql .= " order by siteGroupUser.timeJoin ASC limit :offset, :pageSize;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
- $prepare->bindValue(":offset", $offset);
- $prepare->bindValue(":pageSize", $pageSize);
+ $prepare->bindValue(":offset", $offset, PDO::PARAM_INT);
+ $prepare->bindValue(":pageSize", $pageSize, PDO::PARAM_INT);
if ($memberType) {
$prepare->bindValue(":memberType", $memberType);
@@ -190,8 +190,6 @@ public function getGroupUserList($groupId, $offset, $pageSize, $memberType = fal
$prepare->execute();
$results = $prepare->fetchAll(\PDO::FETCH_ASSOC);
-// $this->ctx->Wpf_Logger->info("============", "result=" . json_encode($results));
-
$this->ctx->Wpf_Logger->writeSqlLog($tag, $sql, [$groupId, $offset, $pageSize, $memberType], $startTime);
return $results;
}
@@ -212,13 +210,13 @@ public function getGroupAdmin($groupId, $userId, $adminType, $ownerType)
$startTime = microtime(true);
$sql = "select $this->selectColumns from $this->table where groupId=:groupId and userId=:userId";
$sql .= " and (memberType=:adminType or memberType=:ownerType)";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
$prepare->bindValue(":userId", $userId);
- $prepare->bindValue(":adminType", $adminType);
- $prepare->bindValue(":ownerType", $ownerType);
+ $prepare->bindValue(":adminType", $adminType, PDO::PARAM_INT);
+ $prepare->bindValue(":ownerType", $ownerType, PDO::PARAM_INT);
$prepare->execute();
$results = $prepare->fetch(\PDO::FETCH_ASSOC);
$this->ctx->Wpf_Logger->writeSqlLog($tag, $sql, $groupId, $startTime);
@@ -259,12 +257,12 @@ public function getGroupAllAdmin($groupId, $adminType, $ownerType)
(memberType=:adminType or memberType=:ownerType)";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
- $prepare->bindValue(":adminType", $adminType);
- $prepare->bindValue(":ownerType", $ownerType);
+ $prepare->bindValue(":adminType", $adminType, PDO::PARAM_INT);
+ $prepare->bindValue(":ownerType", $ownerType, PDO::PARAM_INT);
$prepare->execute();
$this->ctx->Wpf_Logger->writeSqlLog($tag, $sql, $groupId, $startTime);
return $prepare->fetchAll(\PDO::FETCH_ASSOC);
@@ -278,16 +276,20 @@ public function getGroupAllAdmin($groupId, $adminType, $ownerType)
* @return array
* @throws Exception
*/
- public function getGroupUserByMemberType($groupId, $memberType = false)
+ public function getGroupUserByMemberType($groupId, $memberType = false , $columns=[])
{
$tag = __CLASS__ . '-' . __FUNCTION__;
$startTime = microtime(true);
-
- $sql = "select $this->selectColumns from $this->table where groupId=:groupId and memberType=:memberType";
- $prepare = $this->db->prepare($sql);
+ if(!$columns) {
+ $columns = $this->selectColumns;
+ } else {
+ $columns = implode(",", $columns);
+ }
+ $sql = "select $columns from $this->table where groupId=:groupId and memberType=:memberType";
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
- $prepare->bindValue(":memberType", $memberType);
+ $prepare->bindValue(":memberType", $memberType, PDO::PARAM_INT);
$prepare->execute();
$results = $prepare->fetchAll(\PDO::FETCH_ASSOC);
$this->ctx->Wpf_Logger->writeSqlLog($tag, $sql, $groupId, $startTime);
@@ -306,7 +308,7 @@ public function getGroupAllUser($groupId)
$startTime = microtime(true);
$sql = "select $this->selectColumns from $this->table where groupId=:groupId";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
@@ -328,7 +330,7 @@ public function getGroupAllMembersId($groupId)
$tag = __CLASS__ . "." . __FUNCTION__;
try {
$sql = "select userId from $this->table where groupId=:groupId";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
@@ -344,6 +346,7 @@ public function getGroupAllMembersId($groupId)
* 得到群的总成员数目
* @param $groupId
* @return mixed
+ * @throws Exception
*/
public function getGroupUserCount($groupId)
@@ -351,7 +354,7 @@ public function getGroupUserCount($groupId)
$startTime = microtime(true);
$tag = __CLASS__ . "." . __FUNCTION__;
$sql = "select count(id) as `count` from $this->table where groupId=:groupId";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
$prepare->execute();
@@ -360,6 +363,20 @@ public function getGroupUserCount($groupId)
return $result;
}
+ public function getGroupUserMute($groupId, $userId)
+ {
+ $startTime = microtime(true);
+ $tag = __CLASS__ . "." . __FUNCTION__;
+ $sql = "select isMute from $this->table where groupId=:groupId and userId=:userId;";
+ $prepare = $this->dbSlave->prepare($sql);
+ $this->handlePrepareError($tag, $prepare);
+ $prepare->bindValue(":groupId", $groupId);
+ $prepare->bindValue(":userId", $userId);
+ $prepare->execute();
+ $result = $prepare->fetchColumn(0);
+ $this->ctx->Wpf_Logger->writeSqlLog($tag, $sql, $groupId, $startTime);
+ return $result;
+ }
public function getUserGroups($userId)
{
@@ -367,7 +384,7 @@ public function getUserGroups($userId)
$tag = __CLASS__ . "->" . __FUNCTION__;
try {
$sql = "select groupId from $this->table where userId=:userId;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
$prepare->execute();
@@ -385,6 +402,7 @@ public function getUserGroups($userId)
* @param $userIds
* @param $groupId
* @return array|bool
+ * @throws Exception
*/
public function getUserIdExistInGroup($userIds, $groupId)
@@ -394,7 +412,7 @@ public function getUserIdExistInGroup($userIds, $groupId)
$userIdStr = implode("','", $userIds);
$sql = "select userId from $this->table where groupId=:groupId and userId in ('$userIdStr');";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
$prepare->execute();
@@ -412,7 +430,7 @@ public function getUserIdExistInGroup($userIds, $groupId)
* @param $userIds
* @param $groupId
* @return bool
- *
+ * @throws Exception
*/
public function removeMemberFromGroup($userIds, $groupId)
{
@@ -473,14 +491,14 @@ public function updateAllMemberRoleToNomal($groupId, $nomalMemberType, $ownerMem
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":memberType", $nomalMemberType);
$prepare->bindValue(":groupId", $groupId);
- $prepare->bindValue(":ownerMemberType", $ownerMemberType);
+ $prepare->bindValue(":ownerMemberType", $ownerMemberType, PDO::PARAM_INT);
$flag = $prepare->execute();
$params = " groupId =$groupId memberType =$nomalMemberType ownerMemberType = $ownerMemberType ";
$this->ctx->Wpf_Logger->writeSqlLog($tag, $sql, $params, $startTime);
if ($flag) {
return true;
}
- return false;
+ throw new Exception("updateAllMemberRoleToNomal operation failed");
}
private function updateRole($userIds, $groupId, $memberType)
@@ -501,6 +519,6 @@ private function updateRole($userIds, $groupId, $memberType)
if ($flag) {
return true;
}
- return false;
+ throw new Exception("updateRole operation failed");
}
}
\ No newline at end of file
diff --git a/src/model/SitePluginTable.php b/src/model/SitePluginTable.php
index 33d8dcca..d6036a0f 100644
--- a/src/model/SitePluginTable.php
+++ b/src/model/SitePluginTable.php
@@ -65,15 +65,15 @@ public function insertMiniProgram($miniProgramProfile)
try {
$prepare = $this->db->prepare($sql);
$this->handlePrepareError($tag, $prepare);
- $prepare->bindValue(":pluginId", $miniProgramProfile["pluginId"]);
+ $prepare->bindValue(":pluginId", $miniProgramProfile["pluginId"], PDO::PARAM_INT);
$prepare->bindValue(":name", $miniProgramProfile["name"]);
$prepare->bindValue(":logo", $miniProgramProfile["logo"]);
- $prepare->bindValue(":sort", $miniProgramProfile["sort"]);
+ $prepare->bindValue(":sort", $miniProgramProfile["sort"], PDO::PARAM_INT);
$prepare->bindValue(":landingPageUrl", $miniProgramProfile["landingPageUrl"]);
- $prepare->bindValue(":landingPageWithProxy", $miniProgramProfile["landingPageWithProxy"]);
- $prepare->bindValue(":usageType", $miniProgramProfile["usageType"]);
- $prepare->bindValue(":loadingType", $miniProgramProfile["loadingType"]);
- $prepare->bindValue(":permissionType", $miniProgramProfile["permissionType"]);
+ $prepare->bindValue(":landingPageWithProxy", $miniProgramProfile["landingPageWithProxy"], PDO::PARAM_INT);
+ $prepare->bindValue(":usageType", $miniProgramProfile["usageType"], PDO::PARAM_INT);
+ $prepare->bindValue(":loadingType", $miniProgramProfile["loadingType"], PDO::PARAM_INT);
+ $prepare->bindValue(":permissionType", $miniProgramProfile["permissionType"], PDO::PARAM_INT);
$prepare->bindValue(":authKey", $miniProgramProfile["authKey"]);
$prepare->bindValue(":addTime", $miniProgramProfile["addTime"]);
$flag = $prepare->execute();
@@ -102,7 +102,7 @@ public function getMaxPluginId()
$sql = "select max(pluginId) as pluginId from $this->tableName";
try {
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$flag = $prepare->execute();
$result = $prepare->fetch(\PDO::FETCH_ASSOC);
@@ -127,7 +127,7 @@ public function getPluginById($pluginId)
try {
$startTime = microtime(true);
$sql = "select $this->queryColumns from $this->tableName where pluginId=:pluginId;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":pluginId", $pluginId);
$prepare->execute();
@@ -165,9 +165,9 @@ public function getPluginList($usageType, $permissionTypes)
order by sort ASC, id DESC";
}
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
- $prepare->bindValue(":usageType", $usageType);
+ $prepare->bindValue(":usageType", $usageType, PDO::PARAM_INT);
$prepare->execute();
$results = $prepare->fetchAll(\PDO::FETCH_ASSOC);
@@ -186,9 +186,9 @@ public function getAllPluginList()
$tag = __CLASS__ . "_" . __FUNCTION__;
$startTime = microtime(true);
try {
- $sql = "select distinct pluginId,name,logo from $this->tableName order by id ASC;";
+ $sql = "select distinct a.pluginId,a.name,a.logo from (select pluginId,name,logo from sitePlugin order by id ASC) as a;;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->execute();
$results = $prepare->fetchAll(\PDO::FETCH_ASSOC);
diff --git a/src/model/SiteSessionTable.php b/src/model/SiteSessionTable.php
index 34361f8c..01bb4ed3 100644
--- a/src/model/SiteSessionTable.php
+++ b/src/model/SiteSessionTable.php
@@ -87,6 +87,17 @@ public function updateSessionInfo($where, $sessionInfo)
return $this->updateInfo($this->table, $where, $sessionInfo, $this->columns);
}
+ public function updateSessionActive($sessionId)
+ {
+ $where = [
+ 'sessionId' => $sessionId
+ ];
+ $data = [
+ "timeActive" => $this->getCurrentTimeMills(),
+ ];
+ return $this->updateInfo($this->table, $where, $data, $this->columns);
+ }
+
public function deleteSession($userId, $sessionId)
{
$tag = __CLASS__ . "->" . __FUNCTION__;
@@ -108,21 +119,22 @@ public function deleteSession($userId, $sessionId)
}
- public function getUserLatestDeviceId($userId)
+ public function getUserLatestDeviceId($userId, $limit = 1)
{
$tag = __CLASS__ . '-' . __FUNCTION__;
$startTime = microtime(true);
- $sql = "select deviceId from $this->table where userId=:userId order by timeActive DESC limit 1;";
+ $sql = "select deviceId from $this->table where userId=:userId order by timeActive DESC limit :limit;";
try {
$prepare = $this->db->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
+ $prepare->bindValue(":limit", $limit, PDO::PARAM_INT);
$flag = $prepare->execute();
- $userTokenInfo = $prepare->fetch(\PDO::FETCH_ASSOC);
+ $userTokenInfo = $prepare->fetchAll(\PDO::FETCH_ASSOC);
- if ($flag && $userTokenInfo) {
- return $userTokenInfo['deviceId'];
+ if ($flag) {
+ return $userTokenInfo;
}
} catch (Exception $e) {
diff --git a/src/model/SiteU2MessageTable.php b/src/model/SiteU2MessageTable.php
index 1ca51c32..b3aaa1bc 100644
--- a/src/model/SiteU2MessageTable.php
+++ b/src/model/SiteU2MessageTable.php
@@ -50,9 +50,9 @@ public function queryMessage($userId, $offset, $limitCount)
$prepare = $this->db->prepare($sql);
$this->handlePrepareError($tag, $prepare);
- $prepare->bindValue(":offset", $offset);
$prepare->bindValue(":userId", $userId);
- $prepare->bindValue(":limitCount", $limitCount);
+ $prepare->bindValue(":offset", $offset, PDO::PARAM_INT);
+ $prepare->bindValue(":limitCount", $limitCount, PDO::PARAM_INT);
$prepare->execute();
return $prepare->fetchAll(\PDO::FETCH_ASSOC);
diff --git a/src/model/SiteUicTable.php b/src/model/SiteUicTable.php
index df8d1c38..e1344ca5 100644
--- a/src/model/SiteUicTable.php
+++ b/src/model/SiteUicTable.php
@@ -107,7 +107,7 @@ public function updateUicUsed($code, $userId)
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
- $prepare->bindValue(":status", 0);
+ $prepare->bindValue(":status", 0, PDO::PARAM_INT);
$prepare->bindValue(":useTime", $startTime);
$prepare->bindValue(":code", $code);
@@ -120,8 +120,8 @@ public function updateUicUsed($code, $userId)
}
return fase;
- }catch (Exception $e){
- $this->ctx->Wpf_Logger->error($tag,$e);
+ } catch (Exception $e) {
+ $this->ctx->Wpf_Logger->error($tag, $e);
} finally {
$this->ctx->Wpf_Logger->writeSqlLog($tag, $sql, [$code, $userId], $startTime);
}
@@ -148,10 +148,10 @@ public function queryUsedUic($pageNum, $pageSize)
where status=0 limit :offset,:pageSize;";
try {
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
- $prepare->bindValue(":offset", $offset);
- $prepare->bindValue(":pageSize", $pageSize);
+ $prepare->bindValue(":offset", $offset, PDO::PARAM_INT);
+ $prepare->bindValue(":pageSize", $pageSize, PDO::PARAM_INT);
$prepare->execute();
return $prepare->fetchAll(\PDO::FETCH_ASSOC);
@@ -172,10 +172,10 @@ public function queryUnusedUic($pageNum, $pageSize)
$sql = "select $this->queryColumns from $this->tableName where status>=1 limit :offset,:pageSize;";
try {
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
- $prepare->bindValue(":offset", $offset);
- $prepare->bindValue(":pageSize", $pageSize);
+ $prepare->bindValue(":offset", $offset, PDO::PARAM_INT);
+ $prepare->bindValue(":pageSize", $pageSize, PDO::PARAM_INT);
$prepare->execute();
return $prepare->fetchAll(\PDO::FETCH_ASSOC);
@@ -193,7 +193,7 @@ public function queryUicByCode($code)
$sql = "select $this->queryColumns from $this->tableName where code=:code;";
try {
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":code", $code);
$prepare->execute();
diff --git a/src/model/SiteUserFriendTable.php b/src/model/SiteUserFriendTable.php
index d9878871..54b78ba8 100644
--- a/src/model/SiteUserFriendTable.php
+++ b/src/model/SiteUserFriendTable.php
@@ -37,8 +37,8 @@ public function saveUserFriend($userId, $friendUserId)
$data = [
"userId" => $userId,
"friendId" => $friendUserId,
- "relation" => $relation,
- "mute" => false, //false : 0
+ "relation" => (int)$relation,
+ "mute" => 0, //false : 0
"addTime" => $this->getCurrentTimeMills()
];
return $this->insertData($this->table, $data, $this->columns);
@@ -62,13 +62,13 @@ public function queryUserFriendByPage($userId, $offset, $count)
limit :offset, :limitCount;";
try {
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
- $prepare->bindValue(":relation", $relation);
- $prepare->bindValue(":offset", $offset);
- $prepare->bindValue(":limitCount", $count);
+ $prepare->bindValue(":relation", $relation, PDO::PARAM_INT);
+ $prepare->bindValue(":offset", $offset, PDO::PARAM_INT);
+ $prepare->bindValue(":limitCount", $count, PDO::PARAM_INT);
$prepare->execute();
$result = $prepare->fetchAll(\PDO::FETCH_ASSOC);
@@ -91,7 +91,7 @@ public function queryUserFriend($userId, $friendUserId)
try {
$sql = "SELECT $this->selectColumns FROM $this->table WHERE userId=:userId and friendId=:friendId;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$prepare->bindValue(":userId", $userId);
$prepare->bindValue(":friendId", $friendUserId);
$prepare->execute();
@@ -105,6 +105,25 @@ public function queryUserFriend($userId, $friendUserId)
}
+ public function queryUserFriendMute($userId, $friendUserId)
+ {
+ $tag = __CLASS__ . "->" . __FUNCTION__;
+ $startTime = $this->getCurrentTimeMills();
+
+ try {
+ $sql = "SELECT mute FROM $this->table WHERE userId=:userId and friendId=:friendId;";
+ $prepare = $this->dbSlave->prepare($sql);
+ $prepare->bindValue(":userId", $userId);
+ $prepare->bindValue(":friendId", $friendUserId);
+ $prepare->execute();
+
+ $result = $prepare->fetchColumn(0);
+ return $result;
+ } finally {
+ $this->ctx->Wpf_Logger->dbLog($tag, $sql, [$userId, $friendUserId], $startTime, $result);
+ }
+ }
+
public function queryUserFriendCount($userId)
{
$tag = __CLASS__ . "->" . __FUNCTION__;
@@ -113,7 +132,7 @@ public function queryUserFriendCount($userId)
try {
$sql = "SELECT COUNT(id) as num FROM $this->table WHERE userId=:userId;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$prepare->bindValue(":userId", $userId);
$prepare->execute();
$result = $prepare->fetch(\PDO::FETCH_ASSOC);
@@ -142,7 +161,7 @@ public function isFollow($userId, $friendUserId)
try {
$sql = "SELECT COUNT(id) as `count` FROM $this->table WHERE userId=:userId and friendId=:friendId and relation=1;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$prepare->bindValue(":userId", $userId);
$prepare->bindValue(":friendId", $friendUserId);
$prepare->execute();
@@ -180,7 +199,7 @@ public function getRealtion($userId, $friendUserId)
$result = false;
try {
$sql = "SELECT $this->selectColumns as `count` FROM $this->table WHERE userId=:userId and friendId=:friendId;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$prepare->bindValue(":userId", $userId);
$prepare->bindValue(":friendId", $friendUserId);
$prepare->execute();
@@ -191,40 +210,6 @@ public function getRealtion($userId, $friendUserId)
return $result;
}
-
-// public function queryUserFriend($userId)
-// {
-// $tag = __CLASS__ . "->" . __FUNCTION__;
-// $startTime = $this->getCurrentTimeMills();
-// $friends = [];
-//
-// $sql = "SELECT
-// a.userId,b.aliasName,b.aliasNameInLatin,a.loginName,a.nickname,a.nicknameInLatin,a.avatar
-// FROM
-// $this->userTable AS a LEFT JOIN $this->table AS b ON b.friendId = a.userId
-// WHERE
-// b.userId=:userId
-// limit :offset, :limitCount;";
-// try {
-//
-// $prepare = $this->db->prepare($sql);
-// $this->handlePrepareError($tag, $prepare);
-//
-// $prepare->bindValue(":userId", $userId);
-// $prepare->execute();
-//
-// $result = $prepare->fetchAll(\PDO::FETCH_ASSOC);
-//
-// if (!empty($result)) {
-// $friends = $result;
-// }
-//
-// } finally {
-// }
-//
-// return $friends;
-// }
-
public function updateData($where, $data)
{
return $this->updateInfo($this->table, $where, $data, $this->columns);
@@ -276,12 +261,12 @@ public function getUserFriendListNotInGroup($userId, $groupId, $offset, $pageSiz
siteGroupUser
where groupId=:groupId) limit :offset, :pageSize;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
$prepare->bindValue(":groupId", $groupId);
- $prepare->bindValue(":offset", $offset);
- $prepare->bindValue(":pageSize", $pageSize);
+ $prepare->bindValue(":offset", $offset, PDO::PARAM_INT);
+ $prepare->bindValue(":pageSize", $pageSize, PDO::PARAM_INT);
$prepare->execute();
$result = $prepare->fetchAll(\PDO::FETCH_ASSOC);
$this->ctx->Wpf_Logger->writeSqlLog($tag, $sql, [$userId, $groupId, $offset, $pageSize], $startTime);
diff --git a/src/model/SiteUserTable.php b/src/model/SiteUserTable.php
index 706aa284..536cfcc9 100644
--- a/src/model/SiteUserTable.php
+++ b/src/model/SiteUserTable.php
@@ -44,7 +44,7 @@ public function getUserByUserId($userId)
$startTime = microtime(true);
try {
$sql = "select $this->selectColumns from $this->table where userId=:userId";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
$prepare->execute();
@@ -63,7 +63,7 @@ public function getUserByLoginName($loginName)
$startTime = microtime(true);
try {
$sql = "select $this->selectColumns from $this->table where loginName=:loginName";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":loginName", $loginName);
$prepare->execute();
@@ -82,7 +82,7 @@ public function getUserByLoginNameLowercase($loginNameLowercase)
$startTime = microtime(true);
try {
$sql = "select $this->selectColumns from $this->table where loginNameLowercase=:loginNameLowercase;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":loginNameLowercase", $loginNameLowercase);
$prepare->execute();
@@ -101,7 +101,7 @@ public function getUserByPhoneId($phoneId)
$startTime = microtime(true);
try {
$sql = "select $this->selectColumns from $this->table where phoneId=:phoneId;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":phoneId", $phoneId);
$prepare->execute();
@@ -120,7 +120,7 @@ public function getUserNickName($userId)
$startTime = microtime(true);
try {
$sql = "select nickname from $this->table where userId=:userId";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
@@ -151,7 +151,7 @@ public function getFriendProfile($userId, $friendId)
WHERE
a.userId=:friendId;";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
@@ -176,11 +176,11 @@ public function getSiteUserListByOffset($offset, $length)
siteUser
order by id DESC limit :offset, :length";
try {
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
- $prepare->bindValue(":offset", $offset);
- $prepare->bindValue(":length", $length);
+ $prepare->bindValue(":offset", $offset, PDO::PARAM_INT);
+ $prepare->bindValue(":length", $length, PDO::PARAM_INT);
$prepare->execute();
$result = $prepare->fetchAll(\PDO::FETCH_ASSOC);
@@ -215,11 +215,11 @@ public function getUserListNotInGroup($groupId, $offset, $pageSize)
timeReg DESC
limit
:offset, :pageSize";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
- $prepare->bindValue(":offset", $offset);
- $prepare->bindValue(":pageSize", $pageSize);
+ $prepare->bindValue(":offset", $offset, PDO::PARAM_INT);
+ $prepare->bindValue(":pageSize", $pageSize, PDO::PARAM_INT);
$prepare->execute();
$result = $prepare->fetchAll(\PDO::FETCH_ASSOC);
$this->ctx->Wpf_Logger->writeSqlLog($tag, $sql, $groupId, $startTime);
@@ -237,7 +237,7 @@ public function getUserCount($groupId)
$tag = __CLASS__ . "-" . __FUNCTION__;
////TODO 待优化
$sql = "select count(userId) as `count` from siteUser where userId not in (select userId from siteGroupUser where groupId=:groupId);";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":groupId", $groupId);
@@ -251,6 +251,29 @@ public function getUserCount($groupId)
}
}
+ /**
+ * get site total user count
+ * @return bool|mixed
+ */
+ public function getSiteUserCount()
+ {
+ try {
+ $startTime = microtime(true);
+ $tag = __CLASS__ . "-" . __FUNCTION__;
+ $sql = "select count(userId) as `count` from siteUser;";
+ $prepare = $this->dbSlave->prepare($sql);
+ $this->handlePrepareError($tag, $prepare);
+
+ $prepare->execute();
+ $result = $prepare->fetchColumn(); // 0
+ $this->ctx->Wpf_Logger->writeSqlLog($tag, $sql, [], $startTime);
+ return $result;
+ } catch (Exception $ex) {
+ $this->ctx->Wpf_Logger->error($tag, "error_msg=" . $ex->getMessage());
+ return false;
+ }
+ }
+
public function getUserByUserIds($userIds)
{
$tag = __CLASS__ . "-" . __FILE__;
@@ -258,7 +281,7 @@ public function getUserByUserIds($userIds)
try {
$userIdStr = implode("','", $userIds);
$sql = "select $this->selectColumns from $this->table where userId in ('$userIdStr')";
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->execute();
$results = $prepare->fetchAll(\PDO::FETCH_ASSOC);
@@ -277,7 +300,7 @@ public function getUserFriendVersion($userId)
$startTime = microtime(true);
$sql = "select friendVersion from $this->table where userId=:userId;";
try {
- $prepare = $this->db->prepare($sql);
+ $prepare = $this->dbSlave->prepare($sql);
$this->handlePrepareError($tag, $prepare);
$prepare->bindValue(":userId", $userId);
$prepare->execute();
diff --git a/src/model/database-sql/site_mysql.sql b/src/model/database-sql/site_mysql.sql
new file mode 100644
index 00000000..04a15a20
--- /dev/null
+++ b/src/model/database-sql/site_mysql.sql
@@ -0,0 +1,183 @@
+
+
+CREATE TABLE IF NOT EXISTS siteConfig(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ configKey VARCHAR(100) NOT NULL,
+ configValue TEXT ,
+ UNIQUE (configKey));
+
+CREATE TABLE IF NOT EXISTS siteUser (
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ userId VARCHAR(100) UNIQUE NOT NULL,
+ loginName VARCHAR(100) UNIQUE NOT NULL,
+ loginNameLowercase VARCHAR(100) UNIQUE NOT NULL,
+ nickname VARCHAR(100) NOT NULL,
+ nicknameInLatin VARCHAR(100),
+ avatar VARCHAR(256),
+ availableType INTEGER,
+ countryCode VARCHAR(10),
+ phoneId VARCHAR(11),
+ friendVersion INTEGER,
+ timeReg BIGINT);
+
+CREATE TABLE if not EXISTS siteFriendApply(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ userId VARCHAR(100) NOT NULL,
+ friendId VARCHAR(100) NOT NULL,
+ greetings VARCHAR(100),
+ applyTime BIGINT,
+ UNIQUE(userId, friendId));
+
+CREATE TABLE IF NOT EXISTS siteUserFriend(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ userId VARCHAR(100) NOT NULL,
+ friendId VARCHAR(100) NOT NULL,
+ aliasName VARCHAR(100),
+ aliasNameInLatin VARCHAR(100),
+ relation INTEGER,
+ mute BOOLEAN,/*1互为好友 2我删除了对方 3临时会话 */
+ version INTEGER,
+ addTime BIGINT,/*是否静音 1表示静音，0表示没有静音*/
+ UNIQUE(userId, friendId));
+
+
+create table IF NOT EXISTS siteSession(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ sessionId VARCHAR(100) UNIQUE NOT NULL,
+ userId VARCHAR(100) NOT NULL,
+ deviceId VARCHAR(100) NOT NULL,
+ devicePubkPem TEXT, -- DEVICE PUBK PEM
+ clientSideType INTEGER, -- 0:无效，1:手机客户端 2:web客户端
+ timeWhenCreated BIGINT,/*创建时间*/
+ ipWhenCreated VARCHAR(100),/*创建时候的ip*/
+ timeActive BIGINT,/*最后活跃时间*/
+ ipActive VARCHAR(100),/*活跃时间的IP*/
+ userAgent VARCHAR(100),
+ userAgentType INTEGER,
+ gatewayURL VARCHAR(100),
+ gatewaySocketId VARCHAR(100),
+ UNIQUE(sessionId,userId),
+ UNIQUE(userId,deviceId));
+
+CREATE TABLE IF NOT EXISTS siteGroup (
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ groupId VARCHAR(100) NOT NULL,/*6到16位*/
+ `name` VARCHAR(100) NOT NULL,/*群名*/
+ nameInLatin VARCHAR(100) NOT NULL,
+ owner VARCHAR(100) NOT NULL,
+ avatar VARCHAR(256),/*群头像*/
+ description TEXT,/*群描述*/
+ descriptionType INTEGER default 0,/*descrption type， 0 text, 1 md*/
+ permissionJoin INTEGER,/*加入方式*/
+ canGuestReadMessage BOOLEAN,/*游客是否允许读群消息*/
+ maxMembers INTEGER,/*群最大成员数*/
+ speakers TEXT, /*发言人*/
+ status INTEGER default 1,/*表示群的状态， 1表示正常*/
+ isWidget INTEGER default 0, /*表示1是挂件，0不是挂件*/
+ timeCreate BIGINT,
+ UNIQUE(groupId)
+ );
+
+CREATE TABLE IF NOT EXISTS siteGroupUser(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ groupId VARCHAR(100) NOT NULL,
+ userId VARCHAR(100) NOT NULL,
+ memberType INTEGER,
+ isMute BOOLEAN default 0 ,/*是否静音 1表示静音，0表示没有静音*/
+ timeJoin BIGINT,
+ UNIQUE(groupId, userId)
+ );
+
+CREATE TABLE IF NOT EXISTS siteU2Message(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ msgId VARCHAR(100) UNIQUE NOT NULL,
+ userId VARCHAR(100) NOT NULL,
+ fromUserId VARCHAR(100),
+ toUserId VARCHAR(100) NOT NULL,
+ roomType INTEGER,
+ msgType INTEGER,
+ content TEXT, -- 可能是一个json，可能是一个proto toString
+ msgTime BIGINT,
+ INDEX(userId));
+
+CREATE TABLE IF NOT EXISTS siteU2MessagePointer(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ userId VARCHAR(100) NOT NULL,
+ deviceId VARCHAR(100),
+ clientSideType INTEGER, -- 0:无效，1:手机客户端 2:web客户端
+ pointer INTEGER,
+ UNIQUE(userId,deviceId)
+ );
+
+CREATE TABLE IF NOT EXISTS siteGroupMessage(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ msgId VARCHAR(100) UNIQUE NOT NULL,
+ groupId VARCHAR(100) NOT NULL,
+ fromUserId VARCHAR(100),
+ msgType INTEGER,
+ content TEXT,
+ msgTime BIGINT,
+ INDEX(groupId));
+
+CREATE TABLE IF NOT EXISTS passportPassword(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ userId VARCHAR(100) NOT NULL,
+ email VARCHAR(100) NOT NULL,
+ password VARCHAR(100) NOT NULL,
+ nickname VARCHAR(100) NOT NULL,
+ loginName VARCHAR(100) NOT NULL,
+ invitationCode VARCHAR(100),
+ timeReg BIGINT,
+ unique(userId),
+ unique(email),
+ unique(loginName));
+
+CREATE TABLE IF NOT EXISTS passportPasswordPreSession(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ userId VARCHAR(100) NOT NULL,
+ preSessionId VARCHAR(100) NOT NULL,
+ sitePubkPem TEXT,
+ unique(userId)
+ );
+
+CREATE TABLE IF NOT EXISTS passportPasswordToken(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ loginName VARCHAR(100) NOT NULL,
+ token VARCHAR(100) NOT NULL,
+ timeReg BIGINT,
+ UNIQUE(loginName)
+ );
+
+CREATE TABLE IF NOT EXISTS siteGroupMessagePointer(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ groupId VARCHAR(100) NOT NULL,
+ userId VARCHAR(100) NOT NULL,
+ deviceId VARCHAR(100),
+ clientSideType INTEGER, -- 0:无效，1:手机客户端 2:web客户端
+ pointer INTEGER,
+ UNIQUE(groupId,userId,deviceId));
+
+CREATE TABLE sitePlugin(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ pluginId INTEGER NOT NULL,
+ name VARCHAR(100) NOT NULL, /*名字*/
+ logo TEXT NOT NULL,/*logo*/
+ sort INTEGER,/*排序 数值越小，排位靠前*/
+ landingPageUrl TEXT,/*落地页*/
+ landingPageWithProxy LONG, /*是否使用resp加载落地页*/
+ usageType INTEGER, /*功能类型*/
+ loadingType INTEGER,/*展现方式*/
+ permissionType INTEGER , /*使用权限*/
+ authKey VARCHAR(32) NOT NULL,
+ addTime BIGINT,
+ UNIQUE(pluginId,usageType));
+
+
+CREATE TABLE IF NOT EXISTS siteUic(
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
+ code VARCHAR(50) unique NOT NULL,
+ userId VARCHAR(100),
+ status INTEGER, -- 0：无效，1：所有人可用 2：会员可用等
+ createTime BIGINT,
+ useTime BIGINT,
+ INDEX(userId));
\ No newline at end of file
diff --git a/src/model/database-sql/site_sqlite.sql b/src/model/database-sql/site_sqlite.sql
new file mode 100644
index 00000000..d465974e
--- /dev/null
+++ b/src/model/database-sql/site_sqlite.sql
@@ -0,0 +1,195 @@
+
+
+CREATE TABLE IF NOT EXISTS siteConfig(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ configKey VARCHAR(100) NOT NULL,
+ configValue TEXT ,
+ UNIQUE (configKey));
+
+CREATE TABLE IF NOT EXISTS siteUser (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ userId VARCHAR(100) UNIQUE NOT NULL,
+ loginName VARCHAR(100) UNIQUE NOT NULL,
+ loginNameLowercase VARCHAR(100) UNIQUE NOT NULL,
+ nickname VARCHAR(100) NOT NULL,
+ nicknameInLatin VARCHAR(100),
+ avatar VARCHAR(256),
+ availableType INTEGER,
+ countryCode VARCHAR(10),
+ phoneId VARCHAR(11),
+ friendVersion INTEGER,
+ timeReg BIGINT);
+
+CREATE TABLE if not EXISTS siteFriendApply(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ userId VARCHAR(100) NOT NULL,
+ friendId VARCHAR(100) NOT NULL,
+ greetings VARCHAR(100),
+ applyTime BIGINT,
+ UNIQUE(userId, friendId));
+
+CREATE TABLE IF NOT EXISTS siteUserFriend(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ userId VARCHAR(100) NOT NULL,
+ friendId VARCHAR(100) NOT NULL,
+ aliasName VARCHAR(100),
+ aliasNameInLatin VARCHAR(100),
+ relation INTEGER,
+ mute BOOLEAN,/*1互为好友 2我删除了对方 3临时会话 */
+ version INTEGER,
+ addTime BIGINT,/*是否静音 1表示静音，0表示没有静音*/
+ UNIQUE(userId, friendId));
+
+
+create table IF NOT EXISTS siteSession(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ sessionId VARCHAR(100) UNIQUE NOT NULL,
+ userId VARCHAR(100) NOT NULL,
+ deviceId VARCHAR(100) NOT NULL,
+ devicePubkPem TEXT, -- DEVICE PUBK PEM
+ clientSideType INTEGER, -- 0:无效，1:手机客户端 2:web客户端
+ timeWhenCreated BIGINT,/*创建时间*/
+ ipWhenCreated VARCHAR(100),/*创建时候的ip*/
+ timeActive BIGINT,/*最后活跃时间*/
+ ipActive VARCHAR(100),/*活跃时间的IP*/
+ userAgent VARCHAR(100),
+ userAgentType INTEGER,
+ gatewayURL VARCHAR(100),
+ gatewaySocketId VARCHAR(100),
+ UNIQUE(sessionId,userId),
+ UNIQUE(userId,deviceId));
+
+CREATE TABLE IF NOT EXISTS siteGroup (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ groupId VARCHAR(100) NOT NULL,/*6到16位*/
+ `name` VARCHAR(100) NOT NULL,/*群名*/
+ nameInLatin VARCHAR(100) NOT NULL,
+ owner VARCHAR(100) NOT NULL,
+ avatar VARCHAR(256),/*群头像*/
+ description TEXT,/*群描述*/
+ descriptionType INTEGER default 0,/*descrption type， 0 text, 1 md*/
+ permissionJoin INTEGER,/*加入方式*/
+ canGuestReadMessage BOOLEAN,/*游客是否允许读群消息*/
+ maxMembers INTEGER,/*群最大成员数*/
+ speakers TEXT, /*发言人*/
+ status INTEGER default 1,/*表示群的状态， 1表示正常*/
+ isWidget INTEGER default 0, /*表示1是挂件，0不是挂件*/
+ timeCreate BIGINT,
+ UNIQUE(groupId)
+ );
+
+CREATE TABLE IF NOT EXISTS siteGroupUser(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ groupId VARCHAR(100) NOT NULL,
+ userId VARCHAR(100) NOT NULL,
+ memberType INTEGER,
+ isMute BOOLEAN default 0 ,/*是否静音 1表示静音，0表示没有静音*/
+ timeJoin BIGINT,
+ UNIQUE(groupId, userId)
+ );
+
+CREATE TABLE IF NOT EXISTS siteU2Message(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ msgId VARCHAR(100) UNIQUE NOT NULL,
+ userId VARCHAR(100) NOT NULL,
+ fromUserId VARCHAR(100),
+ toUserId VARCHAR(100) NOT NULL,
+ roomType INTEGER,
+ msgType INTEGER,
+ content TEXT, -- 可能是一个json，可能是一个proto toString
+ msgTime BIGINT
+ );
+
+CREATE INDEX IF NOT EXISTS indexSiteU2MessageUserId ON siteU2Message(userId);
+
+CREATE TABLE IF NOT EXISTS siteU2MessagePointer(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ userId VARCHAR(100) NOT NULL,
+ deviceId VARCHAR(100),
+ clientSideType INTEGER, -- 0:无效，1:手机客户端 2:web客户端
+ pointer INTEGER
+ );
+
+CREATE UNIQUE INDEX IF NOT EXISTS indexSiteU2MessagePointerUd ON siteU2MessagePointer(userId,deviceId);
+
+CREATE TABLE IF NOT EXISTS siteGroupMessage(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ msgId VARCHAR(100) UNIQUE NOT NULL,
+ groupId VARCHAR(100) NOT NULL,
+ fromUserId VARCHAR(100),
+ msgType INTEGER,
+ content TEXT,
+ msgTime BIGINT
+ );
+
+CREATE INDEX IF NOT EXISTS indexSiteGroupMessageGroupId ON siteGroupMessage(groupId);
+
+
+CREATE TABLE IF NOT EXISTS passportPassword(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ userId VARCHAR(100) NOT NULL,
+ email VARCHAR(100) NOT NULL,
+ password VARCHAR(100) NOT NULL,
+ nickname VARCHAR(100) NOT NULL,
+ loginName VARCHAR(100) NOT NULL,
+ invitationCode VARCHAR(100),
+ timeReg BIGINT,
+ unique(userId),
+ unique(email),
+ unique(loginName)
+ );
+
+CREATE TABLE IF NOT EXISTS passportPasswordPreSession(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ userId VARCHAR(100) NOT NULL,
+ preSessionId VARCHAR(100) NOT NULL,
+ sitePubkPem TEXT,
+ unique(userId)
+ );
+
+CREATE TABLE IF NOT EXISTS passportPasswordToken(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ loginName VARCHAR(100) NOT NULL,
+ token VARCHAR(100) NOT NULL,
+ timeReg BIGINT,
+ UNIQUE(loginName)
+ );
+
+CREATE TABLE IF NOT EXISTS siteGroupMessagePointer(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ groupId VARCHAR(100) NOT NULL,
+ userId VARCHAR(100) NOT NULL,
+ deviceId VARCHAR(100),
+ clientSideType INTEGER, -- 0:无效，1:手机客户端 2:web客户端
+ pointer INTEGER);
+
+CREATE INDEX IF NOT EXISTS indexSiteGroupMessagePointerGud ON siteGroupMessagePointer(groupId,userId,deviceId);
+
+
+CREATE TABLE sitePlugin(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ pluginId INTEGER NOT NULL,
+ name VARCHAR(100) NOT NULL, /*名字*/
+ logo TEXT NOT NULL,/*logo*/
+ sort INTEGER,/*排序 数值越小，排位靠前*/
+ landingPageUrl TEXT,/*落地页*/
+ landingPageWithProxy LONG, /*是否使用resp加载落地页*/
+ usageType INTEGER, /*功能类型*/
+ loadingType INTEGER,/*展现方式*/
+ permissionType INTEGER , /*使用权限*/
+ authKey VARCHAR(32) NOT NULL,
+ addTime BIGINT,
+ UNIQUE(pluginId,usageType));
+
+CREATE INDEX IF NOT EXISTS indexSitePluginSort ON sitePlugin(sort);
+
+
+CREATE TABLE IF NOT EXISTS siteUic(
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ code VARCHAR(50) unique NOT NULL,
+ userId VARCHAR(100),
+ status INTEGER, -- 0：无效，1：所有人可用 2：会员可用等
+ createTime BIGINT,
+ useTime BIGINT);
+
+CREATE INDEX IF NOT EXISTS indexSiteUicUserId ON siteUic(userId);
\ No newline at end of file
diff --git a/src/public/css/init.css b/src/public/css/init.css
index 3a7ac10c..fd46a140 100644
--- a/src/public/css/init.css
+++ b/src/public/css/init.css
@@ -16,8 +16,7 @@ body,html {
background-image: url("../img/login_bg.png");
}
.zaly_login{
- width:75rem;
- /*height:47rem;*/
+ width:75.05rem;
background:rgba(255,255,255,1);
/*box-shadow:0rem 0.83rem 1.25rem 0.42rem rgba(74,56,180,1);*/
border-radius:0.83rem;
@@ -28,52 +27,169 @@ body,html {
}
.initHeader{
text-align: center;
- margin-top: 6rem;
+ margin-top: 5rem;
font-size:2.25rem;
+ height: 2.25rem;
font-family:PingFangSC-Medium;
font-weight:500;
color:rgba(76,59,177,1);
}
+.initHeader-title {
+ font-size:1.5rem;
+ font-family:PingFangSC-Medium;
+ font-weight:500;
+ color:rgba(20,16,48,1);
+ margin-left:23rem;
+ margin-top: 2rem;
+ height:1.5rem;
+}
+.initHeader-setting {
+ font-size:1.5rem;
+ font-family:PingFangSC-Medium;
+ font-weight:500;
+ color:rgba(20,16,48,1);
+ margin-left: 23rem;
+ margin-top: 3rem;
+ height:1.5rem;
+}
+
+.initHeader-sql {
+ margin-left: 23rem;
+ margin-top: 2rem;
+ height:1.31rem;
+ display: flex;
+ width: 28.14rem;
+}
+
+.initHeader-uic {
+ margin-left: 23rem;
+ margin-top: 2rem;
+ height:1.31rem;
+ display: flex;
+ width: 28.14rem;
+ display: flex;
+ outline: none;
+}
+
+.initHeader-uic span{
+ width: 6rem;
+ font-size:1.31rem;
+ font-family:PingFangSC-Regular;
+ font-weight:400;
+ color:rgba(102,102,102,1);
+ line-height:1.31rem;
+}
+
+.initHeader-sql .radioDiv {
+ margin-right:4rem;
+ cursor: pointer;
+}
+
+.mysql-div{
+ display: none;
+}
+
+.sqlite-div {
+ margin-left: 23rem;
+ margin-top: 1rem;
+}
+#sqlite-file {
+ width:21.95rem;
+ height:2.25rem;
+ border-radius:0.38rem;
+ border:0.09rem solid rgba(229,229,229,1);
+ cursor: pointer;
+}
+
+.radio {
+ cursor: pointer;
+}
+
+.radioImg {
+ width:1rem;
+ height:1rem;
+}
+
+.sql-input {
+ width:28.14rem;
+ height:2.25rem;
+ border-radius:0.38rem;
+ border:0.09rem solid rgba(229,229,229,1);
+ outline: none;
+ margin-left: 23rem;
+ margin-top: 1rem;
+ color:rgba(20,16,48,1);
+}
+.uic-input {
+ width:28.14rem;
+ height:2.25rem;
+ border-radius:0.38rem;
+ border:0.09rem solid rgba(229,229,229,1);
+ outline: none;
+}
+
+.uic-input::-webkit-input-placeholder,
+.sql-input::-webkit-input-placeholder {
+ color:rgba(201,201,201,1);
+}
+.uic-input:focus,
+.sql-input:focus {
+ border:0.09rem solid rgba(76,59,177,1);
+}
#verifyPluginId {
width:12.2rem;
height:2.25rem;
- background:rgba(236,236,236,1);
+ color:rgba(51,51,51,1);
border-radius:0.28rem;
outline: none;
+ cursor: pointer;
+}
+#verifyPluginId option {
+ cursor: pointer;
}
.init_check{
margin-left: 23rem;
- font-size:1.88rem;
+ font-size:1.31rem;
font-family:PingFangSC-Regular;
font-weight:400;
- color:rgba(20,16,48,1);
+ color:rgba(102,102,102,1);
}
.init_check_info {
display: flex;
justify-content: space-between;
- margin-top:2rem;
+ margin-top:1rem;
+ height:1.5rem;
}
.init_check_result {
- width:2rem;
- height:2rem;
+ width:1.3rem;
+ height:1.3rem;
display: flex;
margin-right: 23rem;
}
.init_check_result img {
- width: 2rem;
- height: 2rem;
+ width: 1.3rem;
+ height: 1.3rem;
}
+.errorInfo {
+ width:28.14rem;
+ margin-left: 23rem;
+ font-size:1.13rem;
+ font-family:PingFangSC-Regular;
+ font-weight:400;
+ color:rgba(244,67,54,1);
+}
+
.login_button {
- margin-top: 5rem;
width:28.14rem;
height:4.69rem;
background:rgba(76,59,177,1);
+ border:0.09rem solid rgba(229,229,229,1);
border-radius:0.66rem;
color: white;
font-size:1.88rem;
@@ -81,6 +197,7 @@ body,html {
font-weight:500;
cursor: pointer;
outline: none;
+ margin-top: 2rem;
}
.margin-top3 {
margin-top: 3rem;
@@ -93,6 +210,17 @@ body,html {
margin-right: 32rem;
}
+.mysql-setting {
+ display: flex;
+ position:relative;
+}
+
+.failed_img {
+ position: absolute;
+ left:49rem;
+ top:1.5rem;
+ display: none;
+}
@media (max-width: 500px) {
body,html {
background-color: #f4f4f4;
@@ -120,28 +248,50 @@ body,html {
font-size: 1.3rem;
text-align: left;
}
+
.initHeader{
text-align: center;
- margin-top: 6rem;
+ margin-top: 5rem;
font-size:2.25rem;
font-family:PingFangSC-Medium;
font-weight:500;
color:rgba(76,59,177,1);
}
+
+
+ .initHeader-title,
+ .initHeader-setting,
+ .initHeader-sql,
+ .initHeader-uic,
+ initHeader-uic span,
+ .sql-input,
+ .sqlite-div {
+ margin-left: 3rem;
+ }
+ .initHeader-title {
+ margin-top: 4rem;
+ }
+
.init_check {
margin-left: 3rem;
- font-size: 1.88rem;
+ font-size: 1.31rem;
font-family: PingFangSC-Regular;
font-weight: 400;
- color: rgba(20,16,48,1);
}
+
.init_check_result {
width: 2rem;
height: 2rem;
display: flex;
margin-right: 3rem;
}
+ .initHeader-setting {
+ margin-top: 2rem;
+ }
.choose_login_type {
margin-right: 12rem;
}
+ .initHeader {
+ display: none;
+ }
}
\ No newline at end of file
diff --git a/src/public/css/zaly_msg.css b/src/public/css/zaly_msg.css
index 9b47f104..8e81c0e9 100755
--- a/src/public/css/zaly_msg.css
+++ b/src/public/css/zaly_msg.css
@@ -475,8 +475,8 @@ html, body{
}
.right-input .input-tools img {
- width: 2.44rem;
- height: 2.44rem;
+ width: 2.25rem;
+ height: 2.25rem;
margin-right: 1.31rem;
}
diff --git a/src/public/img/init/check_failed.png b/src/public/img/init/check_failed.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c79b74a993de459d60e09ab35045ea74256e990
GIT binary patch
literal 796
zcmV+%1LOROP)send a friend apply
-
+
+