update users model

modules/users/models/schemas/bills_template.js

@@ -35,5 +35,4 @@ let BillsTemplateSchema = {
     engineering: Number
 };
 
-let model = mongoose.model(collectionName, new Schema(BillsTemplateSchema, {versionKey: false, collection: collectionName}));
-export {model as default, collectionName as collectionName};
+mongoose.model(collectionName, new Schema(BillsTemplateSchema, {versionKey: false, collection: collectionName}));

modules/users/models/schemas/compilation.js

@@ -69,5 +69,4 @@ let modelSchema = {
         default: 0
     }
 };
-let model = mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
-export {model as default, collectionName as collectionName};
+mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));

modules/users/models/schemas/engineering_lib.js

@@ -52,6 +52,5 @@ let modelSchema = {
         default: []
     }
 };
-let model = mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
-export {model as default, collectionName as collectionName};
+mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
 

modules/users/models/schemas/manager.js

@@ -60,5 +60,4 @@ let modelSchema = {
         default: 0
     }
 };
-let model = mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
-export {model as default, collectionName as collectionName};
+mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));

modules/users/models/schemas/message.js

@@ -47,5 +47,4 @@ let modelSchema = {
     }
 
 };
-let model = mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
-export {model as default, collectionName as collectionName};
+mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));

modules/all_models/stdGlj_lib.js

@@ -27,4 +27,4 @@ let gljMapSchema = new Schema({
     {versionKey: false}
 );
 
-mongoose.model('std_glj_lib_gljList', gljMapSchema, 'std_glj_lib_gljList');
+mongoose.model('std_glj_lib_map', gljMapSchema, 'std_glj_lib_map');

modules/users/models/schemas/user.js

@@ -44,6 +44,5 @@ let modelSchema = {
         default: 0
     },
 };
-let model = mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
-export {model as default, collectionName as collectionName};
+mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
 

modules/users/models/bills_template_model.js

@@ -2,8 +2,8 @@
  * Created by Mai on 2017/4/14.
  * 清单模板，新建项目使用
  */
+import mongoose from "mongoose";
 import BaseModel from "../../common/base/base_model";
-import BillsTemplateSchema from "./schemas/bills_template";
 
 class BillsTemplateModel extends BaseModel {
     /**
@@ -13,7 +13,7 @@ class BillsTemplateModel extends BaseModel {
      */
     constructor() {
         let parent = super();
-        parent.model = BillsTemplateSchema;
+        parent.model = mongoose.model('temp_bills');
         parent.init();
     }
 

modules/users/models/compilation_model.js

@@ -5,8 +5,8 @@
  * @date 2017/7/28
  * @version
  */
+import mongoose from "mongoose";
 import BaseModel from "../../common/base/base_model";
-import CompilationSchema from "./schemas/compilation";
 
 class CompilationModel extends BaseModel {
 
@@ -24,7 +24,7 @@ class CompilationModel extends BaseModel {
      */
     constructor() {
         let parent = super();
-        parent.model = CompilationSchema;
+        parent.model = mongoose.model('compilation');
         parent.init();
     }
 

modules/users/models/engineering_lib_model.js

@@ -5,8 +5,8 @@
  * @date 2017/8/31
  * @version
  */
+import mongoose from "mongoose";
 import BaseModel from "../../common/base/base_model";
-import EngineeringLibSchema from "./schemas/engineering_lib";
 import CompilationModel from "./compilation_model";
 import {default as EngineeringConst, List as EngineeringList} from "../../common/const/engineering";
 
@@ -18,7 +18,7 @@ class EngineeringLibModel extends BaseModel {
      */
     constructor() {
         let parent = super();
-        parent.model = EngineeringLibSchema;
+        parent.model = mongoose.model("engineering_lib");
         parent.init();
     }
 

modules/users/models/manager_model.js

@@ -5,8 +5,8 @@
  * @date 2017/6/1
  * @version
  */
+import mongoose from "mongoose";
 import BaseModel from "../../common/base/base_model";
-import ManagerSchema from "./schemas/manager";
 import crypto from "crypto";
 import Request from "request";
 
@@ -39,7 +39,7 @@ class ManagerModel extends BaseModel {
      */
     constructor() {
         let parent = super();
-        parent.model = ManagerSchema;
+        parent.model = mongoose.model('manager');
         parent.init();
     }
 

modules/users/models/message_model.js

@@ -5,8 +5,8 @@
  * @date 2017/9/21
  * @version
  */
+import mongoose from "mongoose";
 import BaseModel from "../../common/base/base_model";
-import MessageSchema from "../models/schemas/message";
 
 class MessageModel extends BaseModel {
 
@@ -31,7 +31,7 @@ class MessageModel extends BaseModel {
      */
     constructor() {
         let parent = super();
-        parent.model = MessageSchema;
+        parent.model = mongoose.model('message');
         parent.init();
     }
 

modules/users/models/user_model.js

@@ -5,8 +5,8 @@
  * @date 2017/6/12
  * @version
  */
+import mongoose from "mongoose";
 import BaseModel from "../../common/base/base_model";
-import UserSchema from "./schemas/user";
 
 class UserModel extends BaseModel {
 
@@ -38,7 +38,7 @@ class UserModel extends BaseModel {
      */
     constructor() {
         let parent = super();
-        parent.model = UserSchema;
+        parent.model = mongoose.model('users');
         parent.init();
     }