Merge branch 'master' of https://git.oschina.net/yiguanjia/php

www/protected/config/develop.php

@@ -48,10 +48,10 @@ return CMap::mergeArray(
                     'qiniuConfig' => array(
                     'ak'=>'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr',
                     'sk'=>'mLtD4GhBjQt_llcgx4rKlhAts9j8iJ0Qa5VmNyi2',
-                    'icons'=>'test',
-                    'pics'=>'test',
-                    'avatars'=>'test',//用户的头像
-                    'video'=>'test'//音频文件
+                    'icons'=>'icons',
+                    'pics'=>'pics',
+                    'avatars'=>'avatars',//用户的头像
+                    'video'=>'video'//音频文件
                 ),
             )
         ),

www/protected/modules/o2o/controllers/TechHomeController.php

@@ -36,15 +36,15 @@ class TechHomeController extends CController {
         $qiniu_token = ENVIRONMENT == 'product' ?
             // 正式版token
             'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr:'.
-            '8oDemD47dVgyJ6PkSVGrqVbwNjw=:'.
-            'eyJzY29wZSI6InlpZ3VhbmppYS1waWNzIiwiZGVhZGxpbmUiOjEuNDc0NDQ1ODU5ZSsyMn0=':
+            'PhjO5GeGx1VECe1W7AlqUHZrxhg=:'.
+            'eyJzY29wZSI6InBpY3MiLCJkZWFkbGluZSI6MTQ3NDQ1MTg0OTAwMDAwMDAwMH0=':
             // 测试版token
             'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr:'.
             'kPiwYRwhAt8ULIMxphH8Hbgs6Mk=:'.
             'eyJzY29wZSI6InRlc3QiLCJkZWFkbGluZSI6MTQ3NDQ0NTg1OTAwfQ==';
         $qiniu_url = ENVIRONMENT == 'product' ? 
             // 正式版url前缀
-            'http://odqeoyzxd.bkt.clouddn.com/':
+            'http://odulvej8l.bkt.clouddn.com/':
             // 测试版url前缀
             'http://odujh0tsx.bkt.clouddn.com/';
         $data = array(

www/protected/modules/o2o/views/tech/index.php

@@ -3,7 +3,7 @@
 <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/datetimepicker.js?v=2"></script>
 <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/amazeui.datetimepicker.zh-CN.js?v=2"></script>
 <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/baidu_map/CityList.js?v=201405243209"></script>
-<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20190307"></script>
+<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20200307"></script>
 <div id="main">
     <div region="west" id="west_panel" border="false">
         <table id="dg_content"></table>

www/protected/views/master/index.php

@@ -364,7 +364,7 @@
         margin:5px;
     }
 </style>
-<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20190901"></script>
+<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20200901"></script>
 <script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/baidu_map/CityList.js?v=201405243259"></script>
 <script type="text/javascript">
 var map;

www/protected/views/product/index.php

@@ -2,7 +2,7 @@
     .f_label {width: 90px;}
     .accordion-body {padding: 0;}
 </style>
-<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20110901"></script>
+<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20200901"></script>
 <div id="main">
 <div region="west" border="false" id="west_panel">
     <table id="dg_content"></table>

www/protected/views/rUser/index.php

@@ -241,7 +241,7 @@
 #pets_info_container .pets_label {display: inline-block; width: 40px;}
 #pets_info_container .pets_value {display: inline-block; width: 80px;}
 </style>
-<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20190907"></script>
+<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20200907"></script>
 <script type="text/javascript">
 var jq_dg_content = $('#dg_content');
 var w_width = $(window).width();

www/protected/views/slide/index.php

@@ -251,7 +251,7 @@
     </div>
 
 </div>
-<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20110901"></script>
+<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20200901"></script>
 <script type="text/javascript">
     var jq_dg_content = $('#dg_content');
     var w_width = $(window).width();