Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz企业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz企业中心
提交
820410a1
提交
820410a1
编写于
4年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lab_gzf 部署微服务接口
上级
ea2c0df4
master
无相关合并请求
变更
9
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
59 行增加
和
58 行删除
+59
-58
Dockerfile
...esscentral-app-businesscentral/src/main/docker/Dockerfile
+1
-1
businesscentral-app-businesscentral.yaml
.../src/main/docker/businesscentral-app-businesscentral.yaml
+1
-15
PriceLevel.java
...izlab/businesscentral/core/product/domain/PriceLevel.java
+2
-2
PriceLevelSearchContext.java
...scentral/core/product/filter/PriceLevelSearchContext.java
+1
-1
h2_table.xml
...esscentral-core/src/main/resources/liquibase/h2_table.xml
+32
-32
ProductMapper.xml
...c/main/resources/mapper/product/product/ProductMapper.xml
+1
-0
Dockerfile
...esscentral-provider-centralapi/src/main/docker/Dockerfile
+1
-1
businesscentral-provider-centralapi.yaml
.../src/main/docker/businesscentral-provider-centralapi.yaml
+15
-1
config.xml
config.xml
+5
-5
未找到文件。
businesscentral-app/businesscentral-app-businesscentral/src/main/docker/Dockerfile
浏览文件 @
820410a1
...
...
@@ -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-businesscentral.jar
EXPOSE
1032
0
EXPOSE
808
0
ADD
businesscentral-app-businesscentral.jar /businesscentral-app-businesscentral.jar
This diff is collapsed.
Click to expand it.
businesscentral-app/businesscentral-app-businesscentral/src/main/docker/businesscentral-app-businesscentral.yaml
浏览文件 @
820410a1
...
...
@@ -3,23 +3,9 @@ services:
businesscentral-app-businesscentral
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-businesscentral:latest
ports
:
-
"
10320:1032
0"
-
"
8080:808
0"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=10320
-
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=a_LAB01_e85d8801c
-
SPRING_DATASOURCE_PASSWORD=b1@@@772
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
deploy
:
resources
:
limits
:
...
...
This diff is collapsed.
Click to expand it.
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/domain/PriceLevel.java
浏览文件 @
820410a1
...
...
@@ -154,7 +154,7 @@ public class PriceLevel extends EntityMP implements Serializable {
@JsonProperty
(
"importsequencenumber"
)
private
Integer
importsequencenumber
;
/**
* 价
格水平
名称
* 价
目表
名称
*/
@TableField
(
value
=
"pricelevelname"
)
@JSONField
(
name
=
"pricelevelname"
)
...
...
@@ -327,7 +327,7 @@ public class PriceLevel extends EntityMP implements Serializable {
}
/**
* 设置 [价
格水平
名称]
* 设置 [价
目表
名称]
*/
public
void
setPricelevelname
(
String
pricelevelname
){
this
.
pricelevelname
=
pricelevelname
;
...
...
This diff is collapsed.
Click to expand it.
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/filter/PriceLevelSearchContext.java
浏览文件 @
820410a1
...
...
@@ -48,7 +48,7 @@ public class PriceLevelSearchContext extends QueryWrapperContext<PriceLevel> {
this
.
getSearchCond
().
eq
(
"shippingmethodcode"
,
n_shippingmethodcode_eq
);
}
}
private
String
n_pricelevelname_like
;
//[价
格水平
名称]
private
String
n_pricelevelname_like
;
//[价
目表
名称]
public
void
setN_pricelevelname_like
(
String
n_pricelevelname_like
)
{
this
.
n_pricelevelname_like
=
n_pricelevelname_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_pricelevelname_like
)){
...
...
This diff is collapsed.
Click to expand it.
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
820410a1
此差异已折叠。
点击以展开。
businesscentral-core/src/main/resources/mapper/product/product/ProductMapper.xml
浏览文件 @
820410a1
...
...
@@ -131,6 +131,7 @@
<!--数据查询[Revise]-->
<sql
id=
"Revise"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1
WHERE ( t1.`STATECODE` = 3 )
]]>
</sql>
<!--数据查询[Stop]-->
...
...
This diff is collapsed.
Click to expand it.
businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/Dockerfile
浏览文件 @
820410a1
...
...
@@ -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-provider-centralapi.jar
EXPOSE
8081
EXPOSE
10310
ADD
businesscentral-provider-centralapi.jar /businesscentral-provider-centralapi.jar
This diff is collapsed.
Click to expand it.
businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/businesscentral-provider-centralapi.yaml
浏览文件 @
820410a1
...
...
@@ -3,9 +3,23 @@ services:
businesscentral-provider-centralapi
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-provider-centralapi:latest
ports
:
-
"
8081:8081
"
-
"
10310:10310
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=10310
-
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=a_LAB01_e85d8801c
-
SPRING_DATASOURCE_PASSWORD=b1@@@772
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
deploy
:
resources
:
limits
:
...
...
This diff is collapsed.
Click to expand it.
config.xml
浏览文件 @
820410a1
...
...
@@ -37,11 +37,11 @@
git clone -b master $para2 ibizbusinesscentral/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizbusinesscentral/
mvn clean package -P
businesscentral
cd businesscentral-
app/businesscentral-app-businesscentral
mvn -P
businesscentral
docker:build
mvn -P
businesscentral
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-
app-businesscentral.yaml iBizEE --with-registry-auth
mvn clean package -P
centralapi
cd businesscentral-
provider/businesscentral-provider-centralapi
mvn -P
centralapi
docker:build
mvn -P
centralapi
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-
provider-centralapi.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录