Skip to content

G
gjjh5
Commit 024d7c0a authored by 姜登's avatar 姜登
Browse files
Options

gjj

parent ba7d9684
Pipeline #3989 passed with stage
    in 50 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 52 additions and 51 deletions
    app/extend/application.js
    View file @ 024d7c0a
    ...@@ -35,11 +35,11 @@ class Cache { ...@@ -35,11 +35,11 @@ class Cache {
    jsonText = jsonText.substr(0, 125) + '...'; jsonText = jsonText.substr(0, 125) + '...';
    } }
    } }
    this.app.logger.info(`[cache](${+new Date() - startTime}ms) ${this.name}.${key}: ${jsonText}`); this.app.logger.info(`[cache] get (${+new Date() - startTime}ms) ${this.name}.${key}: ${jsonText}`);
    return ret; return ret;
    } }
    async set(key, value, ttl = 60) { async set(key, value, ttl = 60) {
    this.app.logger.info(`[cache](ms)${key}: ${value}`); this.app.logger.info(`[cache] set (ms)${this.name}.${key}: ${value}`);
    return await this._set(key, value, ttl); return await this._set(key, value, ttl);
    } }
    async del(key){ async del(key){
    ......
    app/service/cache.js
    View file @ 024d7c0a
    ...@@ -12,7 +12,7 @@ class CacheService extends Service { ...@@ -12,7 +12,7 @@ class CacheService extends Service {
    } }
    /** /**
    * 将taskId状态缓存到cache和数据库 * 将taskId状态缓存到redis和数据库
    * @param {Object} key taskId * @param {Object} key taskId
    * - value: 状态 提示信息 status 、note={} * - value: 状态 提示信息 status 、note={}
    * - exprie: 过期时间 * - exprie: 过期时间
    ...@@ -20,9 +20,9 @@ class CacheService extends Service { ...@@ -20,9 +20,9 @@ class CacheService extends Service {
    async set({ key, value = {}, exprie = 300 }) { async set({ key, value = {}, exprie = 300 }) {
    const { ctx, app, taskPrefix } = this; const { ctx, app, taskPrefix } = this;
    const data = await app.cache.get(taskPrefix + key); const data = await app.redis.get(taskPrefix + key);
    if (!data || (data && data.status !== 'success')) { if (!data || (data && data.status !== 'success')) {
    await app.cache.set(taskPrefix + key, JSON.stringify(value), exprie); await app.redis.set(taskPrefix + key, JSON.stringify(value), 'EX', exprie);
    } }
    const order = await ctx.model.TaskStatus.findOne({ const order = await ctx.model.TaskStatus.findOne({
    ...@@ -37,16 +37,16 @@ class CacheService extends Service { ...@@ -37,16 +37,16 @@ class CacheService extends Service {
    } }
    /** /**
    * 获取task状态 优先cache * 获取task状态 优先redis
    * @param {Object} key taskId * @param {Object} key taskId
    * @return {Object} status note * @return {Object} status note
    */ */
    async get({ key }) { async get({ key }) {
    const { ctx, app, taskPrefix } = this; const { ctx, app, taskPrefix } = this;
    const data = await app.cache.get(taskPrefix + key); const data = await app.redis.get(taskPrefix + key);
    if (data) { if (data) {
    ctx.logger.info(`【Cache】get From cache ${key} data:`, data); ctx.logger.info(`【Cache】get From redis ${key} data:`, data);
    return JSON.parse(data); return JSON.parse(data);
    } }
    const order = await ctx.model.TaskStatus.findOne({ const order = await ctx.model.TaskStatus.findOne({
    ......
    app/service/partner.js
    View file @ 024d7c0a
    ...@@ -12,13 +12,13 @@ class PartnerService extends Service { ...@@ -12,13 +12,13 @@ class PartnerService extends Service {
    async fetchTheme(appKey) { async fetchTheme(appKey) {
    const { ctx, partnerAPI: { fetchTheme, host, redisThemePrefix } } = this; const { ctx, partnerAPI: { fetchTheme, host, redisThemePrefix } } = this;
    if (appKey) { if (appKey) {
    const data = await this.app.cache.get(redisThemePrefix + appKey); const data = await this.app.redis.get(redisThemePrefix + appKey);
    if (data) { if (data) {
    try { try {
    return JSON.parse(data); return JSON.parse(data);
    } catch (err) { } catch (err) {
    ctx.logger.error('【Scripts】fetchParams', redisThemePrefix + appKey, 'result:', data, err); ctx.logger.error('【Scripts】fetchParams', redisThemePrefix + appKey, 'result:', data, err);
    await this.app.cache.del(redisThemePrefix + appKey); await this.app.redis.del(redisThemePrefix + appKey);
    } }
    } }
    } }
    ...@@ -30,7 +30,7 @@ class PartnerService extends Service { ...@@ -30,7 +30,7 @@ class PartnerService extends Service {
    }); });
    ctx.logger.info(`【Partner】 fetchTheme ${host + fetchTheme}/${appKey}`, ret.data); ctx.logger.info(`【Partner】 fetchTheme ${host + fetchTheme}/${appKey}`, ret.data);
    if (ret.status === 200 && ret.data && ret.data.appKey === appKey) { if (ret.status === 200 && ret.data && ret.data.appKey === appKey) {
    await this.app.cache.set(redisThemePrefix + appKey, JSON.stringify(ret.data), 300); await this.app.redis.set(redisThemePrefix + appKey, JSON.stringify(ret.data), 'EX', 300);
    } }
    return ret.data; return ret.data;
    } }
    ...@@ -39,13 +39,13 @@ class PartnerService extends Service { ...@@ -39,13 +39,13 @@ class PartnerService extends Service {
    const { ctx, partnerAPI: { fetchScripts, host, redisScriptsPrefix } } = this; const { ctx, partnerAPI: { fetchScripts, host, redisScriptsPrefix } } = this;
    if (appKey) { if (appKey) {
    const data = await this.app.cache.get(redisScriptsPrefix + appKey); const data = await this.app.redis.get(redisScriptsPrefix + appKey);
    if (data) { if (data) {
    try { try {
    return JSON.parse(data); return JSON.parse(data);
    } catch (err) { } catch (err) {
    ctx.logger.error('【Partner】 fetchScripts', redisScriptsPrefix + appKey, 'result:', JSON.stringify(data), err); ctx.logger.error('【Partner】 fetchScripts', redisScriptsPrefix + appKey, 'result:', JSON.stringify(data), err);
    await this.app.cache.del(redisScriptsPrefix + appKey); await this.app.redis.del(redisScriptsPrefix + appKey);
    } }
    } }
    } }
    ...@@ -58,19 +58,19 @@ class PartnerService extends Service { ...@@ -58,19 +58,19 @@ class PartnerService extends Service {
    }); });
    ctx.logger.info(`【Partner】 fetchTheme ${url}`, JSON.stringify(ret.data)); ctx.logger.info(`【Partner】 fetchTheme ${url}`, JSON.stringify(ret.data));
    if (ret.status === 200 && ret.data && ret.data.id === appKey) { if (ret.status === 200 && ret.data && ret.data.id === appKey) {
    await this.app.cache.set(redisScriptsPrefix + appKey, JSON.stringify(ret.data), 300); await this.app.redis.set(redisScriptsPrefix + appKey, JSON.stringify(ret.data), 'EX', 300);
    } }
    return ret.data; return ret.data;
    } }
    async fetchAgreements(id) { async fetchAgreements(id) {
    const { ctx, partnerAPI: { fetchAgreements, host, redisAgreementsPrefix } } = this; const { ctx, partnerAPI: { fetchAgreements, host, redisAgreementsPrefix } } = this;
    const data = await this.app.cache.get(redisAgreementsPrefix + id); const data = await this.app.redis.get(redisAgreementsPrefix + id);
    if (data) { if (data) {
    try { try {
    return JSON.parse(data); return JSON.parse(data);
    } catch (err) { } catch (err) {
    ctx.logger.error('【Partner】 fetchAgreements', redisAgreementsPrefix + id, 'result:', JSON.stringify(data), err); ctx.logger.error('【Partner】 fetchAgreements', redisAgreementsPrefix + id, 'result:', JSON.stringify(data), err);
    await this.app.cache.del(redisAgreementsPrefix + id); await this.app.redis.del(redisAgreementsPrefix + id);
    } }
    } }
    const url = `${host + fetchAgreements}/${id}`; const url = `${host + fetchAgreements}/${id}`;
    ...@@ -82,7 +82,7 @@ class PartnerService extends Service { ...@@ -82,7 +82,7 @@ class PartnerService extends Service {
    }); });
    ctx.logger.info(`【Partner】 fetchAgreements ${url}`, JSON.stringify(ret.data)); ctx.logger.info(`【Partner】 fetchAgreements ${url}`, JSON.stringify(ret.data));
    if (ret.status === 200 && ret.data && ret.data.id === id) { if (ret.status === 200 && ret.data && ret.data.id === id) {
    await this.app.cache.set(redisAgreementsPrefix + appKey, JSON.stringify(ret.data), 300); await this.app.redis.set(redisAgreementsPrefix + appKey, JSON.stringify(ret.data), 'EX', 300);
    } }
    return ret.data; return ret.data;
    } }
    ......
    app/service/scripts.js
    View file @ 024d7c0a
    ...@@ -20,13 +20,13 @@ class ScriptsService extends Service { ...@@ -20,13 +20,13 @@ class ScriptsService extends Service {
    async fetchScripts() { async fetchScripts() {
    const { baseURL, fetchScriptsUrl, redisScriptsKey, ctx } = this; const { baseURL, fetchScriptsUrl, redisScriptsKey, ctx } = this;
    const data = await this.app.cache.get(redisScriptsKey); const data = await this.app.redis.get(redisScriptsKey);
    if (data) { if (data) {
    try { try {
    return JSON.parse(data); return JSON.parse(data);
    } catch (err) { } catch (err) {
    ctx.logger.error('【Scripts】fetchScriptsFromRedis', 'result:', data, err); ctx.logger.error('【Scripts】fetchScriptsFromRedis', 'result:', data, err);
    await this.app.cache.del(redisScriptsKey); await this.app.redis.del(redisScriptsKey);
    } }
    } }
    const result = await ctx.curl(baseURL + fetchScriptsUrl, { const result = await ctx.curl(baseURL + fetchScriptsUrl, {
    ...@@ -37,20 +37,20 @@ class ScriptsService extends Service { ...@@ -37,20 +37,20 @@ class ScriptsService extends Service {
    }); });
    ctx.logger.info(`【Scripts】fetchScripts,${baseURL + fetchScriptsUrl}`, 'result:', result.data); ctx.logger.info(`【Scripts】fetchScripts,${baseURL + fetchScriptsUrl}`, 'result:', result.data);
    if (result.data && result.data.length > 0) { if (result.data && result.data.length > 0) {
    await this.app.cache.set(redisScriptsKey, JSON.stringify(result.data), 300); await this.app.redis.set(redisScriptsKey, JSON.stringify(result.data), 'EX', 300);
    } }
    return result.data; return result.data;
    } }
    async fetchOneScripts(scriptId) { async fetchOneScripts(scriptId) {
    const { baseURL, fetchOneScriptUrl, redisScriptListKey, ctx } = this; const { baseURL, fetchOneScriptUrl, redisScriptListKey, ctx } = this;
    const data = await this.app.cache.get(redisScriptListKey + scriptId); const data = await this.app.redis.get(redisScriptListKey + scriptId);
    if (data) { if (data) {
    try { try {
    return JSON.parse(data); return JSON.parse(data);
    } catch (err) { } catch (err) {
    ctx.logger.error('【Scripts】fetchOneScriptsFromRedis', 'result:', data, err); ctx.logger.error('【Scripts】fetchOneScriptsFromRedis', 'result:', data, err);
    await this.app.cache.del(redisScriptListKey + scriptId); await this.app.redis.del(redisScriptListKey + scriptId);
    } }
    } }
    const result = await ctx.curl(baseURL + fetchOneScriptUrl + '/' + scriptId, { const result = await ctx.curl(baseURL + fetchOneScriptUrl + '/' + scriptId, {
    ...@@ -60,7 +60,7 @@ class ScriptsService extends Service { ...@@ -60,7 +60,7 @@ class ScriptsService extends Service {
    contentType: 'json', contentType: 'json',
    }); });
    if (result.data && (String(result.data.id) === scriptId)) { if (result.data && (String(result.data.id) === scriptId)) {
    await this.app.cache.set(redisScriptListKey + scriptId, JSON.stringify(result.data), 60); await this.app.redis.set(redisScriptListKey + scriptId, JSON.stringify(result.data), 'EX', 60);
    } }
    return result.data; return result.data;
    } }
    ...@@ -68,13 +68,13 @@ class ScriptsService extends Service { ...@@ -68,13 +68,13 @@ class ScriptsService extends Service {
    async fetchParams(refresh = false) { async fetchParams(refresh = false) {
    const { baseURL, fetchParamsInfoUrl, redisParamsKey, ctx } = this; const { baseURL, fetchParamsInfoUrl, redisParamsKey, ctx } = this;
    if (!refresh) { if (!refresh) {
    const data = await this.app.cache.get(redisParamsKey); const data = await this.app.redis.get(redisParamsKey);
    if (data) { if (data) {
    try { try {
    return JSON.parse(data); return JSON.parse(data);
    } catch (err) { } catch (err) {
    ctx.logger.error('【Scripts】fetchParams', 'result:', data, err); ctx.logger.error('【Scripts】fetchParams', 'result:', data, err);
    await this.app.cache.del(redisParamsKey); await this.app.redis.del(redisParamsKey);
    } }
    } }
    } }
    ...@@ -87,7 +87,7 @@ class ScriptsService extends Service { ...@@ -87,7 +87,7 @@ class ScriptsService extends Service {
    }); });
    ctx.logger.info(`【Scripts】fetchParams,${baseURL + fetchParamsInfoUrl}`, 'result:', result.data); ctx.logger.info(`【Scripts】fetchParams,${baseURL + fetchParamsInfoUrl}`, 'result:', result.data);
    if (result.data && result.data.length > 0) { if (result.data && result.data.length > 0) {
    await this.app.cache.set(redisParamsKey, JSON.stringify(result.data), 300); await this.app.redis.set(redisParamsKey, JSON.stringify(result.data), 'EX', 300);
    } }
    return result.data; return result.data;
    } }
    ......
    config/config.local.js
    View file @ 024d7c0a
    ...@@ -6,14 +6,14 @@ module.exports = () => { ...@@ -6,14 +6,14 @@ module.exports = () => {
    config.projectRootPath = '/gjjh5'; config.projectRootPath = '/gjjh5';
    // config.redis = { config.redis = {
    // client: { client: {
    // port: 6379, port: 6379,
    // host: '127.0.0.1', host: '127.0.0.1',
    // password: 'DEV8redis', password: 'DEV8redis',
    // db: 0, db: 0,
    // }, },
    // }; };
    config.taskAPI = { config.taskAPI = {
    host: 'http://tm.51gjj.com:4821', host: 'http://tm.51gjj.com:4821',
    fetchHubsUrl: '', fetchHubsUrl: '',
    ...@@ -74,8 +74,8 @@ module.exports = () => { ...@@ -74,8 +74,8 @@ module.exports = () => {
    fecthHub: 'URANUS.HF.HUBS.LOCK', fecthHub: 'URANUS.HF.HUBS.LOCK',
    fecteToken: 'URANUS.HF.TOKEN.LOCK', fecteToken: 'URANUS.HF.TOKEN.LOCK',
    token: 'URANUS.HF.TOKEN', token: 'URANUS.HF.TOKEN',
    fecthParnters: 'URANUS.PARNTERS.LOCK', fecthParnters: 'URANUS.HF.PARNTERS.LOCK',
    taskPrefix: 'URANUS.TASK', taskPrefix: 'URANUS.HF.TASK',
    }; };
    config.sequelize = { config.sequelize = {
    ......
    config/config.prod.js
    View file @ 024d7c0a
    ...@@ -9,14 +9,14 @@ module.exports = () => { ...@@ -9,14 +9,14 @@ module.exports = () => {
    }; };
    config.projectRootPath = '/gjjh5'; config.projectRootPath = '/gjjh5';
    // config.redis = { config.redis = {
    // client: { client: {
    // port: 6379, port: 6379,
    // host: process.env.REDIS_HOST, host: process.env.REDIS_HOST,
    // password: 'DEV8redis', password: process.env.REDIS_PWD || 'DEV8redis',
    // db: 0, db: 0,
    // }, },
    // }; };
    config.taskAPI = { config.taskAPI = {
    host: process.env.TASKAPI_HOST || 'http://tm.51gjj.com:4821', host: process.env.TASKAPI_HOST || 'http://tm.51gjj.com:4821',
    fetchHubsUrl: '', fetchHubsUrl: '',
    ...@@ -88,7 +88,7 @@ module.exports = () => { ...@@ -88,7 +88,7 @@ module.exports = () => {
    delegate: 'model', delegate: 'model',
    baseDir: 'model', baseDir: 'model',
    dialect: 'mysql', dialect: 'mysql',
    host: process.env.MYSQL_PACHONG_HOST || 'rm-bp1272001633qc0x9.mysql.rds.aliyuncs.com', host: process.env.MYSQL_PACHONG_HOST || 'rm-bp1272001633qc0x9o.mysql.rds.aliyuncs.com',
    database: process.env.MYSQL_DATA_SERVER_DB_NAME || 'data_service_dev', database: process.env.MYSQL_DATA_SERVER_DB_NAME || 'data_service_dev',
    username: process.env.MYSQL_USER || 'hexin', username: process.env.MYSQL_USER || 'hexin',
    password: process.env.MYSQL_PWD || 'gYUHszn9#q', password: process.env.MYSQL_PWD || 'gYUHszn9#q',
    ...@@ -99,7 +99,7 @@ module.exports = () => { ...@@ -99,7 +99,7 @@ module.exports = () => {
    delegate: 'cusPro', delegate: 'cusPro',
    baseDir: 'model', baseDir: 'model',
    dialect: 'mysql', dialect: 'mysql',
    host: process.env.MYSQL_PACHONG_HOST || 'rm-bp1272001633qc0x9.mysql.rds.aliyuncs.com', host: process.env.MYSQL_PACHONG_HOST || 'rm-bp1272001633qc0x9o.mysql.rds.aliyuncs.com',
    database: process.env.MYSQL_JAVA_DB_NAME || 'java_open_platform', database: process.env.MYSQL_JAVA_DB_NAME || 'java_open_platform',
    username: process.env.MYSQL_USER || 'hexin', username: process.env.MYSQL_USER || 'hexin',
    password: process.env.MYSQL_PWD || 'gYUHszn9#q', password: process.env.MYSQL_PWD || 'gYUHszn9#q',
    ......
    config/plugin.js
    View file @ 024d7c0a
    ...@@ -13,10 +13,10 @@ exports.sequelize = { ...@@ -13,10 +13,10 @@ exports.sequelize = {
    package: 'egg-sequelize', package: 'egg-sequelize',
    }; };
    // exports.redis = { exports.redis = {
    // enable: true, enable: true,
    // package: 'egg-redis', package: 'egg-redis',
    // }; };
    exports.routerPlus = { exports.routerPlus = {
    enable: true, enable: true,
    ......
    package.json
    View file @ 024d7c0a
    ...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
    "egg": "^2.2.1", "egg": "^2.2.1",
    "egg-cors": "^2.1.1", "egg-cors": "^2.1.1",
    "egg-mysql": "^3.0.0", "egg-mysql": "^3.0.0",
    "egg-redis": "^2.3.0",
    "egg-router-plus": "^1.3.0", "egg-router-plus": "^1.3.0",
    "egg-scripts": "^2.5.0", "egg-scripts": "^2.5.0",
    "egg-sequelize": "^4.2.0", "egg-sequelize": "^4.2.0",
    ...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
    "start": "egg-scripts start --daemon --title=egg-server-hf_h5_server", "start": "egg-scripts start --daemon --title=egg-server-hf_h5_server",
    "stop": "egg-scripts stop --title=egg-server-hf_h5_server", "stop": "egg-scripts stop --title=egg-server-hf_h5_server",
    "docker": "eggctl start --title=egg-server-hf_h5_serverr", "docker": "eggctl start --title=egg-server-hf_h5_serverr",
    "dev": "egg-bin dev", "dev": "egg-bin dev --workers=4",
    "debug": "egg-bin debug", "debug": "egg-bin debug",
    "test": "npm run lint -- --fix && npm run test-local", "test": "npm run lint -- --fix && npm run test-local",
    "test-local": "egg-bin test", "test-local": "egg-bin test",
    ......
    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