Commit 9a8c5425 authored by HAYWAEL's avatar HAYWAEL

fix

parent 6c77ed41
Pipeline #27836 passed with stage
in 1 minute 41 seconds
......@@ -25,7 +25,7 @@ export default () => {
};
config.sequelize = {
datasources: [ {
datasources: [{
// 东八时区
timezone: '+08:00',
delegate: 'wafangModel',
......@@ -39,8 +39,6 @@ export default () => {
}],
};
config.SERVICE_HOST = 'https://dev-nginx.jianbing.com';
config.runEnv = 'uat';
......
......@@ -46,8 +46,6 @@ export default () => {
}],
};
config.mailer = {
client: {
host: 'smtp.exmail.qq.com',
......
......@@ -10,7 +10,7 @@
"scripts": {
"start": "egg-scripts start --daemon --title=egg-server-zeus-server",
"stop": "egg-scripts stop --title=egg-server-zeus-server",
"docker": "npm run ci&&egg-scripts start --title=egg-server-zeus-server",
"docker": "npm run tsc&&egg-scripts start --title=egg-server-zeus-server",
"dev": "egg-bin dev",
"debug": "egg-bin debug",
"test-local": "egg-bin test",
......
import * as assert from 'assert';
import { app } from 'egg-mock/bootstrap';
describe('test/app/controller/home.test.ts', () => {
it('should GET /', async () => {
const result = await app.httpRequest().get('/').expect(200);
assert(result.text === 'hi, egg');
});
});
import * as assert from 'assert';
import { Context } from 'egg';
import { app } from 'egg-mock/bootstrap';
describe('test/app/service/Test.test.js', () => {
let ctx: Context;
before(async () => {
ctx = app.mockContext();
});
it('sayHi', async () => {
const result = await ctx.service.test.sayHi('egg');
assert(result === 'hi, egg');
});
});
// This file is created by egg-ts-helper@1.25.8
// Do not modify this file!!!!!!!!!
import 'egg';
import ExportDefaultUser = require('../../../app/model/default/user');
import ExportWafangWafangAppointment = require('../../../app/model/wafang/wafangAppointment');
import ExportWafangWafangBlock = require('../../../app/model/wafang/wafangBlock');
import ExportWafangWafangBlockContent = require('../../../app/model/wafang/wafangBlockContent');
import ExportWafangWafangCollection = require('../../../app/model/wafang/wafangCollection');
import ExportWafangWafangImage = require('../../../app/model/wafang/wafangImage');
import ExportWafangWafangImageOpening = require('../../../app/model/wafang/wafangImageOpening');
import ExportWafangWafangLayout = require('../../../app/model/wafang/wafangLayout');
import ExportWafangWafangOpeningBusiness = require('../../../app/model/wafang/wafangOpeningBusiness');
import ExportWafangWafangOpeningHouse = require('../../../app/model/wafang/wafangOpeningHouse');
import ExportWafangWafangOpeningHouseStatus = require('../../../app/model/wafang/wafangOpeningHouseStatus');
import ExportWafangWafangOpeningOffice = require('../../../app/model/wafang/wafangOpeningOffice');
import ExportWafangWafangProject = require('../../../app/model/wafang/wafangProject');
import ExportWafangWafangProjectTrends = require('../../../app/model/wafang/wafangProjectTrends');
import ExportWafangWafangTag = require('../../../app/model/wafang/wafangTag');
import ExportWafangWafangUser = require('../../../app/model/wafang/wafangUser');
import ExportWafangWafangVideo = require('../../../app/model/wafang/wafangVideo');
declare module 'egg' {
interface IModel {
Default: {
User: ReturnType<typeof ExportDefaultUser>;
}
Wafang: {
WafangAppointment: ReturnType<typeof ExportWafangWafangAppointment>;
WafangBlock: ReturnType<typeof ExportWafangWafangBlock>;
WafangBlockContent: ReturnType<typeof ExportWafangWafangBlockContent>;
WafangCollection: ReturnType<typeof ExportWafangWafangCollection>;
WafangImage: ReturnType<typeof ExportWafangWafangImage>;
WafangImageOpening: ReturnType<typeof ExportWafangWafangImageOpening>;
WafangLayout: ReturnType<typeof ExportWafangWafangLayout>;
WafangOpeningBusiness: ReturnType<typeof ExportWafangWafangOpeningBusiness>;
WafangOpeningHouse: ReturnType<typeof ExportWafangWafangOpeningHouse>;
WafangOpeningHouseStatus: ReturnType<typeof ExportWafangWafangOpeningHouseStatus>;
WafangOpeningOffice: ReturnType<typeof ExportWafangWafangOpeningOffice>;
WafangProject: ReturnType<typeof ExportWafangWafangProject>;
WafangProjectTrends: ReturnType<typeof ExportWafangWafangProjectTrends>;
WafangTag: ReturnType<typeof ExportWafangWafangTag>;
WafangUser: ReturnType<typeof ExportWafangWafangUser>;
WafangVideo: ReturnType<typeof ExportWafangWafangVideo>;
}
}
}
......@@ -7,9 +7,7 @@ type AnyFunc<T = any> = (...args: any[]) => T;
type CanExportFunc = AnyFunc<Promise<any>> | AnyFunc<IterableIterator<any>>;
type AutoInstanceType<T, U = T extends CanExportFunc ? T : T extends AnyFunc ? ReturnType<T> : T> = U extends AnyClass ? InstanceType<U> : U;
import ExportTest from '../../../app/service/Test';
import ExportExcel = require('../../../app/service/excel');
import ExportFile from '../../../app/service/file';
import ExportOutput = require('../../../app/service/output');
import ExportMpEstateAppointment from '../../../app/service/mpEstate/appointment';
import ExportMpEstateList from '../../../app/service/mpEstate/list';
import ExportMpEstateMaterial from '../../../app/service/mpEstate/material';
......@@ -19,9 +17,7 @@ import ExportMpEstateVideo from '../../../app/service/mpEstate/video';
declare module 'egg' {
interface IService {
test: AutoInstanceType<typeof ExportTest>;
excel: AutoInstanceType<typeof ExportExcel>;
file: AutoInstanceType<typeof ExportFile>;
output: AutoInstanceType<typeof ExportOutput>;
mpEstate: {
appointment: AutoInstanceType<typeof ExportMpEstateAppointment>;
list: AutoInstanceType<typeof ExportMpEstateList>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment