From 759356b8085e9e85ccb576b088138c9eb27b54c2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 18:16:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 9 +
Source/UBCS/pom.xml | 58 ++++++++
Source/UBCS-WEB/src/views/docking/info.vue | 6
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 28 +++
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 57 +++++--
Source/UBCS-WEB/src/api/GetItem.js | 10 +
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 9 +
Source/UBCS-WEB/src/views/docking/infoForm.vue | 161 +++++++++++-----------
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 2
Source/UBCS-WEB/vue.config.js | 5
Source/UBCS/ubcs-service/ubcs-omd/pom.xml | 56 ++++++-
11 files changed, 282 insertions(+), 119 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/GetItem.js b/Source/UBCS-WEB/src/api/GetItem.js
index 190225d..2ba7b96 100644
--- a/Source/UBCS-WEB/src/api/GetItem.js
+++ b/Source/UBCS-WEB/src/api/GetItem.js
@@ -100,3 +100,13 @@
}
})
}
+// 鏇存柊闆嗗洟鐮佸�兼暟鎹�
+export function receiveEditApply(params) {
+ return request({
+ url: 'api/ubcs-applyjtcodeservice/DockingPreApplyCode/receiveEditApply',
+ method: 'post',
+ params: {
+ ...params
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index e516be0..ee1422f 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -219,7 +219,7 @@
rules: [
{
required: formItem.required,
- message: `璇�${message}${formItem.text}`,
+ message: `${message}${formItem.text}`,
trigger,
},
{
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index dc32f16..9355248 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -116,7 +116,7 @@
</basic-container>
</template>
<script>
-import {MasterTable, TableData, FindData, addSaveCode, editSaveCode, deleteCode, upSaveCode,applyGroupCode} from "@/api/GetItem";
+import {MasterTable, TableData, FindData, addSaveCode, editSaveCode, deleteCode, upSaveCode,applyGroupCode,receiveEditApply} from "@/api/GetItem";
import {processTS, changeStatus} from "@/api/template/setPersonnel"
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
@@ -415,7 +415,7 @@
//鐢宠闆嗗洟鐮佹暟鎹�
if (uniqueFlag === 'applyGroupCode') return this.applyGroupCode()
//鏇存柊闆嗗洟鐮佹暟鎹�
- // if (uniqueFlag === 'applyGroupCode') return this.applyGroupCode()
+ if (uniqueFlag === 'receiveEditApply') return this.receiveEditApply()
// 鐩镐技椤规煡璇�
// if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
});
@@ -429,8 +429,28 @@
// return { oids: item.oid, btmName: item.btmname };
// });
const oids = this.selectRow.map(item => item.oid).join(',');
- applyGroupCode({ oids, btmName: this.selectRow[0].btmname }).then(res => {
- console.log(res);
+ applyGroupCode({ oids, btmName: this.selectRow[0].btmname }).then(res=>{
+ if(res.data.code==200){
+ this.$message.success('鐢宠鎴愬姛')
+ }
+ this.onLoad()
+ })
+ }
+ },
+ //鏇存柊闆嗗洟鐮佹暟鎹�
+ receiveEditApply(){
+ if(this.selectRow.length <= 0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
+ }else {
+ // const requestData = this.selectRow.forEach(item => {
+ // return { oids: item.oid, btmName: item.btmname };
+ // });
+ const oids = this.selectRow.map(item => item.oid).join(',');
+ receiveEditApply({ oids, btmName: this.selectRow[0].btmname }).then(res => {
+ if(res.data.code==200){
+ this.$message.success('鏇存柊鎴愬姛')
+ this.onLoad()
+ }
});
}
},
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 7e53e35..11fe9d4 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -288,8 +288,13 @@
}
}
getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url, this.method).then(res => {
- this.data = res.data.records || res.data.data.records;
- this.page.total=res.data.total || res.data.data.total;
+ if(res.data.records){
+ this.data = res.data.records
+ this.page.total=res.data.total ;
+ }else{
+ this.data = res.data.data.records;
+ this.page.total=res.data.data.total;
+ }
this.loading = false;
this.selectionClear();
}).catch(error=>{
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index c63ba28..4551c28 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -347,8 +347,13 @@
}
}
getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
- this.data = res.data.records || res.data.data.records;
- this.page.total=res.data.total || res.data.data.total;
+ if(res.data.records){
+ this.data = res.data.records
+ this.page.total=res.data.total ;
+ }else{
+ this.data = res.data.data.records;
+ this.page.total=res.data.data.total;
+ }
this.loading = false;
this.selectionClear();
}).catch(error=>{
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 55271c2..b75f0e7 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -232,6 +232,12 @@
this.$refs.infoForm.formData = {
dataFlowType:'push',
pushType:'1',
+ sourceSystemName:'缂栫爜绯荤粺',
+ sourceSystemOid:'code00000001',
+ sourceSystemId:'CODE',
+ targetSystemName:'',
+ targetSystemOid:'',
+ targetSystemId:'',
sysIntParamVOs:[],
sysIntHeaderVOs:[]
};
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index c36b5b7..8bd4c89 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -4,7 +4,7 @@
style="height: 110vh;" top="-5%">
<el-form ref="form" :model="formData" show-message="true" inline size="medium" label-suffix=":"
class="dockingForm" :rules="rules" status-icon="true">
- <el-form-item label="dataFlowType" prop="dataFlowType">
+ <el-form-item label="鎺ュ彛绫诲瀷" prop="dataFlowType">
<el-select v-model="formData.dataFlowType" placeholder="璇烽�夋嫨" @change="dataFlowTypeChange">
<el-option v-for="item in dataFlowTypeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@@ -28,9 +28,10 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍒嗙被閫夋嫨" prop="classifyName">
- <vciWebRefer
- :referConfig="{
+ <div v-if="formData.dataFlowType=='push'">
+ <el-form-item label="鍒嗙被閫夋嫨" prop="classifyName">
+ <vciWebRefer
+ :referConfig="{
title: '鍒嗙被閫夋嫨',
showField: 'classifyName',
field: 'classifyOid',
@@ -38,80 +39,59 @@
placeholder: '璇烽�夋嫨鍒嗙被閫夋嫨',
options: {isMuti: false, type: 'tree', url: 'api/ubcs-code/codeClassify/treeCodeClassify'},
}"
- :value="formData.classifyOid"
- :text="formData.classifyName"
- :disabled="false"
- :display="true"
- @setReferValue="setReferValue"
- ></vciWebRefer>
- </el-form-item>
- <el-form-item v-if="formData.dataFlowType=='push'" label="闆嗘垚绯荤粺" prop="targetSystemName">
- <vciWebRefer
- :referConfig="{
+ :value="formData.classifyOid"
+ :text="formData.classifyName"
+ :disabled="false"
+ :display="true"
+ @setReferValue="setReferValue"
+ ></vciWebRefer>
+ </el-form-item>
+ <el-form-item label="闆嗘垚绯荤粺" prop="targetSystemName">
+ <vciWebRefer
+ :referConfig="{
title: '闆嗘垚绯荤粺',
showField: 'targetSystemName',
field: 'targetSystemOid',
fieldMap:{'targetSystemId':'id'},
placeholder: '璇烽�夋嫨',
- options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'},
+ options: {isMuti: false, type: 'default', url: 'api/ubcs-code/dockingManagement/gridDockingSystem'},
}"
- :value="formData.targetSystemOid"
- :text="formData.targetSystemName"
- :disabled="false"
- :display="true"
- @setReferValue="setReferValue"
- ></vciWebRefer>
- </el-form-item>
- <el-form-item v-if="formData.dataFlowType=='push'" label="缂栫爜绯荤粺" prop="sourceSystemName">
- <vciWebRefer
- :referConfig="{
- title: '缂栫爜绯荤粺',
- showField: 'sourceSystemName',
- field: 'sourceSystemOid',
- fieldMap:{'sourceSystemId':'id'},
- placeholder: '璇烽�夋嫨',
- options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'},
- }"
- :value="formData.sourceSystemOid"
- :text="formData.sourceSystemName"
- :disabled="false"
- :display="true"
- @setReferValue="setReferValue"
- ></vciWebRefer>
- </el-form-item>
- <el-form-item v-if="formData.dataFlowType=='accept'" label="缂栫爜绯荤粺" prop="targetSystemName">
- <vciWebRefer
- :referConfig="{
- title: '缂栫爜绯荤粺',
- showField: 'targetSystemName',
- field: 'targetSystemOid',
- fieldMap:{'targetSystemId':'id'},
- placeholder: '璇烽�夋嫨',
- options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'},
- }"
- :value="formData.targetSystemOid"
- :text="formData.targetSystemName"
- :disabled="false"
- :display="true"
- @setReferValue="setReferValue"
- ></vciWebRefer>
- </el-form-item>
- <el-form-item v-if="formData.dataFlowType=='accept'" label="闆嗘垚绯荤粺" prop="sourceSystemName">
- <vciWebRefer
- :referConfig="{
+ :value="formData.targetSystemOid"
+ :text="formData.targetSystemName"
+ :disabled="false"
+ :display="true"
+ @setReferValue="setReferValue"
+ ></vciWebRefer>
+ </el-form-item>
+ </div>
+ <div v-else>
+ <el-form-item label="鍒嗙被閫夋嫨" prop="classifyName" style="display: none">
+ </el-form-item>
+ <el-form-item label="闆嗘垚绯荤粺" prop="sourceSystemName">
+ <vciWebRefer
+ :referConfig="{
title: '闆嗘垚绯荤粺',
showField: 'sourceSystemName',
field: 'sourceSystemOid',
fieldMap:{'sourceSystemId':'id'},
placeholder: '璇烽�夋嫨',
- options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'},
+ options: {isMuti: false, type: 'default', url: 'api/ubcs-code/dockingManagement/gridDockingSystem'},
}"
- :value="formData.sourceSystemOid"
- :text="formData.sourceSystemName"
- :disabled="false"
- :display="true"
- @setReferValue="setReferValue"
- ></vciWebRefer>
+ :value="formData.sourceSystemOid"
+ :text="formData.sourceSystemName"
+ :disabled="false"
+ :display="true"
+ @setReferValue="setReferValue"
+ ></vciWebRefer>
+ </el-form-item>
+ </div>
+
+
+ <el-form-item label="鎺ュ彛鏂瑰紡" prop="interfaceType">
+ <el-select v-model="formData.interfaceType" clearable placeholder="璇烽�夋嫨">
+ <el-option v-for="item in interfaceTypeList" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item v-if="formData.pushType=='1'" label="鏄惁鎺ㄩ�侀泦鍥㈢爜" prop="isGroupCodeFlag">
<el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
@@ -127,12 +107,6 @@
</el-form-item>
<el-form-item label="绯荤粺鎻忚堪" style="width: 850px;">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 5}" v-model="formData.description" style="width: 740px;"></el-input>
- </el-form-item>
- <el-form-item label="鎺ュ彛绫诲瀷" prop="interfaceType">
- <el-select v-model="formData.interfaceType" clearable placeholder="璇烽�夋嫨">
- <el-option v-for="item in interfaceTypeList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
</el-form-item>
<el-form-item v-if="formData.interfaceType=='http'" label="璇锋眰鏂瑰紡" prop="requestMethod">
<el-select v-model="formData.requestMethod" placeholder="璇烽�夋嫨">
@@ -263,9 +237,9 @@
label: 'Json', value: 'json'
}],
dataFlowTypeList: [{
- label: 'push', value: 'push'
+ label: '鎺ㄩ��', value: 'push'
}, {
- label: 'accept', value: 'accept'
+ label: '鎺ュ彈', value: 'accept'
}],
//鎺ㄩ�佺被鍨�
pushTypeList: [{value: '1', label: '鏁版嵁鎺ㄩ��'},
@@ -419,10 +393,23 @@
{value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
{value: '7', label: '鏁版嵁鏌ヨ'}]
this.formData.pushType=''
+ this.formData.targetSystemName='缂栫爜绯荤粺';
+ this.formData.targetSystemOid='code00000001';
+ this.formData.targetSystemId='CODE';
+
+ this.formData.sourceSystemName='';
+ this.formData.sourceSystemOid='';
+ this.formData.sourceSystemId='';
}else {
this.pushTypeList=[{value: '1', label: '鏁版嵁鎺ㄩ��'},
{value: '2', label: '鍒嗙被鎺ㄩ��'}]
- this.formData.pushType='1'
+ this.formData.pushType='1' ;
+ this.formData.sourceSystemName='缂栫爜绯荤粺';
+ this.formData.sourceSystemOid='code00000001';
+ this.formData.sourceSystemId='CODE';
+ this.formData.targetSystemName='';
+ this.formData.targetSystemOid='';
+ this.formData.targetSystemId='';
}
},
methods: {
@@ -482,8 +469,13 @@
submitAttribute() {
const that = this;
let pass=true
- if(validatenull(this.formData.classifyName)||validatenull(this.formData.sourceSystemName)||validatenull(this.formData.targetSystemName)){
+ if(this.formData.dataFlowType=='push' && (validatenull(this.formData.classifyName)||validatenull(this.formData.targetSystemName))){
that.$message.error('蹇呭～椤逛笉鑳戒负绌�');
+ pass=false
+ return;
+ }
+ if(this.formData.dataFlowType=='accept' && (validatenull(this.formData.sourceSystemName))){
+ that.$message.error('闆嗘垚绯荤粺涓嶈兘涓虹┖');
pass=false
return;
}
@@ -539,7 +531,13 @@
if(value=='push'){
this.pushTypeList=[{value: '1', label: '鏁版嵁鎺ㄩ��'},
{value: '2', label: '鍒嗙被鎺ㄩ��'}]
- this.formData.pushType='鏁版嵁鎺ㄩ��'
+ this.formData.pushType='1';
+ this.formData.sourceSystemName='缂栫爜绯荤粺';
+ this.formData.sourceSystemOid='code00000001';
+ this.formData.sourceSystemId='CODE';
+ this.formData.targetSystemName='';
+ this.formData.targetSystemOid='';
+ this.formData.targetSystemId='';
}else if(value=='accept'){
this.pushTypeList=[
{value: '3', label: '缂栫爜鐢宠'},
@@ -547,7 +545,14 @@
{value: '5', label: '鍒嗙被鏌ヨ'},
{value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
{value: '7', label: '鏁版嵁鏌ヨ'}]
- this.formData.pushType=''
+ this.formData.pushType='';
+ this.formData.targetSystemName='缂栫爜绯荤粺';
+ this.formData.targetSystemOid='code00000001';
+ this.formData.targetSystemId='CODE';
+
+ this.formData.sourceSystemName='';
+ this.formData.sourceSystemOid='';
+ this.formData.sourceSystemId='';
}else{
this.pushTypeList=[];
}
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index cf90d26..6b06ed5 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -28,10 +28,11 @@
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
// target: 'http://127.0.0.1',
// target: 'http://192.168.1.51:37000',
- // target: 'http://dev.vci-tech.com:37000',
+ target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.16:37000',
// target: 'http://192.168.0.105:37000',
- target: 'http://192.168.43.251:37000',
+ //xiejun
+ // target: 'http://192.168.43.251:37000',
// target: 'http://192.168.0.103:37000',
// target: 'http://192.168.1.63:37000',
// target: 'http://192.168.3.7:37000',
diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml
index 9a71e3e..1634b83 100644
--- a/Source/UBCS/pom.xml
+++ b/Source/UBCS/pom.xml
@@ -10,7 +10,6 @@
<properties>
<bladex.project.version>3.0.1.RELEASE</bladex.project.version>
-
<java.version>1.8</java.version>
<maven.plugin.version>3.8.0</maven.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -41,7 +40,7 @@
<module>ubcs-plugin-api</module>
<module>ubcs-service</module>
<module>ubcs-service-api</module>
- <module>ubcs-codeApply</module>
+<!-- <module>ubcs-codeApply</module>-->
</modules>
<dependencyManagement>
@@ -204,6 +203,61 @@
</compilerArgs>
</configuration>
</plugin>
+
+ <!-- 鎵撳寘鏃跺墧闄ar锛屾斁缃湪lib褰撲腑 -->
+ <!-- <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version> <!– 濡傛灉 spring.boot.version 鐗堟湰淇敼锛屽垯杩欓噷涔熻璺熺潃淇敼 –>
+ <configuration>
+ <fork>true</fork>
+ <!–瑙ｅ喅windows鍛戒护琛岀獥鍙ｄ腑鏂囦贡鐮�–>
+ <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
+ <!– 鎷嗗紑渚濊禆–>
+ <mainClass>cn.iocoder.qingning.server.QingningServerApplication</mainClass>
+ <layout>ZIP</layout>
+ <includes>
+ <include>
+ <!– 鎺掗櫎鎵�鏈塉ar –>
+ <groupId>nothing</groupId>
+ <artifactId>nothing</artifactId>
+ </include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal> <!– 灏嗗紩鍏ョ殑 jar 鎵撳叆鍏朵腑 –>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!–姝ゆ彃浠剁敤浜庡皢渚濊禆鍖呮娊鍑�–>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>../target/lib</outputDirectory>
+ <excludeTransitive>false</excludeTransitive>
+ <stripVersion>false</stripVersion>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>-->
</plugins>
</build>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index ab5623a..7431369 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -164,24 +164,49 @@
<build>
<plugins>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <configuration>
- <username>${docker.username}</username>
- <password>${docker.password}</password>
- <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
- <tag>${project.version}</tag>
- <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
- <buildArgs>
- <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
- </buildArgs>
- <skip>false</skip>
- </configuration>
- </plugin>
+ <!--璁剧疆搴旂敤 Main 鍙傛暟鍚姩渚濊禆鏌ユ壘鐨勫湴鍧�鎸囧悜澶栭儴 lib 鏂囦欢澶�-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <!-- 椤圭洰鎵�渚濊禆鐨刯ar浣嶄簬鍚屼竴绾х殑lib鐩綍涓�-->
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <!--璁剧疆 SpringBoot 鎵撳寘鎻掍欢涓嶅寘鍚换浣� Jar 渚濊禆鍖�-->
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>
+ <groupId>nothing</groupId>
+ <artifactId>nothing</artifactId>
+ </include>
+ </includes>
+ </configuration>
+ </plugin>
+ <!--璁剧疆灏� lib 鎷疯礉鍒板簲鐢� Jar 澶栭潰-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
index 43686d4..151429a 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
@@ -85,25 +85,57 @@
<build>
<plugins>
+<!-- <plugin>-->
+<!-- <groupId>com.spotify</groupId>-->
+<!-- <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!-- <configuration>-->
+<!-- <username>${docker.username}</username>-->
+<!-- <password>${docker.password}</password>-->
+<!-- <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>-->
+<!-- <tag>${project.version}</tag>-->
+<!-- <useMavenSettingsForAuth>true</useMavenSettingsForAuth>-->
+<!-- <buildArgs>-->
+<!-- <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>-->
+<!-- </buildArgs>-->
+<!-- <skip>false</skip>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-antrun-plugin</artifactId>-->
+<!-- </plugin>-->
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
<configuration>
- <username>${docker.username}</username>
- <password>${docker.password}</password>
- <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
- <tag>${project.version}</tag>
- <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
- <buildArgs>
- <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
- </buildArgs>
- <skip>false</skip>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ <mainClass>com.vci.ubcs.omd.OmdApplication</mainClass>
+ </manifest>
+ </archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
+
</plugins>
</build>
--
Gitblit v1.9.3