一些修改和开关实时

app/controller/report_archive_controller.js

@@ -560,7 +560,7 @@ module.exports = app => {
                 const result2 = await ctx.helper.sendMoreRequest(netcaSignApi + '/assemblyPdf', postData2, 'POST');
                 if (result2.code === 0) {
                     const result3 = await ctx.curl(netcaSignApi + result2.data, {
-                        timeout: 30000,
+                        timeout: 300000, // 超时 5分钟中
                     });
                     if (result3) {
                         response.data = result3.data;

app/middleware/session_auth.js

@@ -32,7 +32,8 @@ module.exports = options => {
             // 获取用户新建标段权利
             const accountInfo = yield this.service.projectAccount.getDataById(this.session.sessionUser.accountId);
             this.session.sessionUser.permission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;
-
+            const projectData = yield this.service.project.getDataById(this.session.sessionProject.id);
+            this.session.sessionProject.page_show = yield this.service.projectAccount.getPageShow(projectData.page_show);
 
             // 同步消息
             yield this.service.notify.syncNotifyData();

app/view/report/index_sign.ejs

@@ -444,7 +444,7 @@
                                 })
                             }
                         }
-                        function signPdf(res) {
+                        function signPdf(res2) {
                             const certEncode = "";
                             const tbs = utf8_to_b64(signDigest);
                             const _tsaURL = "http://tsa.cnca.net/NETCATimeStampServer/TSAServer.jsp";
@@ -464,7 +464,7 @@
                                 tsaURL: _tsaURL,
                                 includeCertOption: _includeCertOption//整数	包含证书的标识
                             };
-                            const curr_res = res;
+                            const curr_res = res2;
                             NetcaPKI.signedDataSign(params)
                                 .Then(function (res) {
                                     _self.text('签名中,请勿关闭本页...');
@@ -505,7 +505,7 @@
                                             ++curr_sign_page;
                                             setTimeout(function () {
                                                 successGetCertEncodeCallBack(curr_res);
-                                            }, 3000);
+                                            }, 2000);
                                         }
                                     }, function () {
                                         _self.attr('disabled', false);