Skip to content

T
TrainSys
提交 a2adde52 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lxm1993 部署微服务应用 [TrainSys，网页端]

上级 db210c13
隐藏空白字符变更
内嵌 并排
正在显示 包含 44 行增加 和 91 行删除
app_Web/packages/ibiz-core/src/utils/util/util.ts
浏览文件 @ a2adde52
......@@ -347,7 +347,7 @@ export class Util {
* @memberof Util
*/
public static deepCopy(data: any): any {
return clone(data);
return data._isVue ? data : clone(data);
}
/**
......
app_Web/packages/ibiz-vue/src/components/common/app-rich-text-editor/app-rich-text-editor.vue
浏览文件 @ a2adde52
......@@ -307,11 +307,20 @@ export default class AppRichTextEditor extends Vue {
}
/**
* 生命周期：销毁富文本
* 生命周期
*
* @memberof AppRichTextEditor
*/
destroyed(): void {
this.editorDestroyed();
}
/**
* 销毁富文本
*
* @memberof AppRichTextEditor
*/
public destroyed() {
public editorDestroyed() {
if (this.editor) {
tinymceCode.remove('#' + this.id);
}
......@@ -408,7 +417,7 @@ export default class AppRichTextEditor extends Vue {
* @memberof AppRichTextEditor
*/
public init() {
this.destroyed();
this.editorDestroyed();
let richtexteditor = this;
tinymceCode.init({
selector: '#' + richtexteditor.id,
......
app_Web/packages/ibiz-vue/src/components/common/rich-text-editor/rich-text-editor.vue
浏览文件 @ a2adde52
......@@ -462,12 +462,21 @@ export default class RichTextEditor extends Vue {
}
/**
* 生命周期：销毁富文本
*
* 生命周期
*
* @memberof RichTextEditor
*/
destroyed(): void {
this.editorDestroyed();
}
/**
* 销毁富文本
*
* @memberof RichTextEditor
*/
public destroyed(){
if(this.editor){
public editorDestroyed() {
if (this.editor) {
tinymceCode.remove('#' + this.id);
}
if(this.formStateEvent){
......@@ -560,7 +569,7 @@ export default class RichTextEditor extends Vue {
* @memberof RichTextEditor
*/
public init() {
this.destroyed();
this.editorDestroyed();
let richtexteditor = this;
tinymceCode.init({
selector: '#' + richtexteditor.id,
......
app_Web/src/locale/lang/en-US-base.ts
浏览文件 @ a2adde52
......@@ -50,7 +50,7 @@ function getAppLocale(){
refresh: "refresh",
show: "Show",
records: "records",
total: "totle",
total: "total",
selected: "selected ",
novalueexist: "Value cannot be empty",
group:"Group",
......
config.xml
浏览文件 @ a2adde52
......@@ -55,14 +55,15 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/
mvn clean package -Ptrainsys
mvn install -Ptrainsys
cd trainsys-provider
sed -i "s#dstimage#$para5#g" pom.xml
sed -i "s#dstimage#$para5#g" src/main/docker/trainsys-provider-trainsys.yaml
mvn -Ptrainsys docker:build
mvn -Ptrainsys docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth
mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
if [ -e app_Web/.dynamic ]
then
cd app_Web
else
cd app_Web/app
fi
sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.29.003#g" swarm.yaml
docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
trainsys-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ a2adde52
......@@ -96,25 +96,6 @@
</createTable>
</changeSet>
<!--输出实体[RAWMATERIAL]数据结构 -->
<changeSet author="root" id="tab-rawmaterial-9-4">
<createTable tableName="T_RAWMATERIAL">
<column name="RAWMATERIALID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RAWMATERIAL"/>
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="RAWMATERIALNAME" remarks="" type="VARCHAR(200)">
</column>
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column>
</createTable>
</changeSet>
<!--输出实体[REGINFO]数据结构 -->
<changeSet author="root" id="tab-reginfo-34-5">
<createTable tableName="T_REGINFO">
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/RawMaterial.json
浏览文件 @ a2adde52
......@@ -174,14 +174,6 @@
},
"builtinAction" : true
} ],
"getAllPSDEDBConfigs" : [ {
"dBType" : "MYSQL5",
"name" : "MYSQL5",
"objNameCase" : "DEFAULT",
"standardTableName" : "`T_RAWMATERIAL`",
"tableName" : "T_RAWMATERIAL",
"valid" : true
} ],
"getAllPSDEDBTables" : [ {
"getAllPSDEFields" : [ {
"name" : "RAWMATERIALID",
......
trainsys-provider/pom.xml
浏览文件 @ a2adde52
......@@ -34,7 +34,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ a2adde52
......@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
EXPOSE 50000
EXPOSE 8081
ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ a2adde52
......@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
ports:
- containerPort: 50000
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.240.140"
- name: SERVER_PORT
value: "50000"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.240.140:8848"
- name: SPRING_REDIS_HOST
value: "127.0.0.1"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_LAB01_d23cc850e"
- name: SPRING_DATASOURCE_PASSWORD
value: "f9Df4556"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_LAB01_d23cc850e"
- name: NACOS
value: "172.16.240.140:8848"
- containerPort: 8081
---
apiVersion: v1
......@@ -60,9 +35,9 @@ spec:
type: NodePort
ports:
- name: http
port: 50000
targetPort: 50000
nodePort: 50000
port: 8081
targetPort: 8081
nodePort: 8081
protocol: TCP
selector:
app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ a2adde52
......@@ -3,23 +3,9 @@ services:
trainsys-provider:
image: dstimage
ports:
- "50000:50000"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
- SERVER_PORT=50000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
- SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
- SPRING_REDIS_HOST=127.0.0.1
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
- SPRING_DATASOURCE_PASSWORD=f9Df4556
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
- NACOS=172.16.240.140:8848
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或