浏览代码

Merge branch 'master' into olym

caiaolin 8 年之前
父节点
当前提交
ad0ba2bec1
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 1
      modules/ration_glj/facade/ration_glj_facade.js
  2. 1 0
      server.js

+ 1 - 1
modules/ration_glj/facade/ration_glj_facade.js

@@ -110,7 +110,7 @@ function get_lib_glj_info(ration_glj) {
 
 async function getInfoFromProjectGLJ(ration_glj) {
      let data = {
-         glj_repository_id: ration_glj.glj_repository_id,
+         glj_id: ration_glj.glj_repository_id,
          project_id: ration_glj.projectID,
          code: ration_glj.code,
          name: ration_glj.name,

+ 1 - 0
server.js

@@ -39,6 +39,7 @@ app.use(session({
     secret: 'session users secret',
     cookie: {maxAge: 1000*60*30},
     resave: false,
+    rolling: true,
     saveUninitialized: true
     //*
     ,store: new DBStore({