blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into v5

Browse Source
This commit is contained in:
Anyon 2019-07-18 16:49:26 +08:00
commit 9378e56a7f
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/store/controller/Message.php
View File

@ -50,6 +50,8 @@ class Message extends Controller
/** /**
* 删除短信记录 * 删除短信记录
* @auth true * @auth true
* @throws \think\Exception
* @throws \think\exception\PDOException
*/ */
public function remove() public function remove()
{ {

2
application/store/controller/Order.php
View File

@ -74,9 +74,11 @@ class Order extends Controller
/** /**
* 修改快递管理 * 修改快递管理
* @auth true * @auth true
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/ */
public function express() public function express()
{ {

1
application/store/view/config/index-store-message1.html
View File

@ -41,6 +41,5 @@
<button class="layui-btn" type="submit">保存配置</button> <button class="layui-btn" type="submit">保存配置</button>
</div> </div>
</div> </div>
</form> </form>

3
application/store/view/config/index-store-message2.html
View File

@ -22,7 +22,7 @@
<label class="layui-form-item margin-top-20 block relative"> <label class="layui-form-item margin-top-20 block relative">
<span class="color-green margin-right-10">短信平台密码</span><span class="nowrap color-desc">Password</span> <span class="color-green margin-right-10">短信平台密码</span><span class="nowrap color-desc">Password</span>
<input name="sms_zt_password2" required placeholder="请输入短信平台密码" value="{:sysconf('sms_zt_password2')}" class="layui-input"> <input name="sms_zt_password2" required placeholder="请输入短信平台密码" value="{:sysconf('sms_zt_password2')}" class="layui-input">
<p class="help-block">短信平台账号，可以联系18122377655获取账号与密码</p> <p class="help-block">短信平台密码，可以联系18122377655获取账号与密码</p>
</label> </label>
<label class="layui-form-item margin-top-20 block relative"> <label class="layui-form-item margin-top-20 block relative">
@ -41,6 +41,5 @@
<button class="layui-btn" type="submit">保存配置</button> <button class="layui-btn" type="submit">保存配置</button>
</div> </div>
</div> </div>
</form> </form>

7
application/wechat/service/MediaService.php
View File

@ -78,7 +78,10 @@ class MediaService
*/ */
private static function getServerPath($local) private static function getServerPath($local)
{ {
if (file_exists($local)) return new MyCurlFile($local); if (file_exists($local)) {
return new MyCurlFile(File::down($local)['file']); return new MyCurlFile($local);
} else {
return new MyCurlFile(File::down($local)['file']);
}
} }
} }

2
config/app.php
View File

@ -18,7 +18,7 @@ return [
'app_debug' => true, 'app_debug' => true,
// 应用Trace调试 // 应用Trace调试
'app_trace' => false, 'app_trace' => false,
// URL参数方式 0 按名称成对解析 1 按顺序解析 // 0按名称成对解析 1按顺序解析
'url_param_type' => 1, 'url_param_type' => 1,
// 当前 ThinkAdmin 版本号 // 当前 ThinkAdmin 版本号
'thinkadmin_ver' => 'v5', 'thinkadmin_ver' => 'v5',