Skip to content

I
iBiz商业中心
提交 91f58ef6 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 发布系统代码 [Spring Boot，员工]

上级 9c03285e
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 1738 行增加 和 63 行删除
app_HR/src/authservice/auth-service-register.ts
浏览文件 @ 91f58ef6
......@@ -69,6 +69,7 @@ export class AuthServiceRegister {
this.allAuthService.set('product_product', () => import('@/authservice/product-product/product-product-auth-service'));
this.allAuthService.set('hr_resume_line_type', () => import('@/authservice/hr-resume-line-type/hr-resume-line-type-auth-service'));
this.allAuthService.set('gamification_challenge', () => import('@/authservice/gamification-challenge/gamification-challenge-auth-service'));
this.allAuthService.set('mail_tracking_value', () => import('@/authservice/mail-tracking-value/mail-tracking-value-auth-service'));
this.allAuthService.set('product_category', () => import('@/authservice/product-category/product-category-auth-service'));
this.allAuthService.set('res_partner', () => import('@/authservice/res-partner/res-partner-auth-service'));
this.allAuthService.set('sale_order_line', () => import('@/authservice/sale-order-line/sale-order-line-auth-service'));
......
app_HR/src/authservice/mail-tracking-value/mail-tracking-value-auth-service-base.ts 0 → 100644
浏览文件 @ 91f58ef6
import AuthService from '../auth-service';
/**
* 邮件跟踪值权限服务对象基类
*
* @export
* @class Mail_tracking_valueAuthServiceBase
* @extends {AuthService}
*/
export default class Mail_tracking_valueAuthServiceBase extends AuthService {
/**
* Creates an instance of Mail_tracking_valueAuthServiceBase.
*
* @param {*} [opts={}]
* @memberof Mail_tracking_valueAuthServiceBase
*/
constructor(opts: any = {}) {
super(opts);
}
/**
* 根据当前数据获取实体操作标识
*
* @param {*} mainSateOPPrivs 传入数据操作标识
* @returns {any}
* @memberof Mail_tracking_valueAuthServiceBase
*/
public getOPPrivs(mainSateOPPrivs:any):any{
let curDefaultOPPrivs:any = this.getSysOPPrivs();
let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
if(mainSateOPPrivs){
Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
}
// 统一资源优先
Object.keys(curDefaultOPPrivs).forEach((name:string) => {
if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
}
});
return curDefaultOPPrivs;
}
}
\ No newline at end of file
app_HR/src/authservice/mail-tracking-value/mail-tracking-value-auth-service.ts 0 → 100644
浏览文件 @ 91f58ef6
import Mail_tracking_valueAuthServiceBase from './mail-tracking-value-auth-service-base';
/**
* 邮件跟踪值权限服务对象
*
* @export
* @class Mail_tracking_valueAuthService
* @extends {Mail_tracking_valueAuthServiceBase}
*/
export default class Mail_tracking_valueAuthService extends Mail_tracking_valueAuthServiceBase {
/**
* Creates an instance of Mail_tracking_valueAuthService.
*
* @param {*} [opts={}]
* @memberof Mail_tracking_valueAuthService
*/
constructor(opts: any = {}) {
super(opts);
}
}
\ No newline at end of file
app_HR/src/interface/entity/mail-tracking-value.ts 0 → 100644
浏览文件 @ 91f58ef6
/**
* 邮件跟踪值
*
* @export
* @interface Mail_tracking_value
*/
export interface Mail_tracking_value {
/**
* 字段说明
*
* @returns {*}
* @memberof Mail_tracking_value
*/
field_desc?: any;
/**
* 旧字符值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
old_value_char?: any;
/**
* 最后更新时间
*
* @returns {*}
* @memberof Mail_tracking_value
*/
write_date?: any;
/**
* 新日期时间值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
new_value_datetime?: any;
/**
* 旧货币值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
old_value_monetary?: any;
/**
* tracking_sequence
*
* @returns {*}
* @memberof Mail_tracking_value
*/
tracking_sequence?: any;
/**
* 新字符值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
new_value_char?: any;
/**
* 新文本值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
new_value_text?: any;
/**
* 新货币值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
new_value_monetary?: any;
/**
* 旧日期时间值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
old_value_datetime?: any;
/**
* 最后修改日
*
* @returns {*}
* @memberof Mail_tracking_value
*/
__last_update?: any;
/**
* 创建时间
*
* @returns {*}
* @memberof Mail_tracking_value
*/
create_date?: any;
/**
* 旧整数值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
old_value_integer?: any;
/**
* 旧文本值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
old_value_text?: any;
/**
* 字段类型
*
* @returns {*}
* @memberof Mail_tracking_value
*/
field_type?: any;
/**
* 新整数值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
new_value_integer?: any;
/**
* 显示名称
*
* @returns {*}
* @memberof Mail_tracking_value
*/
display_name?: any;
/**
* 新浮点值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
new_value_float?: any;
/**
* ID
*
* @returns {*}
* @memberof Mail_tracking_value
*/
id?: any;
/**
* 更改的字段
*
* @returns {*}
* @memberof Mail_tracking_value
*/
field?: any;
/**
* 旧浮点值
*
* @returns {*}
* @memberof Mail_tracking_value
*/
old_value_float?: any;
/**
* 最后更新者
*
* @returns {*}
* @memberof Mail_tracking_value
*/
write_uid_text?: any;
/**
* 创建人
*
* @returns {*}
* @memberof Mail_tracking_value
*/
create_uid_text?: any;
/**
* 最后更新者
*
* @returns {*}
* @memberof Mail_tracking_value
*/
write_uid?: any;
/**
* 创建人
*
* @returns {*}
* @memberof Mail_tracking_value
*/
create_uid?: any;
/**
* 邮件消息ID
*
* @returns {*}
* @memberof Mail_tracking_value
*/
mail_message_id?: any;
}
\ No newline at end of file
app_HR/src/locale/lang/en-US.ts
浏览文件 @ 91f58ef6
......@@ -30,6 +30,7 @@ import res_config_settings_en_US from '@locale/lanres/entities/res-config-settin
import product_product_en_US from '@locale/lanres/entities/product-product/product-product_en_US';
import hr_resume_line_type_en_US from '@locale/lanres/entities/hr-resume-line-type/hr-resume-line-type_en_US';
import gamification_challenge_en_US from '@locale/lanres/entities/gamification-challenge/gamification-challenge_en_US';
import mail_tracking_value_en_US from '@locale/lanres/entities/mail-tracking-value/mail-tracking-value_en_US';
import product_category_en_US from '@locale/lanres/entities/product-category/product-category_en_US';
import res_partner_en_US from '@locale/lanres/entities/res-partner/res-partner_en_US';
import sale_order_line_en_US from '@locale/lanres/entities/sale-order-line/sale-order-line_en_US';
......@@ -316,6 +317,7 @@ const data: any = {
product_product: product_product_en_US,
hr_resume_line_type: hr_resume_line_type_en_US,
gamification_challenge: gamification_challenge_en_US,
mail_tracking_value: mail_tracking_value_en_US,
product_category: product_category_en_US,
res_partner: res_partner_en_US,
sale_order_line: sale_order_line_en_US,
......
app_HR/src/locale/lang/zh-CN.ts
浏览文件 @ 91f58ef6
......@@ -30,6 +30,7 @@ import res_config_settings_zh_CN from '@locale/lanres/entities/res-config-settin
import product_product_zh_CN from '@locale/lanres/entities/product-product/product-product_zh_CN';
import hr_resume_line_type_zh_CN from '@locale/lanres/entities/hr-resume-line-type/hr-resume-line-type_zh_CN';
import gamification_challenge_zh_CN from '@locale/lanres/entities/gamification-challenge/gamification-challenge_zh_CN';
import mail_tracking_value_zh_CN from '@locale/lanres/entities/mail-tracking-value/mail-tracking-value_zh_CN';
import product_category_zh_CN from '@locale/lanres/entities/product-category/product-category_zh_CN';
import res_partner_zh_CN from '@locale/lanres/entities/res-partner/res-partner_zh_CN';
import sale_order_line_zh_CN from '@locale/lanres/entities/sale-order-line/sale-order-line_zh_CN';
......@@ -315,6 +316,7 @@ const data: any = {
product_product: product_product_zh_CN,
hr_resume_line_type: hr_resume_line_type_zh_CN,
gamification_challenge: gamification_challenge_zh_CN,
mail_tracking_value: mail_tracking_value_zh_CN,
product_category: product_category_zh_CN,
res_partner: res_partner_zh_CN,
sale_order_line: sale_order_line_zh_CN,
......
app_HR/src/locale/lanres/entities/mail-tracking-value/mail-tracking-value_en_US.ts 0 → 100644
浏览文件 @ 91f58ef6
export default {
fields: {
field_desc: "字段说明",
old_value_char: "旧字符值",
write_date: "最后更新时间",
new_value_datetime: "新日期时间值",
old_value_monetary: "旧货币值",
tracking_sequence: "tracking_sequence",
new_value_char: "新字符值",
new_value_text: "新文本值",
new_value_monetary: "新货币值",
old_value_datetime: "旧日期时间值",
__last_update: "最后修改日",
create_date: "创建时间",
old_value_integer: "旧整数值",
old_value_text: "旧文本值",
field_type: "字段类型",
new_value_integer: "新整数值",
display_name: "显示名称",
new_value_float: "新浮点值",
id: "ID",
field: "更改的字段",
old_value_float: "旧浮点值",
write_uid_text: "最后更新者",
create_uid_text: "创建人",
write_uid: "最后更新者",
create_uid: "创建人",
mail_message_id: "邮件消息ID",
},
};
\ No newline at end of file
app_HR/src/locale/lanres/entities/mail-tracking-value/mail-tracking-value_zh_CN.ts 0 → 100644
浏览文件 @ 91f58ef6
export default {
fields: {
field_desc: "字段说明",
old_value_char: "旧字符值",
write_date: "最后更新时间",
new_value_datetime: "新日期时间值",
old_value_monetary: "旧货币值",
tracking_sequence: "tracking_sequence",
new_value_char: "新字符值",
new_value_text: "新文本值",
new_value_monetary: "新货币值",
old_value_datetime: "旧日期时间值",
__last_update: "最后修改日",
create_date: "创建时间",
old_value_integer: "旧整数值",
old_value_text: "旧文本值",
field_type: "字段类型",
new_value_integer: "新整数值",
display_name: "显示名称",
new_value_float: "新浮点值",
id: "ID",
field: "更改的字段",
old_value_float: "旧浮点值",
write_uid_text: "最后更新者",
create_uid_text: "创建人",
write_uid: "最后更新者",
create_uid: "创建人",
mail_message_id: "邮件消息ID",
},
};
\ No newline at end of file
app_HR/src/mock/index.ts
浏览文件 @ 91f58ef6
......@@ -37,6 +37,7 @@ import './entity/res-config-settingss/res-config-settingss';
import './entity/product-products/product-products';
import './entity/hr-resume-line-types/hr-resume-line-types';
import './entity/gamification-challenges/gamification-challenges';
import './entity/mail-tracking-values/mail-tracking-values';
import './entity/product-categorys/product-categorys';
import './entity/res-partners/res-partners';
import './entity/sale-order-lines/sale-order-lines';
......
app_HR/src/pages/odoo-hr/hr-employee-master-grid-view/hr-employee-master-grid-view.html
浏览文件 @ 91f58ef6
<studio-view-style2 viewName="hr_employeemastergridview" viewTitle="首选表格视图" class='degridview hr-employee-master-grid-view'>
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<i-input slot='quickSearch' clearable v-show="!isExpandSearchForm" v-model="query" placeholder="名称" search @on-search="onSearch($event)"/>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>
......
app_HR/src/service/entity-service-register.ts
浏览文件 @ 91f58ef6
......@@ -69,6 +69,7 @@ export class EntityServiceRegister {
this.allEntityService.set('product_product', () => import('@/service/product-product/product-product-service'));
this.allEntityService.set('hr_resume_line_type', () => import('@/service/hr-resume-line-type/hr-resume-line-type-service'));
this.allEntityService.set('gamification_challenge', () => import('@/service/gamification-challenge/gamification-challenge-service'));
this.allEntityService.set('mail_tracking_value', () => import('@/service/mail-tracking-value/mail-tracking-value-service'));
this.allEntityService.set('product_category', () => import('@/service/product-category/product-category-service'));
this.allEntityService.set('res_partner', () => import('@/service/res-partner/res-partner-service'));
this.allEntityService.set('sale_order_line', () => import('@/service/sale-order-line/sale-order-line-service'));
......
app_HR/src/service/mail-message/mail-message-service-base.ts
浏览文件 @ 91f58ef6
......@@ -59,6 +59,7 @@ export default class Mail_messageServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/mail_messages`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_mail_tracking_values',JSON.stringify(res.data.mail_tracking_values?res.data.mail_tracking_values:[]));
return res;
}
......
app_HR/src/service/mail-tracking-value/mail-tracking-value-service.ts 0 → 100644
浏览文件 @ 91f58ef6
import { Http } from '@/utils';
import { Util } from '@/utils';
import Mail_tracking_valueServiceBase from './mail-tracking-value-service-base';
/**
* 邮件跟踪值服务对象
*
* @export
* @class Mail_tracking_valueService
* @extends {Mail_tracking_valueServiceBase}
*/
export default class Mail_tracking_valueService extends Mail_tracking_valueServiceBase {
/**
* Creates an instance of Mail_tracking_valueService.
*
* @param {*} [opts={}]
* @memberof Mail_tracking_valueService
*/
constructor(opts: any = {}) {
super(opts);
}
}
\ No newline at end of file
app_HR/src/uiservice/mail-tracking-value/mail-tracking-value-ui-service-base.ts 0 → 100644
浏览文件 @ 91f58ef6
import { Environment } from '@/environments/environment';
import { UIActionTool,Util } from '@/utils';
import UIService from '../ui-service';
import { Subject } from 'rxjs';
import Mail_tracking_valueService from '@/service/mail-tracking-value/mail-tracking-value-service';
import Mail_tracking_valueAuthService from '@/authservice/mail-tracking-value/mail-tracking-value-auth-service';
/**
* 邮件跟踪值UI服务对象基类
*
* @export
* @class Mail_tracking_valueUIServiceBase
*/
export default class Mail_tracking_valueUIServiceBase extends UIService {
/**
* 是否支持工作流
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public isEnableWorkflow:boolean = false;
/**
* 是否支持实体主状态
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public isEnableDEMainState:boolean = false;
/**
* 当前UI服务对应的数据服务对象
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public dataService:Mail_tracking_valueService = new Mail_tracking_valueService();
/**
* 所有关联视图
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public allViewMap: Map<string, Object> = new Map();
/**
* 状态值
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public stateValue: number = 0;
/**
* 状态属性
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public stateField: string = "";
/**
* 主状态属性集合
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public mainStateFields:Array<any> = [];
/**
* 主状态集合Map
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public allDeMainStateMap:Map<string,string> = new Map();
/**
* 主状态操作标识Map
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public allDeMainStateOPPrivsMap:Map<string,any> = new Map();
/**
* Creates an instance of Mail_tracking_valueUIServiceBase.
*
* @param {*} [opts={}]
* @memberof Mail_tracking_valueUIServiceBase
*/
constructor(opts: any = {}) {
super(opts);
this.authService = new Mail_tracking_valueAuthService(opts);
this.initViewMap();
this.initDeMainStateMap();
this.initDeMainStateOPPrivsMap();
}
/**
* 初始化视图Map
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public initViewMap(){
}
/**
* 初始化主状态集合
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public initDeMainStateMap(){
}
/**
* 初始化主状态操作标识
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public initDeMainStateOPPrivsMap(){
}
/**
* 获取指定数据的重定向页面
*
* @param srfkey 数据主键
* @param isEnableWorkflow 重定向视图是否需要处理流程中的数据
* @memberof Mail_tracking_valueUIServiceBase
*/
public async getRDAppView(srfkey:string,isEnableWorkflow:boolean){
this.isEnableWorkflow = isEnableWorkflow;
// 进行数据查询
let result:any = await this.dataService.Get({mail_tracking_value:srfkey});
const curData:any = result.data;
//判断当前数据模式,默认为true，todo
const iRealDEModel:boolean = true;
let bDataInWF:boolean = false;
let bWFMode:any = false;
// 计算数据模式
if (this.isEnableWorkflow) {
bDataInWF = await this.dataService.testDataInWF({stateValue:this.stateValue,stateField:this.stateField},curData);
if (bDataInWF) {
bDataInWF = true;
bWFMode = await this.dataService.testUserExistWorklist(null,curData);
}
}
let strPDTViewParam:string = await this.getDESDDEViewPDTParam(curData, bDataInWF, bWFMode);
//若不是当前数据模式，处理strPDTViewParam，todo
//查找视图
//返回视图
return this.allViewMap.get(strPDTViewParam);
}
/**
* 获取实际的数据类型
*
* @memberof Mail_tracking_valueUIServiceBase
*/
public getRealDEType(entity:any){
}
/**
* 获取实体单数据实体视图预定义参数
*
* @param curData 当前数据
* @param bDataInWF 是否有数据在工作流中
* @param bWFMode 是否工作流模式
* @memberof Mail_tracking_valueUIServiceBase
*/
public async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
let strPDTParam:string = '';
if (bDataInWF) {
// 判断数据是否在流程中
}
//多表单，todo
const multiFormDEField:string|null =null;
if (multiFormDEField) {
const objFormValue:string = curData[multiFormDEField];
if(!Environment.isAppMode){
return 'MOBEDITVIEW:'+objFormValue;
}
return 'EDITVIEW:'+objFormValue;
}
const stateTag = this.getDEMainStateTag(curData);
if(!Environment.isAppMode){
if (stateTag) {
return `MOBEDITVIEW:MSTAG:${stateTag}`;
}
return 'MOBEDITVIEW:';
}
if(stateTag){
return `EDITVIEW:MSTAG:${stateTag}`;
}
return 'EDITVIEW:';
}
/**
* 获取数据对象的主状态标识
*
* @param curData 当前数据
* @memberof Mail_tracking_valueUIServiceBase
*/
public getDEMainStateTag(curData:any){
if(this.mainStateFields.length === 0) return null;
this.mainStateFields.forEach((singleMainField:any) =>{
if (!(singleMainField in curData)) {
console.warn(`当前数据对象不包含属性「${singleMainField}」，根据「${singleMainField}」属性进行的主状态计算默认为空值`);
}
})
for (let i = 0; i <= 1; i++) {
let strTag:string = (curData[this.mainStateFields[0]] != null && curData[this.mainStateFields[0]] !== "")?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
if (this.mainStateFields.length >= 2) {
for (let j = 0; j <= 1; j++) {
let strTag2:string = (curData[this.mainStateFields[1]] != null && curData[this.mainStateFields[1]] !== "")?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
if (this.mainStateFields.length >= 3) {
for (let k = 0; k <= 1; k++) {
let strTag3:string = (curData[this.mainStateFields[2]] != null && curData[this.mainStateFields[2]] !== "")?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
// 判断是否存在
return this.allDeMainStateMap.get(strTag3);
}
}else{
return this.allDeMainStateMap.get(strTag2);
}
}
}else{
return this.allDeMainStateMap.get(strTag);
}
}
return null;
}
/**
* 获取数据对象当前操作标识
*
* @param data 当前数据
* @memberof Mail_tracking_valueUIServiceBase
*/
public getDEMainStateOPPrivs(data:any){
const stateTag = this.getDEMainStateTag(data);
if (stateTag) {
return this.allDeMainStateOPPrivsMap.get(stateTag);
} else {
return null;
}
}
/**
* 获取数据对象所有的操作标识
*
* @param data 当前数据
* @memberof Mail_tracking_valueUIServiceBase
*/
public getAllOPPrivs(data:any){
return this.authService.getOPPrivs(this.getDEMainStateOPPrivs(data));
}
}
\ No newline at end of file
app_HR/src/uiservice/mail-tracking-value/mail-tracking-value-ui-service.ts 0 → 100644
浏览文件 @ 91f58ef6
import Mail_tracking_valueUIServiceBase from './mail-tracking-value-ui-service-base';
/**
* 邮件跟踪值UI服务对象
*
* @export
* @class Mail_tracking_valueUIService
*/
export default class Mail_tracking_valueUIService extends Mail_tracking_valueUIServiceBase {
/**
* Creates an instance of Mail_tracking_valueUIService.
*
* @param {*} [opts={}]
* @memberof Mail_tracking_valueUIService
*/
constructor(opts: any = {}) {
super(opts);
}
}
\ No newline at end of file
app_HR/src/uiservice/ui-service-register.ts
浏览文件 @ 91f58ef6
......@@ -69,6 +69,7 @@ export class UIServiceRegister {
this.allUIService.set('product_product', () => import('@/uiservice/product-product/product-product-ui-service'));
this.allUIService.set('hr_resume_line_type', () => import('@/uiservice/hr-resume-line-type/hr-resume-line-type-ui-service'));
this.allUIService.set('gamification_challenge', () => import('@/uiservice/gamification-challenge/gamification-challenge-ui-service'));
this.allUIService.set('mail_tracking_value', () => import('@/uiservice/mail-tracking-value/mail-tracking-value-ui-service'));
this.allUIService.set('product_category', () => import('@/uiservice/product-category/product-category-ui-service'));
this.allUIService.set('res_partner', () => import('@/uiservice/res-partner/res-partner-ui-service'));
this.allUIService.set('sale_order_line', () => import('@/uiservice/sale-order-line/sale-order-line-ui-service'));
......
app_HR/src/widgets/hr-employee/tree-treeview/tree-treeview-service.ts
浏览文件 @ 91f58ef6
......@@ -578,7 +578,7 @@ export default class TreeService extends ControlService {
Object.assign(treeNode, { iconcls: 'fa fa-cube' });
Object.assign(treeNode, { expanded: filter.isAutoexpand });
Object.assign(treeNode, { expanded: true });
Object.assign(treeNode, { leaf: false });
Object.assign(treeNode, { nodeid: treeNode.srfkey });
Object.assign(treeNode, { nodeid2: filter.strRealNodeId });
......
businesscentral-app/businesscentral-app-hr/src/main/docker/Dockerfile
浏览文件 @ 91f58ef6
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-hr.jar
EXPOSE 31130
EXPOSE 8080
ADD businesscentral-app-hr.jar /businesscentral-app-hr.jar
businesscentral-app/businesscentral-app-hr/src/main/docker/businesscentral-app-hr.yaml
浏览文件 @ 91f58ef6
......@@ -3,25 +3,9 @@ services:
businesscentral-app-hr:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-hr:latest
ports:
- "31130:31130"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=31130
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=odoo
- SPRING_DATASOURCE_PASSWORD=odoo
- SPRING_DATASOURCE_URL=jdbc:postgresql://172.16.240.158:15432/odoo
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=org.postgresql.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=odoo
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
businesscentral-app/businesscentral-app-hr/src/main/resources/application-hr-prod.yml
浏览文件 @ 91f58ef6
......@@ -131,6 +131,10 @@ zuul:
path: /gamification_challenges/**
serviceId: ${ibiz.ref.service.ibizbusinesscentral-core:ibizbusinesscentral-core}
stripPrefix: false
mail_tracking_value:
path: /mail_tracking_values/**
serviceId: ${ibiz.ref.service.ibizbusinesscentral-core:ibizbusinesscentral-core}
stripPrefix: false
product_category:
path: /product_categories/**
serviceId: ${ibiz.ref.service.ibizbusinesscentral-core:ibizbusinesscentral-core}
......
businesscentral-app/businesscentral-app-invoice/src/main/docker/Dockerfile
浏览文件 @ 91f58ef6
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-invoice.jar
EXPOSE 31130
EXPOSE 8080
ADD businesscentral-app-invoice.jar /businesscentral-app-invoice.jar
businesscentral-app/businesscentral-app-invoice/src/main/docker/businesscentral-app-invoice.yaml
浏览文件 @ 91f58ef6
......@@ -3,25 +3,9 @@ services:
businesscentral-app-invoice:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-invoice:latest
ports:
- "31130:31130"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=31130
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=odoo
- SPRING_DATASOURCE_PASSWORD=odoo
- SPRING_DATASOURCE_URL=jdbc:postgresql://172.16.240.158:15432/odoo
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=org.postgresql.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=odoo
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
businesscentral-app/businesscentral-app-purchase/src/main/docker/Dockerfile
浏览文件 @ 91f58ef6
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-purchase.jar
EXPOSE 31130
EXPOSE 8080
ADD businesscentral-app-purchase.jar /businesscentral-app-purchase.jar
businesscentral-app/businesscentral-app-purchase/src/main/docker/businesscentral-app-purchase.yaml
浏览文件 @ 91f58ef6
......@@ -3,25 +3,9 @@ services:
businesscentral-app-purchase:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-purchase:latest
ports:
- "31130:31130"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=31130
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=odoo
- SPRING_DATASOURCE_PASSWORD=odoo
- SPRING_DATASOURCE_URL=jdbc:postgresql://172.16.240.158:15432/odoo
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=org.postgresql.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=odoo
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
config.xml
浏览文件 @ 91f58ef6
......@@ -37,11 +37,6 @@
git clone -b master $para2 ibizbusinesscentral/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizbusinesscentral/
mvn clean package -Phr
cd businesscentral-app/businesscentral-app-hr
mvn -Phr docker:build
mvn -Phr docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-app-hr.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或