diff --git a/api/app/lib/models/app_alarm.js b/api/app/lib/models/app_alarm.js index c0a6412..e12b976 100644 --- a/api/app/lib/models/app_alarm.js +++ b/api/app/lib/models/app_alarm.js @@ -2,145 +2,145 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const AppAlarm = sequelize.define("appAlarm", { - id: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: true, - field: "id", - autoIncrement: true, - unique: "app_alarm_id_uindex" - }, - serialNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "自定义编号", - primaryKey: false, - field: "serial_number", - autoIncrement: false - }, - projectAppId: { - type: DataTypes.INTEGER, - allowNull: true, - defaultValue: null, - comment: "对应的项目id", - primaryKey: false, - field: "project_app_id", - autoIncrement: false, - references: { - key: "id", - model: "app" + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const AppAlarm = sequelize.define("appAlarm", { + id: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + unique: "app_alarm_id_uindex" + }, + serialNumber: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "自定义编号", + primaryKey: false, + field: "serial_number", + autoIncrement: false + }, + projectAppId: { + type: DataTypes.INTEGER, + allowNull: true, + defaultValue: null, + comment: "对应的项目id", + primaryKey: false, + field: "project_app_id", + autoIncrement: false, + references: { + key: "id", + model: "app" + } + }, + appDomain: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "应用域名", + primaryKey: false, + field: "app_domain", + autoIncrement: false + }, + alarmContent: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "告警信息", + primaryKey: false, + field: "alarm_content", + autoIncrement: false + }, + createTime: { + type: DataTypes.DATE, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "create_time", + autoIncrement: false + }, + updateTime: { + type: DataTypes.DATE, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "update_time", + autoIncrement: false + }, + confirm: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "确认信息", + primaryKey: false, + field: "confirm", + autoIncrement: false + }, + router: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "路由", + primaryKey: false, + field: "router", + autoIncrement: false + }, + statusCode: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "状态码", + primaryKey: false, + field: "status_code", + autoIncrement: false + }, + screenshot: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "screenshot", + autoIncrement: false + }, + confirmTime: { + type: DataTypes.DATE, + allowNull: true, + defaultValue: null, + comment: "确认时间", + primaryKey: false, + field: "confirm_time", + autoIncrement: false + }, + confirmAuto: { + type: DataTypes.BOOLEAN, + allowNull: true, + defaultValue: null, + comment: "是否自动恢复", + primaryKey: false, + field: "confirm_auto", + autoIncrement: false + }, + type: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "type", + autoIncrement: false } - }, - appDomain: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "应用域名", - primaryKey: false, - field: "app_domain", - autoIncrement: false - }, - alarmContent: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "告警信息", - primaryKey: false, - field: "alarm_content", - autoIncrement: false - }, - createTime: { - type: DataTypes.DATE, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: false, - field: "create_time", - autoIncrement: false - }, - updateTime: { - type: DataTypes.DATE, - allowNull: true, - defaultValue: null, - comment: null, - primaryKey: false, - field: "update_time", - autoIncrement: false - }, - confirm: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "确认信息", - primaryKey: false, - field: "confirm", - autoIncrement: false - }, - router: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "路由", - primaryKey: false, - field: "router", - autoIncrement: false - }, - statusCode: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "状态码", - primaryKey: false, - field: "status_code", - autoIncrement: false - }, - screenshot: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: null, - primaryKey: false, - field: "screenshot", - autoIncrement: false - }, - confirmTime: { - type: DataTypes.DATE, - allowNull: true, - defaultValue: null, - comment: "确认时间", - primaryKey: false, - field: "confirm_time", - autoIncrement: false - }, - confirmAuto: { - type: DataTypes.BOOLEAN, - allowNull: true, - defaultValue: null, - comment: "是否自动恢复", - primaryKey: false, - field: "confirm_auto", - autoIncrement: false - }, - type: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: null, - primaryKey: false, - field: "type", - autoIncrement: false - } - }, { - tableName: "app_alarm", - comment: "", - indexes: [] - }); - dc.models.AppAlarm = AppAlarm; - return AppAlarm; + }, { + tableName: "app_alarm", + comment: "", + indexes: [] + }); + dc.models.AppAlarm = AppAlarm; + return AppAlarm; }; \ No newline at end of file diff --git a/api/app/lib/models/structure_off.js b/api/app/lib/models/structure_off.js index e286832..153f6a5 100644 --- a/api/app/lib/models/structure_off.js +++ b/api/app/lib/models/structure_off.js @@ -3,60 +3,60 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const StructureOff = sequelize.define("structureOff", { - id: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: true, - field: "id", - autoIncrement: true, - unique: "t_structure_off_id_uindex" - }, - structure: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: "结构物id", - primaryKey: false, - field: "structure", - autoIncrement: false - }, - offline: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: "离线时长(分钟)", - primaryKey: false, - field: "offline", - autoIncrement: false - }, - offtime: { - type: DataTypes.STRING, - allowNull: false, - defaultValue: null, - comment: "最后数据时间", - primaryKey: false, - field: "offtime", - autoIncrement: false - }, - state: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: "数据状态( 0:有效,1:无效)", - primaryKey: false, - field: "state", - autoIncrement: false - } - }, { - tableName: "t_structure_off", - comment: "", - indexes: [] - }); - dc.models.StructureOff = StructureOff; - return StructureOff; + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const StructureOff = sequelize.define("structureOff", { + id: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + unique: "t_structure_off_id_uindex" + }, + structure: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: "结构物id", + primaryKey: false, + field: "structure", + autoIncrement: false + }, + offline: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: "离线时长(分钟)", + primaryKey: false, + field: "offline", + autoIncrement: false + }, + offtime: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: "最后数据时间", + primaryKey: false, + field: "offtime", + autoIncrement: false + }, + state: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: "数据状态( 0:有效,1:无效)", + primaryKey: false, + field: "state", + autoIncrement: false + } + }, { + tableName: "t_structure_off", + comment: "", + indexes: [] + }); + dc.models.StructureOff = StructureOff; + return StructureOff; }; \ No newline at end of file diff --git a/api/app/lib/models/system_problem.js b/api/app/lib/models/system_problem.js index 5d7d4fd..dff23c1 100644 --- a/api/app/lib/models/system_problem.js +++ b/api/app/lib/models/system_problem.js @@ -3,32 +3,32 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const SystemProblem = sequelize.define("systemProblem", { - id: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: true, - field: "id", - autoIncrement: true - }, - type: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "问题类型:数据库异常、es异常、kafka异常、服务器异常、应用异常、其他", - primaryKey: false, - field: "type", - autoIncrement: false - } - }, { - tableName: "system_problem", - comment: "", - indexes: [] - }); - dc.models.SystemProblem = SystemProblem; - return SystemProblem; + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const SystemProblem = sequelize.define("systemProblem", { + id: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true + }, + type: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "问题类型:数据库异常、es异常、kafka异常、服务器异常、应用异常、其他", + primaryKey: false, + field: "type", + autoIncrement: false + } + }, { + tableName: "system_problem", + comment: "", + indexes: [] + }); + dc.models.SystemProblem = SystemProblem; + return SystemProblem; }; \ No newline at end of file diff --git a/web/client/src/sections/auth/index.js b/web/client/src/sections/auth/index.js index f8e40fb..a01ab7d 100644 --- a/web/client/src/sections/auth/index.js +++ b/web/client/src/sections/auth/index.js @@ -5,8 +5,8 @@ import reducers from './reducers'; import actions from './actions'; export default { - key: 'auth', - reducers: reducers, - routes: routes, - actions: actions + key: 'auth', + reducers: reducers, + routes: routes, + actions: actions }; \ No newline at end of file diff --git a/web/client/src/sections/install/routes.js b/web/client/src/sections/install/routes.js index 99892f7..e983d58 100644 --- a/web/client/src/sections/install/routes.js +++ b/web/client/src/sections/install/routes.js @@ -1,5 +1,5 @@ 'use strict'; -import { Roles, System,Setup,Set } from './containers'; +import { Roles, System, Setup, Set } from './containers'; export default [ { @@ -30,7 +30,7 @@ export default [ component: System, breadcrumb: '系统映射', }] - },, { + }, { path: '/order', key: 'order', breadcrumb: '工单管理',