From 988a25cb2ef013e9493da76c3035bcb5bee0da81 Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期日, 23 七月 2023 10:50:32 +0800 Subject: [PATCH] 武汉黄陂军粮-增加WMS立体库接口整体结构 --- igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1002.java | 39 +++ igds-api-inte/src/main/java/com/ld/igds/wms/controller/WmsController.java | 79 +++++++ igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsParam.java | 74 ++++++ igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsRequest.java | 34 +++ igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1004.java | 39 +++ igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsResponse.java | 48 ++++ igds-web/src/main/resources/application.yml | 2 igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1001.java | 39 +++ igds-web/src/main/resources/dorado-home/datasources.xml | 3 igds-api-inte/src/main/java/com/ld/igds/wms/service/WmsService.java | 29 ++ igds-api-inte/src/main/java/com/ld/igds/wms/constant/WmsCodeEnum.java | 42 +++ igds-api-inte/src/main/java/com/ld/igds/wms/constant/WmsConstant.java | 17 + igds-web/pom.xml | 100 ++++---- igds-api-inte/src/main/java/com/ld/igds/wms/manager/WmsManager.java | 54 ++++ igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1003.java | 39 +++ 15 files changed, 587 insertions(+), 51 deletions(-) diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/constant/WmsCodeEnum.java b/igds-api-inte/src/main/java/com/ld/igds/wms/constant/WmsCodeEnum.java new file mode 100644 index 0000000..965ac6d --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/constant/WmsCodeEnum.java @@ -0,0 +1,42 @@ +package com.ld.igds.wms.constant; + +/** + * 姝︽眽榛勯檪鍐涚伯-绔嬩綋搴撴帴鍙�-鍝嶅簲鐮� + * + * @author czt + */ +public enum WmsCodeEnum { + + WMS_CODE_0000("0000", "璇锋眰鎴愬姛"), + WMS_CODE_1111("1111", "鍚庣鏈嶅姟寮傚父"), + WMS_CODE_1001("1001", "鏃犳潈璁块棶"), + WMS_CODE_1002("1002", "鍙傛暟鏈夎"), + WMS_CODE_1003("1003", "鏃犳鎺ュ彛淇℃伅"), + WMS_CODE_1004("1004", "閫氳澶辫触") + ; + + private String code; + private String msg; + + WmsCodeEnum(String code, String msg) { + this.code = code; + this.msg = msg; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + +} diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/constant/WmsConstant.java b/igds-api-inte/src/main/java/com/ld/igds/wms/constant/WmsConstant.java new file mode 100644 index 0000000..eb040b9 --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/constant/WmsConstant.java @@ -0,0 +1,17 @@ +package com.ld.igds.wms.constant; + +/** + * 姝︽眽榛勯檪鍐涚伯-绔嬩綋搴撴帴鍙�-鎺ュ彛缂栫爜 + * + * @author czt + */ +public class WmsConstant { + + /** + * ================= 鎺ュ彛缂栫爜 ================= + */ + public static final String API_WMS_1001 = "1001"; + public static final String API_WMS_1002 = "1002"; + public static final String API_WMS_1003 = "1003"; + public static final String API_WMS_1004 = "1004"; +} diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/controller/WmsController.java b/igds-api-inte/src/main/java/com/ld/igds/wms/controller/WmsController.java new file mode 100644 index 0000000..f6f22f0 --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/controller/WmsController.java @@ -0,0 +1,79 @@ +package com.ld.igds.wms.controller; + +import com.alibaba.fastjson.JSONObject; +import com.ld.igds.wms.constant.WmsCodeEnum; +import com.ld.igds.wms.data.WmsRequest; +import com.ld.igds.wms.data.WmsResponse; +import com.ld.igds.wms.manager.WmsManager; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +/** + * 姝︽眽榛勯檪鍐涚伯-绔嬩綋搴撴帴鍙� + * + * @author czt + */ +@Slf4j +@RestController +@RequestMapping("api/wms/v1") +public class WmsController { + + @Autowired + private WmsManager wmsManager; + + /** + * 涓氬姟鍏ュ彛 + * @param request + * @return + */ + @ResponseBody + @RequestMapping("/gateway") + public WmsResponse gateway(@RequestBody WmsRequest<JSONObject> request) { + + log.info("-----绔嬩綋搴�-----鏀跺埌鐨勬秷鎭�={}-----", request); + + //鍒ゆ柇鍙傛暟 + if (null == request) { + return new WmsResponse(WmsCodeEnum.WMS_CODE_1002.getCode(), WmsCodeEnum.WMS_CODE_1002.getMsg()); + } + + //鍒ゆ柇鎺ュ彛缂栫爜 + if (null == request.getInterfaceId()) { + return new WmsResponse(WmsCodeEnum.WMS_CODE_1002.getCode(), WmsCodeEnum.WMS_CODE_1002.getMsg()); + } + + //鍒ゆ柇鏁版嵁 + if (null == request.getData()) { + return new WmsResponse(WmsCodeEnum.WMS_CODE_1002.getCode(), WmsCodeEnum.WMS_CODE_1002.getMsg()); + } + + WmsResponse result; + try{ + //寮傛澶勭悊锛屽瓙绾跨▼瑙f瀽浜嬩欢 + final ExecutorService exec = Executors.newFixedThreadPool(1); + Callable<String> call = new Callable<String>() { + public String call() throws Exception { + + //鎵ц涓氬姟鎿嶄綔 + WmsResponse wmsResponse = wmsManager.execute(request); + return wmsResponse.getMsg(); + } + }; + exec.submit(call); + exec.shutdown(); + result = new WmsResponse(WmsCodeEnum.WMS_CODE_0000.getCode(), WmsCodeEnum.WMS_CODE_0000.getMsg()); + + }catch (Exception e){ + + log.error("----绔嬩綋搴撲俊鎭В鏋愬紓甯�={}-----", e.getLocalizedMessage()); + + //鍚庣寮傚父 + result = new WmsResponse(WmsCodeEnum.WMS_CODE_1111.getCode(), WmsCodeEnum.WMS_CODE_1111.getMsg()); + } + return result; + } +} \ No newline at end of file diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsParam.java b/igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsParam.java new file mode 100644 index 0000000..a6e4f50 --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsParam.java @@ -0,0 +1,74 @@ +package com.ld.igds.wms.data; + +import lombok.Data; + +/** + * 姝︽眽榛勯檪鍐涚伯-绔嬩綋搴撴帴鍙� + * 鏁版嵁灏佽 + * + * @author czt + */ +@Data +public class WmsParam { + + /** + * 浠诲姟缂栧彿 + */ + private String taskNo; + + /** + * 鍝佸悕 + */ + private String productName; + + /** + * 瑙勬牸 + */ + private String productType; + + /** + * 鐢熶骇鏃ユ湡 + */ + private String productDate; + + /** + * 鎵规 + */ + private String productBatch; + + /** + * 鏁伴噺 + */ + private String loadQuantity; + + /** + * 鍑哄簱绫诲瀷搴撲綅鍚� + */ + private String fromLocationCode; + + /** + * 鍏ュ簱绫诲瀷搴撲綅鍚� + */ + private String toLocationCode; + + /** + * 绉诲簱绫诲瀷搴撲綅鍚� + */ + private String toPort; + + /** + * 鎵樼洏缂栧彿 + */ + private String containerCode; + + /** + * 鏄惁鍚堟牸 + */ + private String passOrNoPass; + + /** + * 浠撳簱鍚嶇О + */ + private String deptName; + +} \ No newline at end of file diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsRequest.java b/igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsRequest.java new file mode 100644 index 0000000..6f2b649 --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsRequest.java @@ -0,0 +1,34 @@ +package com.ld.igds.wms.data; + +import lombok.Data; +import java.io.Serializable; + +/** + * 姝︽眽榛勯檪鍐涚伯-绔嬩綋搴撴帴鍙�-璇锋眰鍙傛暟 + * + * @author czt + */ +@Data +public class WmsRequest<T> implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * 鎺ュ彛缂栫爜 + */ + private String interfaceId; + + + /** + * 璇锋眰鏃堕棿(yyyy-MM-dd HH:mm:ss) + */ + private String reqDateTime; + + /** + * 涓氬姟鏁版嵁 + */ + private T data; +} diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsResponse.java b/igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsResponse.java new file mode 100644 index 0000000..07ff31f --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/data/WmsResponse.java @@ -0,0 +1,48 @@ +package com.ld.igds.wms.data; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * 姝︽眽榛勯檪鍐涚伯-绔嬩綋搴撴帴鍙�,鍝嶅簲鏁版嵁灏佽 + * + * @author czt + */ +@Data +public class WmsResponse implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * 鍝嶅簲缂栫爜 + */ + private String code; + + /** + * 鍝嶅簲淇℃伅 + */ + private String msg; + + + /** + * 鍝嶅簲鏃堕棿(yyyy-MM-dd HH:mm:ss) + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date resDateTime; + + + public WmsResponse() { + super(); + } + + public WmsResponse(String code, String msg) { + this.code = code; + this.msg = msg; + this.resDateTime = new Date(); + } +} diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/manager/WmsManager.java b/igds-api-inte/src/main/java/com/ld/igds/wms/manager/WmsManager.java new file mode 100644 index 0000000..e70a42c --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/manager/WmsManager.java @@ -0,0 +1,54 @@ +package com.ld.igds.wms.manager; + +import com.alibaba.fastjson.JSONObject; +import com.ld.igds.wms.constant.WmsCodeEnum; +import com.ld.igds.wms.data.WmsRequest; +import com.ld.igds.wms.data.WmsResponse; +import com.ld.igds.wms.service.WmsService; +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; +import java.util.HashMap; +import java.util.Map; + +/** + * 姝︽眽榛勯檪鍐涚伯-绔嬩綋搴撴帴鍙� + * 涓氬姟鎺ュ彛鍒嗗彂 + * + * @author czt + */ +@Component +public class WmsManager implements ApplicationContextAware { + + private static Map<String, WmsService> serviceMap; + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + Map<String, WmsService> map = applicationContext.getBeansOfType(WmsService.class); + serviceMap = new HashMap<>(); + for (String key : map.keySet()) { + serviceMap.put(map.get(key).getInterfaceId(), map.get(key)); + } + } + + + /** + * 涓氬姟鎵ц鍏ュ彛 + * @param req + * @return + * @throws Exception + */ + @SuppressWarnings("unchecked") + public WmsResponse execute(WmsRequest<JSONObject> req) throws Exception{ + + WmsService service = serviceMap.get(req.getInterfaceId()); + + if(null == service){ + //閫氳澶辫触 + return new WmsResponse(WmsCodeEnum.WMS_CODE_1004.getCode(), WmsCodeEnum.WMS_CODE_1004.getMsg()); + } + + return service.execute(req); + } +} diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/service/WmsService.java b/igds-api-inte/src/main/java/com/ld/igds/wms/service/WmsService.java new file mode 100644 index 0000000..de6111d --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/service/WmsService.java @@ -0,0 +1,29 @@ +package com.ld.igds.wms.service; + +import com.alibaba.fastjson.JSONObject; +import com.ld.igds.wms.data.WmsRequest; +import com.ld.igds.wms.data.WmsResponse; + +/** + * 姝︽眽榛勯檪鍐涚伯-绔嬩綋搴撴帴鍙� + * 涓氬姟鎺ュ彛鍒嗗彂 + * + * @author czt + */ +public interface WmsService { + + /** + * 鑾峰彇鎺ュ彛缂栫爜 + * + * @return + */ + public String getInterfaceId(); + + /** + * 涓氬姟鎵ц + * @param req + * @return + * @throws Exception + */ + public WmsResponse execute(WmsRequest<JSONObject> req) throws Exception; +} diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1001.java b/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1001.java new file mode 100644 index 0000000..251147e --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1001.java @@ -0,0 +1,39 @@ +package com.ld.igds.wms.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.ld.igds.wms.constant.WmsCodeEnum; +import com.ld.igds.wms.constant.WmsConstant; +import com.ld.igds.wms.data.WmsParam; +import com.ld.igds.wms.data.WmsRequest; +import com.ld.igds.wms.data.WmsResponse; +import com.ld.igds.wms.service.WmsService; +import org.springframework.stereotype.Service; + +/** + * 1001-鍏ュ簱 + * + * @author czt + */ +@Service +public class WmsServiceImpl1001 implements WmsService { + + + @Override + public String getInterfaceId() { + return WmsConstant.API_WMS_1001; + } + + @SuppressWarnings("unchecked") + @Override + public WmsResponse execute(WmsRequest<JSONObject> req){ + //杞寲璇锋眰鍙傛暟 + WmsParam param = JSONObject.parseObject(req.getData().toString(), WmsParam.class); + + //TODO 瑙f瀽鏁版嵁 + + + + //璇锋眰鎴愬姛 + return new WmsResponse(WmsCodeEnum.WMS_CODE_0000.getCode(), WmsCodeEnum.WMS_CODE_0000.getMsg()); + } +} diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1002.java b/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1002.java new file mode 100644 index 0000000..cbba3d2 --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1002.java @@ -0,0 +1,39 @@ +package com.ld.igds.wms.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.ld.igds.wms.constant.WmsCodeEnum; +import com.ld.igds.wms.constant.WmsConstant; +import com.ld.igds.wms.data.WmsParam; +import com.ld.igds.wms.data.WmsRequest; +import com.ld.igds.wms.data.WmsResponse; +import com.ld.igds.wms.service.WmsService; +import org.springframework.stereotype.Service; + +/** + * 1002-鍑哄簱 + * + * @author czt + */ +@Service +public class WmsServiceImpl1002 implements WmsService { + + + @Override + public String getInterfaceId() { + return WmsConstant.API_WMS_1001; + } + + @SuppressWarnings("unchecked") + @Override + public WmsResponse execute(WmsRequest<JSONObject> req){ + //杞寲璇锋眰鍙傛暟 + WmsParam param = JSONObject.parseObject(req.getData().toString(), WmsParam.class); + + //TODO 瑙f瀽鏁版嵁 + + + + //璇锋眰鎴愬姛 + return new WmsResponse(WmsCodeEnum.WMS_CODE_0000.getCode(), WmsCodeEnum.WMS_CODE_0000.getMsg()); + } +} diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1003.java b/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1003.java new file mode 100644 index 0000000..b47a0f0 --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1003.java @@ -0,0 +1,39 @@ +package com.ld.igds.wms.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.ld.igds.wms.constant.WmsCodeEnum; +import com.ld.igds.wms.constant.WmsConstant; +import com.ld.igds.wms.data.WmsParam; +import com.ld.igds.wms.data.WmsRequest; +import com.ld.igds.wms.data.WmsResponse; +import com.ld.igds.wms.service.WmsService; +import org.springframework.stereotype.Service; + +/** + * 1003-绉诲簱 + * + * @author czt + */ +@Service +public class WmsServiceImpl1003 implements WmsService { + + + @Override + public String getInterfaceId() { + return WmsConstant.API_WMS_1003; + } + + @SuppressWarnings("unchecked") + @Override + public WmsResponse execute(WmsRequest<JSONObject> req){ + //杞寲璇锋眰鍙傛暟 + WmsParam param = JSONObject.parseObject(req.getData().toString(), WmsParam.class); + + //TODO 瑙f瀽鏁版嵁 + + + + //璇锋眰鎴愬姛 + return new WmsResponse(WmsCodeEnum.WMS_CODE_0000.getCode(), WmsCodeEnum.WMS_CODE_0000.getMsg()); + } +} diff --git a/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1004.java b/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1004.java new file mode 100644 index 0000000..fe9ff7e --- /dev/null +++ b/igds-api-inte/src/main/java/com/ld/igds/wms/service/impl/WmsServiceImpl1004.java @@ -0,0 +1,39 @@ +package com.ld.igds.wms.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.ld.igds.wms.constant.WmsCodeEnum; +import com.ld.igds.wms.constant.WmsConstant; +import com.ld.igds.wms.data.WmsParam; +import com.ld.igds.wms.data.WmsRequest; +import com.ld.igds.wms.data.WmsResponse; +import com.ld.igds.wms.service.WmsService; +import org.springframework.stereotype.Service; + +/** + * 1004-搴撳瓨 + * + * @author czt + */ +@Service +public class WmsServiceImpl1004 implements WmsService { + + + @Override + public String getInterfaceId() { + return WmsConstant.API_WMS_1004; + } + + @SuppressWarnings("unchecked") + @Override + public WmsResponse execute(WmsRequest<JSONObject> req){ + //杞寲璇锋眰鍙傛暟 + WmsParam param = JSONObject.parseObject(req.getData().toString(), WmsParam.class); + + //TODO 瑙f瀽鏁版嵁 + + + + //璇锋眰鎴愬姛 + return new WmsResponse(WmsCodeEnum.WMS_CODE_0000.getCode(), WmsCodeEnum.WMS_CODE_0000.getMsg()); + } +} diff --git a/igds-web/pom.xml b/igds-web/pom.xml index 745571c..1753995 100644 --- a/igds-web/pom.xml +++ b/igds-web/pom.xml @@ -143,12 +143,12 @@ </dependency> - <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屾皵璞℃帴鍙� + <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屾皵璞℃帴鍙�--> <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-api-inte</artifactId> <version>${igds.version}</version> - </dependency> --> + </dependency> <!-- 绉佹湁鍗忚-椋庢鑷磋繙--> @@ -252,54 +252,54 @@ </plugin> <!-- YUI Compressor Maven鍘嬬缉鎻掍欢 寮�鍙戝寘涓嶅疄鐢�--> -<!-- <plugin>--> -<!-- <groupId>net.alchim31.maven</groupId>--> -<!-- <artifactId>yuicompressor-maven-plugin</artifactId>--> -<!-- <version>1.5.1</version>--> -<!-- <executions>--> -<!-- <execution>--> -<!-- <goals>--> -<!-- <goal>compress</goal>--> -<!-- </goals>--> -<!-- </execution>--> -<!-- </executions>--> -<!-- <configuration>--> -<!-- <encoding>UTF-8</encoding>--> -<!-- <!–涓嶆樉绀簀s鍙兘鐨勯敊璇� –>--> -<!-- <jswarn>false</jswarn>--> -<!-- <!–鏄惁娣锋穯 –>--> -<!-- <nomunge>true</nomunge>--> -<!-- <!–鑻ュ瓨鍦ㄥ凡鍘嬬缉鐨勬枃浠讹紝浼氬厛瀵规瘮婧愭枃浠舵槸鍚︽湁鏀瑰姩 鏈夋敼鍔ㄤ究鍘嬬缉锛屾棤鏀瑰姩灏变笉鍘嬬缉 –>--> -<!-- <force>false</force>--> -<!-- <!–鍦ㄦ寚瀹氱殑鍒楀彿鍚庢彃鍏ユ柊琛� –>--> -<!-- <linebreakpos>-1</linebreakpos>--> -<!-- <!–鍘嬬缉涔嬪墠鍏堟墽琛岃仛鍚堟枃浠舵搷浣� –>--> -<!-- <preProcessAggregates>true</preProcessAggregates>--> -<!-- <!–鍘嬬缉鍚庝繚瀛樻枃浠跺悗缂� 鏃犲悗缂� –>--> -<!-- <nosuffix>true</nosuffix>--> -<!-- <!–婧愮洰褰曪紝鍗抽渶鍘嬬缉鐨勬牴鐩綍 –>--> -<!-- <sourceDirectory>src/main/resources</sourceDirectory>--> -<!-- <!–杈撳嚭鐩綍锛屽嵆鍘嬬缉鍚庣殑鐩綍 –>--> -<!-- <outputDirectory>target/classes</outputDirectory>--> -<!-- <force>true</force>--> -<!-- <!–鍘嬬缉js鍜宑ss鏂囦欢 –>--> -<!-- <includes>--> -<!-- <include>**/*.js</include>--> -<!-- <include>**/*.css</include>--> -<!-- </includes>--> -<!-- <!– 浠ヤ笅鐩綍鍜屾枃浠朵笉浼氳鍘嬬缉 –>--> -<!-- <excludes>--> -<!-- <exclude>**/*.min.js</exclude>--> -<!-- <exclude>**/*.min.css</exclude>--> -<!-- <exclude>**/d7/**</exclude>--> -<!-- <exclude>**/dorado-home/**</exclude>--> -<!-- <exclude>**/bdf2/**</exclude>--> -<!-- <exclude>**/css/**</exclude>--> -<!-- <exclude>**/js/**</exclude>--> -<!-- <exclude>**/plugins/**</exclude>--> -<!-- </excludes>--> -<!-- </configuration>--> -<!-- </plugin>--> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>yuicompressor-maven-plugin</artifactId> + <version>1.5.1</version> + <executions> + <execution> + <goals> + <goal>compress</goal> + </goals> + </execution> + </executions> + <configuration> + <encoding>UTF-8</encoding> + <!--涓嶆樉绀簀s鍙兘鐨勯敊璇� --> + <jswarn>false</jswarn> + <!--鏄惁娣锋穯 --> + <nomunge>true</nomunge> + <!--鑻ュ瓨鍦ㄥ凡鍘嬬缉鐨勬枃浠讹紝浼氬厛瀵规瘮婧愭枃浠舵槸鍚︽湁鏀瑰姩 鏈夋敼鍔ㄤ究鍘嬬缉锛屾棤鏀瑰姩灏变笉鍘嬬缉 --> + <force>false</force> + <!--鍦ㄦ寚瀹氱殑鍒楀彿鍚庢彃鍏ユ柊琛� --> + <linebreakpos>-1</linebreakpos> + <!--鍘嬬缉涔嬪墠鍏堟墽琛岃仛鍚堟枃浠舵搷浣� --> + <preProcessAggregates>true</preProcessAggregates> + <!--鍘嬬缉鍚庝繚瀛樻枃浠跺悗缂� 鏃犲悗缂� --> + <nosuffix>true</nosuffix> + <!--婧愮洰褰曪紝鍗抽渶鍘嬬缉鐨勬牴鐩綍 --> + <sourceDirectory>src/main/resources</sourceDirectory> + <!--杈撳嚭鐩綍锛屽嵆鍘嬬缉鍚庣殑鐩綍 --> + <outputDirectory>target/classes</outputDirectory> + <force>true</force> + <!--鍘嬬缉js鍜宑ss鏂囦欢 --> + <includes> + <include>**/*.js</include> + <include>**/*.css</include> + </includes> + <!-- 浠ヤ笅鐩綍鍜屾枃浠朵笉浼氳鍘嬬缉 --> + <excludes> + <exclude>**/*.min.js</exclude> + <exclude>**/*.min.css</exclude> + <exclude>**/d7/**</exclude> + <exclude>**/dorado-home/**</exclude> + <exclude>**/bdf2/**</exclude> + <exclude>**/css/**</exclude> + <exclude>**/js/**</exclude> + <exclude>**/plugins/**</exclude> + </excludes> + </configuration> + </plugin> </plugins> diff --git a/igds-web/src/main/resources/application.yml b/igds-web/src/main/resources/application.yml index d4fc45c..af38ae1 100644 --- a/igds-web/src/main/resources/application.yml +++ b/igds-web/src/main/resources/application.yml @@ -1,7 +1,7 @@ ########################## Server ########################## 涓规1鍩庡叧鐪佺伯椋熷偍澶囧簱 spring: profiles: - active: pro5012 + active: linux application: name: igds main: diff --git a/igds-web/src/main/resources/dorado-home/datasources.xml b/igds-web/src/main/resources/dorado-home/datasources.xml index 48c4b32..5bb307f 100644 --- a/igds-web/src/main/resources/dorado-home/datasources.xml +++ b/igds-web/src/main/resources/dorado-home/datasources.xml @@ -76,6 +76,9 @@ <!--鏀惧紑涓婃捣浣戝崜鎺ュ彛--> <bdf:anonymous-url urlPattern="/api/sh/**" /> + <!--鏀惧紑姝︽眽榛勯檪绔嬩綋搴撴帴鍙�--> + <bdf:anonymous-url urlPattern="/api/wms/**" /> + <!--鏀惧紑娴峰悍娴佸獟浣撲簨浠舵帴鏀舵帴鍙�--> <bdf:anonymous-url urlPattern="/eventRcv/**" /> <!--鎻掍欢鎺ㄩ�佺伯鎯呮帴鏀舵帴鍙�--> -- Gitblit v1.9.3