新增OSS配置，修正阅卷问题

Author: oiuv

.php_cs

@@ -20,6 +20,7 @@ $config = PhpCsFixer\Config::create()
         '@PSR2' => true,
         'header_comment' => ['header' => $header],
         'binary_operator_spaces' => ['operators' => ['=>' => 'align']],
+        'trailing_comma_in_multiline_array' => true,
         // 'no_useless_else' => true,
         // 'no_useless_return' => true,
     ])

app/exam/tpls/master/basic_examview.tpl

@@ -31,12 +31,14 @@
                             {x2;eval: v:tid++}
                             <a id="sign_{x2;v:question['questionid']}" href="#question_{x2;v:question['questionid']}" class="btn btn-default">{x2;v:tid}</a>
                             {x2;endtree}
+                            {x2;if:is_array($sessionvars['examsessionquestion']['questionrows'][v:quest])}
                             {x2;tree:$sessionvars['examsessionquestion']['questionrows'][v:quest],questionrow,qrid}
                             {x2;eval: v:tid++}
                             {x2;tree:v:questionrow['data'],data,did}
                             <a id="sign_{x2;v:data['questionid']}" href="#question_{x2;v:data['questionid']}" class="btn btn-default">{x2;v:tid}-{x2;v:did}</a>
                             {x2;endtree}
                             {x2;endtree}
+                            {x2;endif}
                         </div>
                         {x2;endif}
                         {x2;endif}
@@ -99,6 +101,7 @@
                     </div>
                 </div>
                 {x2;endtree}
+                {x2;if:is_array($sessionvars['examsessionquestion']['questionrows'][v:quest])}
                 {x2;tree:$sessionvars['examsessionquestion']['questionrows'][v:quest],questionrow,qrid}
                 {x2;eval: v:tid++}
                 <div class="box itembox paperexamcontent">
@@ -149,6 +152,7 @@
                 {x2;endtree}
                 {x2;endif}
                 {x2;endif}
+                {x2;endif}
                 {x2;endtree}
             </div>
         </div>

app/exam/tpls/master/basic_scorelist.tpl

@@ -69,14 +69,16 @@
                                 <th>名次</th>
                                 {x2;endif}
                                 <th>考生用户名</th>
+                                {x2;if:is_array($fields)}
                                 {x2;tree:$fields,field,fid}
                                 <th>{x2;v:field['fieldtitle']}</th>
                                 {x2;endtree}
+                                {x2;endif}
                                 <th>分数</th>
                                 <th>考试名称</th>
                                 <th>考试时间</th>
                                 <th>考试用时</th>
-                                <th width="100">操作</th>
+                                <th style="width:100px;">操作</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -93,9 +95,11 @@
                                 <td>
                                     {x2;v:exam['ehusername']}
                                 </td>
+                                {x2;if:is_array($fields)}
                                 {x2;tree:$fields,field,fid}
                                 <th>{x2;v:exam[v:field['field']]}</th>
                                 {x2;endtree}
+                                {x2;endif}
                                 <td>
                                     {x2;v:exam['ehscore']}
                                 </td>

lib/config.inc.example.php

@@ -26,7 +26,6 @@
 } else {
     define('WP', '//'.$_SERVER['SERVER_NAME'].'/');
 }
-define('OPENOSS', false);
 
 /* 数据库设置 */
 define('SQLDEBUG', 1);
@@ -43,6 +42,13 @@
     'database' => 9, //Redis数据库（0-15）
 ]);
 
+/* 阿里云OSS设置 */
+define('OPENOSS', false);
+define('OSSKEYID', 'LTAI1gDYPJhtZlIh');
+define('OSSKEYSECRET', 'bmLtFONC9OVSfS9NAWYtelVsWMzCEp');
+define('OSSENDPOINT', 'http://oss-cn-beijing.aliyuncs.com');
+define('OSSBUCKET', 'ossforphpems');
+
 /* 微信相关设置 */
 define('USEWX', false); //微信使用开关，绑定用户
 define('WXAUTOREG', false); //微信开启自动注册

lib/oss.cls.php

@@ -24,10 +24,10 @@ public function __construct(&$G)
 
     public function upload($filepath)
     {
-        $accessKeyId = 'LTAI1gDYPJhtZlIh';
-        $accessKeySecret = 'bmLtFONC9OVSfS9NAWYtelVsWMzCEp';
-        $endpoint = 'http://oss-cn-beijing.aliyuncs.com';
-        $bucket = 'ossforphpems';
+        $accessKeyId = OSSKEYID;
+        $accessKeySecret = OSSKEYSECRET;
+        $endpoint = OSSENDPOINT;
+        $bucket = OSSBUCKET;
         $object = date('Ymd').'/'.basename($filepath);
         $filePath = $filepath;
 
@@ -36,7 +36,7 @@ public function upload($filepath)
 
             $rs = $ossClient->uploadFile($bucket, $object, $filePath);
             $path = $rs['oss-request-url'];
-            $path = str_ireplace('����1', '����2', $path);
+            $path = str_ireplace('url1', 'url2', $path);
         } catch (OssException $e) {
             //printf(__FUNCTION__ . ": FAILED\n");
             //printf($e->getMessage() . "\n");