Merge branch 'test' of ssh://39.155.253.71:33222/PHP/Jz-Php into test

config/admin.php

-<?php
-//配置文件
-return [
-    //加密串
-    'passwd_salt'                   => 'gonn',
-    'passwd_init'                   => 'gonn',
-    'encrypt_key'                   => 'INJq4HXEGI',
-    'login_pattern'          => '/^\w{2,}@\w+/',   //开放模式
-    //'login_pattern'          => '/^\w{2,}@gonn\.com\.cn$', 严格模式
-    'upload_dir' => './static/uploads',
-    'images_dir' => './static/uploads/images',
-    'files_dir' => './static/uploads/files',
-    'search_area' => '1',   //1按部门搜索,2全局
-    'order_per' =>'ZD',
-    'redis_host' => '192.168.1.71',
-    'redis_port' => 6379,
-    'base_url' => 'http://oa-test.gonn.tech/',
-];
\ No newline at end of file

config/cache.php

-<?php
-// +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: liu21st <liu21st@gmail.com>
-// +----------------------------------------------------------------------
-
-// +----------------------------------------------------------------------
-// | 缓存设置
-// +----------------------------------------------------------------------
-
-
-return [
-    // 缓存配置为复合类型
-    'type'  =>  'complex', 
-    'default'   =>  [
-      'type'    =>  'file',
-      // 全局缓存有效期（0为永久有效）
-      'expire'=>  0, 
-      // 缓存前缀
-      'prefix'=>  '',
-       // 缓存目录
-      'path'  =>  '',
-    ],
-    'redis' =>  [
-      'type'    =>  'redis',
-      'host'    =>  '192.168.1.71',
-      // 全局缓存有效期（0为永久有效）
-      'expire'=>  0, 
-      // 缓存前缀
-      'prefix'=>  '',
-    ],
-    // 添加更多的缓存类型设置
-];

config/database.php

-<?php
-// +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: liu21st <liu21st@gmail.com>
-// +----------------------------------------------------------------------
-
-return [
-    // 数据库类型
-    'type'            => 'mysql',
-    // 服务器地址
-    'hostname'        => '192.168.1.71',
-    // 数据库名
-    'database'        => 'gonn',
-    // 用户名
-    'username'        => 'root',
-    // 密码
-    'password'        => 'aLN%4Jx7ZsmsoMlOB0XEd7',
-    // 端口
-    'hostport'        => '3306',
-
-    // 连接dsn
-    'dsn'             => '',
-    // 数据库连接参数
-    'params'          => [],
-    // 数据库编码默认采用utf8
-    'charset'         => 'utf8',
-    // 数据库表前缀
-    'prefix'          => '',
-    // 数据库调试模式
-    'debug'           => true,
-    // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
-    'deploy'          => 0,
-    // 数据库读写是否分离 主从式有效
-    'rw_separate'     => false,
-    // 读写分离后 主服务器数量
-    'master_num'      => 1,
-    // 指定从服务器序号
-    'slave_no'        => '',
-    // 自动读取主库数据
-    'read_master'     => false,
-    // 是否严格检查字段是否存在
-    'fields_strict'   => true,
-    // 数据集返回类型
-    'resultset_type'  => 'array',
-    // 自动写入时间戳字段
-    'auto_timestamp'  => false,
-    // 时间字段取出后的默认时间格式
-    'datetime_format' => 'Y-m-d H:i:s',
-    // 是否需要进行SQL性能分析
-    'sql_explain'     => false,
-    // Builder类
-    'builder'         => '',
-    // Query类
-    'query'           => '\\think\\db\\Query',
-    // 是否需要断线重连
-    'break_reconnect' => false,
-    // 断线标识字符串
-    'break_match_str' => [],
-      
-    'geturl'=>'http://jz-test.gonn.com.cn/',
-];

config/session.php

-<?php
-// +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: liu21st <liu21st@gmail.com>
-// +----------------------------------------------------------------------
-
-// +----------------------------------------------------------------------
-// | 会话设置
-// +----------------------------------------------------------------------
-
-return [
-    'type'       => 'redis',
-    'prefix'     => '',
-    'auto_start' => true,
-    // redis主机
-    'host'       => '192.168.1.71',
-    // redis端口
-    'port'       => 6379,
-];

config/session.php.bak

-<?php
-// +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: liu21st <liu21st@gmail.com>
-// +----------------------------------------------------------------------
-
-// +----------------------------------------------------------------------
-// | 会话设置
-// +----------------------------------------------------------------------
-
-return [
-    'id'             => '',
-    // SESSION_ID的提交变量,解决flash上传跨域
-    'var_session_id' => '',
-    // SESSION 前缀
-    'prefix'         => 'think',
-    // 驱动方式 支持redis memcache memcached
-    'type'           => '',
-    // 是否自动开启 SESSION
-    'auto_start'     => false,
-];