lip 3 hónapja
szülő
commit
8dcb99d4a4

+ 8 - 0
app/admin/controller/Admin.php

@@ -231,6 +231,8 @@ class Admin extends BaseController
             $admin->role_name = Role::where('id', $admin->role_id)->value('name');
             $admin->department_name = Department::where('id', $admin->department_id)->value('name');
 
+            //标记需要签到
+            AdminModel::where('id', $admin->id)->update(['is_sign' => 1]);
             //如果登录信息中含有client——id则自动进行绑定
             $userInfo = User::where('account', $admin->username)->where('role', '>', 0)->find();
             if(!$userInfo){
@@ -281,6 +283,12 @@ class Admin extends BaseController
         return $this->success($data, '登录成功');
     }
 
+    //获取是否需要签到
+    public function getSign() {
+        $is_sign = AdminModel::where('id', $this->admin_id)->value('is_sign');
+        return $this->success(['is_sign' => $is_sign]);
+    }
+
     //退出登录
     public function logout(){
         try {

+ 6 - 0
app/admin/controller/Kefu.php

@@ -165,6 +165,8 @@ class Kefu extends BaseController
     public function sign()
     {
         try {
+            Db::startTrans();
+
             $admin_id = $this->admin_id;
             KefuWork::addNum($admin_id, 'sign_num');//客服签到次数更新
             $sign = Sign::where('admin_id', $admin_id)->where('created_at', '>=', date('Y-m-d'))->order('id', 'desc')->find();
@@ -177,7 +179,11 @@ class Kefu extends BaseController
             Sign::create([          
                 'admin_id' => $admin_id,
             ]);
+            
+            Admin::where('id', $admin_id)->update(['is_sign' => 0]);
+            Db::commit();
         } catch (\Exception $e) {
+            Db::rollback();
             return $this->error($e->getMessage());
         }
         //通知客服已签到

+ 15 - 0
app/common/controller/User.php

@@ -11,6 +11,10 @@ use think\facade\Session;
 use think\facade\Db;
 use GatewayClient\Gateway;
 
+use Google\Cloud\Translate\V3\Client\TranslationServiceClient;
+use Google\Cloud\Translate\V3\TranslateTextRequest;
+
+
 /**
  * 控制器基础类
  */
@@ -46,6 +50,17 @@ class User
     //客户端登录
     public function login(){
 
+    // $client = new TranslationServiceClient();
+
+    // $request = new TranslateTextRequest();
+    // $request->setTargetLanguageCode('en-US');
+    // $request->setContents(['こんにちは']);
+    // $request->setParent('projects/php-docs-samples-kokoro');
+
+    // // The request and response will be logged to STDOUT when the environment
+    // // variable GOOGLE_SDK_PHP_LOGGING=true
+    // $response = $client->translateText($request);
+    // print_r($response);die;
         $params=request()->param();
         $where['role'] = 0;
         if (empty($params['account']) || empty($params['uid']) || empty($params['from'])) {

+ 2 - 1
composer.json

@@ -41,7 +41,8 @@
         "swiftmailer/swiftmailer": "^6.0",
         "thans/tp-jwt-auth": "^1.3",
         "singka/singka-sms": "^1.6",
-        "topthink/think-api": "^1.0"
+        "topthink/think-api": "^1.0",
+        "google/cloud-translate": "^1.15"
     },
     "require-dev": {
         "symfony/var-dumper": "^4.2",

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 865 - 34
composer.lock


+ 20 - 0
config/usms.php

@@ -0,0 +1,20 @@
+<?php
+// +----------------------------------------------------------------------
+// | 胜家云 [ SingKa Cloud ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2019 https://www.singka.net All rights reserved.
+// +----------------------------------------------------------------------
+// | 宁波晟嘉网络科技有限公司
+// +----------------------------------------------------------------------
+// | Author: ShyComet <shycomet@qq.com>
+// +----------------------------------------------------------------------
+return [
+    //API秘钥之公钥 可在后台查找
+    'PUBLIC_KEY'   =>  '',
+    //API秘钥之私钥 可在后台查找
+    'PRIVATE_KEY'  =>  '',
+    //项目ID 登录Ucloud后台可以查找
+    'PROJECT_ID'   =>  '',
+    //API通信地址
+    'BASE_URL'     =>  'https://api.ucloud.cn',
+];

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott