From cffd3d06a2f69e4a15aa9465d36c0495247f88ab Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 13 十月 2023 12:24:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java |    2 
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml                                                                                               |   23 ++-
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue                                                                                            |   83 +++++++++--
 Source/UBCS/ubcs-service/ubcs-code/pom.xml                                                                                                             |   33 +++-
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue                                                                                           |    2 
 Source/UBCS/ubcs-ops/ubcs-admin/pom.xml                                                                                                                |   20 ++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java                                            |   16 +
 Source/UBCS/ubcs-ops/ubcs-flow/pom.xml                                                                                                                 |   22 +-
 Source/UBCS/ubcs-ops/ubcs-report/pom.xml                                                                                                               |   20 ++
 Source/UBCS/ubcs-auth/pom.xml                                                                                                                          |   27 +--
 Source/UBCS/ubcs-service/ubcs-user/pom.xml                                                                                                             |   20 ++
 Source/UBCS/ubcs-ops/ubcs-log/pom.xml                                                                                                                  |   20 ++
 Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml                                                                                              |    2 
 Source/UBCS/ubcs-service/ubcs-desk/pom.xml                                                                                                             |   20 ++
 Source/UBCS/ubcs-service/ubcs-system/pom.xml                                                                                                           |   20 ++
 Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml                                                                                        |   25 +++
 Source/UBCS/ubcs-gateway/pom.xml                                                                                                                       |   22 +-
 Source/UBCS/ubcs-ops/ubcs-resource/pom.xml                                                                                                             |   20 ++
 Source/UBCS/ubcs-service/ubcs-omd/pom.xml                                                                                                              |   20 ++
 Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java                                                                |    1 
 20 files changed, 289 insertions(+), 129 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index d3aa4cd..2f3f08b 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -70,7 +70,7 @@
     // 琛ㄥ崟绫诲瀷锛坅dd, edit, detail锛�
     type: {
       type: String,
-      default: "add",
+      default: "",
     },
     // 鑷畾涔夎〃鍗曠被鍨�
     selfColumnType: {
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 218543e..791d4d1 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -17,7 +17,8 @@
               </el-button>
               <span v-if="tableHeadFindData.length > 0">
               <el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small">
-                <el-option v-for="item in tableHeadFindData" :label="item.label" :value="item.prop" :key="item.id"></el-option>
+                <el-option v-for="item in tableHeadFindData" :key="item.id" :label="item.label"
+                           :value="item.prop"></el-option>
               </el-select>
               <el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
                         size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"
@@ -42,19 +43,30 @@
               <el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
               <el-table-column v-if="tableData.length != 0" fixed label="搴忓彿" type="index" width="55">
               </el-table-column>
-              <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :formatter="item.formatter"
-                               :label="item.label"
-                               :prop="item.prop" :show-overflow-tooltip="true"
+              <el-table-column v-for="item in CodeArray" v-if="!item.hidden" :label="item.label" :prop="item.prop"
+                               :show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width"
+                               align="center">
+                <template slot-scope="scope">
+                  <el-link type="primary" @click="CodeLinkHandler(scope.row)">
+                    {{ scope.row[item.prop] }}
+                  </el-link>
+                </template>
+              </el-table-column>
+              <el-table-column v-for="item in this.tableHeadFindData" v-if="!item.hidden && item.prop !== 'id'"
+                               :key="item.id"
+                               :formatter="item.formatter"
+                               :label="item.label" :prop="item.prop"
+                               :show-overflow-tooltip="true"
                                :sortable="item.sortable"
                                :width="item.width"
-                               v-if="!item.hidden"
                                align="center">
               </el-table-column>
             </el-table>
           </el-row>
           <!--          鏂板-->
-          <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
-                              :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" :TreeValue="TreeValue"
+          <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
+                              :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
+                              :visible.sync="addvisible"
                               type="add"
                               @submit="AddSumbit">
           </FormTemplateDialog>
@@ -63,6 +75,12 @@
                               :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
                               :visible.sync="editvisible"
                               type="edit" @submit="EditSumbit"></FormTemplateDialog>
+          <!--          鏁版嵁璇︽儏-->
+          <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
+                               :rowOid="this.LinkObject.oid" :templateOid="templateOid"
+                              :title="'鏁版嵁璇︽儏'"
+                              :visible.sync="LinkVisible"
+                              type="detail"></FormTemplateDialog>
           <!--          宸插彂甯冩暟鎹慨鏀�-->
           <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                               :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid"
@@ -117,7 +135,17 @@
   </basic-container>
 </template>
 <script>
-import {MasterTable, TableData, FindData, addSaveCode, editSaveCode, deleteCode, upSaveCode,applyGroupCode,receiveEditApply} 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";
@@ -155,7 +183,7 @@
     tableDataArray: {
       type: Array,
     },
-    TreeValue:{
+    TreeValue: {
       type: String,
       default: "",
     },
@@ -187,6 +215,11 @@
   },
   data() {
     return {
+      LinkVisible: false,
+      LinkObject: {}, // 缂栫爜鏁版嵁
+      LinkList: [],
+      isCodeArrayPushed: false, // 缂栫爜鏁扮粍娣诲姞鏍囪瘑鍙橀噺
+      CodeArray: [],
       // 鐘舵�佹悳绱�
       statusSelect: "all",
       // 鍏抽敭瀛楁煡璇�
@@ -319,7 +352,6 @@
     },
     tableHeadFindData: {
       handler(newval, oldval) {
-        console.log('new',newval)
         newval.forEach((record, _index) => {
           if (record.queryField == 'id' && validatenull(record.templet)) {
             //浼佷笟缂栫爜鐨勯粯璁ゆ坊鍔犺秴閾炬帴,鏆傛湭瀹炵幇
@@ -340,6 +372,10 @@
           }
         })
         this.tableHeadFindDatas = newval;
+        if (!this.isCodeArrayPushed) {
+          this.CodeArray.push(newval.find(item => item.prop === 'id'))
+          this.isCodeArrayPushed = true
+        }
         // console.log('new',newval)
         this.WupinFindValue = ''
       },
@@ -365,6 +401,13 @@
     },
   },
   methods: {
+    CodeLinkHandler(row) {
+      this.LinkObject = row;
+      this.LinkVisible = true;
+      this.LinkList = Object.keys(row).map(property => property)
+      // console.log(result);
+      // console.log(this.LinkObject)
+    },
     //鐘舵�佹悳绱�
     cellSelectHandler(row) {
       if (row === 'all') {
@@ -428,16 +471,16 @@
       });
     },
     //鐢宠闆嗗洟鐮佹暟鎹�
-    applyGroupCode(){
-      if(this.selectRow.length <= 0){
+    applyGroupCode() {
+      if (this.selectRow.length <= 0) {
         this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
-      }else {
+      } else {
         // const requestData = this.selectRow.forEach(item => {
         //   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=>{
-          if(res.data.code==200){
+        applyGroupCode({oids, btmName: this.selectRow[0].btmname}).then(res => {
+          if (res.data.code == 200) {
             this.$message.success('鐢宠鎴愬姛')
           }
           this.onLoad()
@@ -445,16 +488,16 @@
       }
     },
     //鏇存柊闆嗗洟鐮佹暟鎹�
-    receiveEditApply(){
-      if(this.selectRow.length <= 0){
+    receiveEditApply() {
+      if (this.selectRow.length <= 0) {
         this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
-      }else {
+      } 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){
+        receiveEditApply({oids, btmName: this.selectRow[0].btmname}).then(res => {
+          if (res.data.code == 200) {
             this.$message.success('鏇存柊鎴愬姛')
             this.onLoad()
           }
diff --git a/Source/UBCS/ubcs-auth/pom.xml b/Source/UBCS/ubcs-auth/pom.xml
index c99f2db..691329f 100644
--- a/Source/UBCS/ubcs-auth/pom.xml
+++ b/Source/UBCS/ubcs-auth/pom.xml
@@ -132,31 +132,28 @@
             <artifactId>activation</artifactId>
             <version>1.1.1</version>
         </dependency>-->
-        <dependency>
-            <groupId>com.vci.ubcs</groupId>
-            <artifactId>ubcs-util-api</artifactId>
-            <version>3.0.1.RELEASE</version>
-        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../target</outputDirectory>
+                    <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-dependency-plugin</artifactId>
-                <configuration>
-                    <outputDirectory>./target/libs</outputDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java
index 7b92db7..8d35ec3 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java
@@ -16,7 +16,6 @@
  */
 package com.vci.ubcs.auth.endpoint;
 
-import com.vci.ubcs.starter.util.HttpUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhyd.oauth.model.AuthCallback;
diff --git a/Source/UBCS/ubcs-gateway/pom.xml b/Source/UBCS/ubcs-gateway/pom.xml
index 2b0073d..32bc4ee 100644
--- a/Source/UBCS/ubcs-gateway/pom.xml
+++ b/Source/UBCS/ubcs-gateway/pom.xml
@@ -79,21 +79,23 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../target</outputDirectory>
+                    <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-dependency-plugin</artifactId>
-                <configuration>
-                    <outputDirectory>./target/libs</outputDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..6cf84cc
--- /dev/null
+++ b/Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml
@@ -0,0 +1,25 @@
+blade:
+  #澶氬洟闃熷崗浣滄湇鍔￠厤缃�
+  loadbalancer:
+    #寮�鍚厤缃�
+    enabled: true
+    #鐏板害鐗堟湰
+    #version: 3.0.0
+    #璐熻浇鍧囪　浼樺厛璋冪敤鐨刬p娈�
+    prior-ip-pattern:
+      - 192.168.0.*
+      - 127.0.0.1
+server:
+  port: 80
+
+spring:
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          enabled: true
+    loadbalancer:
+      retry:
+        enabled: true
+  main:
+    web-application-type: reactive
diff --git a/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml b/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml
index 6d2cc08..4f2e2ae 100644
--- a/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml
+++ b/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
 server:
-  port: 80
+  port: 37000
 
 spring:
   cloud:
diff --git a/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml b/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml
index 02f9465..687992d 100644
--- a/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml
@@ -95,15 +95,23 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml b/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
index 9b4e7bc..3906de0 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
@@ -93,15 +93,19 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <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>
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
index 61338ad..bf9c330 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
@@ -43,15 +43,23 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-ops/ubcs-report/pom.xml b/Source/UBCS/ubcs-ops/ubcs-report/pom.xml
index 83b8022..bdc4700 100644
--- a/Source/UBCS/ubcs-ops/ubcs-report/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-report/pom.xml
@@ -47,15 +47,23 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/pom.xml b/Source/UBCS/ubcs-ops/ubcs-resource/pom.xml
index 4ed1e1f..cca7a4f 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/pom.xml
@@ -97,15 +97,23 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml
index ac37aeb..e83446e 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml
@@ -7,9 +7,10 @@
         <artifactId>ubcs-service</artifactId>
         <version>3.0.1.RELEASE</version>
     </parent>
+    <groupId>com.vci.ubcs</groupId>
     <artifactId>ubcs-applyjtcodeservice</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <modelVersion>4.0.0</modelVersion>
@@ -50,15 +51,23 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
index 20d5d55..9c6eef1 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -47,7 +47,7 @@
 	 * 涓绘暟鎹垎绫绘湇鍔�
 	 */
 	@Autowired(required = true)
-	private  	ICodeClassifyClient codeClassifyClient;
+	private ICodeClassifyClient codeClassifyClient;
 
 	/***
 	 * 涓氬姟鏁版嵁灞炴�ф湇鍔�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index aed5804..8099f3d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -16,11 +16,6 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <properties>
-        <!-- 鎸夊悇妯″潡瀹為檯鐩綍灞傛瀹氫箟鐩稿鏁版嵁锛屼娇鎵�鏈夋湇鍔℃ā鍧楄緭鍑鸿祫婧愭眹鑱氬埌鐩稿悓鐩綍 -->
-        <boot-jar-output>../devops</boot-jar-output>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.vci.ubcs</groupId>
@@ -96,6 +91,12 @@
             <version>3.0.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <!--杈炬ⅵ鏁版嵁搴撻┍鍔�-->
+        <!--<dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <optional>true</optional>
+        </dependency>-->
         <!--axis2 begin -->
         <dependency>
             <groupId>org.apache.axis2</groupId>
@@ -142,6 +143,7 @@
             <scope>compile</scope>
         </dependency>
         <!--axis2 end -->
+
         <dependency>
             <groupId>com.vci.ubcs</groupId>
             <artifactId>ubcs-file-api</artifactId>
@@ -153,20 +155,29 @@
             <version>3.0.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
index 69e569d..88db082 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -1,13 +1,9 @@
 package com.vci.ubcs.code.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
 import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
 import com.vci.ubcs.code.dto.CodeOrderDTO;
-import com.vci.ubcs.code.entity.CodeClassify;
-import com.vci.ubcs.code.enumpack.CodeClassifyProcessUseEnum;
 import com.vci.ubcs.code.service.ICodeClassifyService;
 import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
 import com.vci.ubcs.code.service.ICodeClassifyValueService;
@@ -16,7 +12,6 @@
 import com.vci.ubcs.code.vo.ComponentRule;
 import com.vci.ubcs.code.vo.pagemodel.*;
 import com.vci.ubcs.starter.annotation.VciBusinessLog;
-import com.vci.ubcs.starter.revision.model.BaseModel;
 import com.vci.ubcs.starter.revision.model.TreeQueryObject;
 import com.vci.ubcs.starter.web.pagemodel.*;
 import io.swagger.annotations.Api;
@@ -87,6 +82,17 @@
 	}
 
 	/**
+	 * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟
+	 * @param codeClassifyOid 浣跨敤妯℃澘鐨勫垎绫讳富閿�
+	 * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗曪級
+	 */
+	@GetMapping("/getFormDefineByTemplateOid")
+	public MdmUIInfoVO getFormDefineByTemplateOid(String codeClassifyOid){
+		CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(codeClassifyOid);
+		return mdmEngineService.getFormDefineByTemplateOid(usedTemplateByClassifyOid.getOid(),codeClassifyOid);
+	}
+
+	/**
 	 * 涓婚搴撳垎绫绘爲
 	 * @param parentId 鏍戝舰鏌ヨ瀵硅薄
 	 * @return 涓婚搴撳垎绫绘樉绀烘爲
diff --git a/Source/UBCS/ubcs-service/ubcs-desk/pom.xml b/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
index a4db87f..f46d50e 100644
--- a/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
@@ -73,15 +73,23 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
index d8e3280..327b1f6 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
@@ -86,15 +86,23 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-system/pom.xml b/Source/UBCS/ubcs-service/ubcs-system/pom.xml
index fb53bea..2c5f838 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/pom.xml
@@ -51,15 +51,23 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-user/pom.xml b/Source/UBCS/ubcs-service/ubcs-user/pom.xml
index 8408aea..412fd2d 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-user/pom.xml
@@ -52,15 +52,23 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

--
Gitblit v1.9.3