From c3e47e5e70a9055b7d25c118eb1f7ec3c869e953 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期四, 05 六月 2025 13:53:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms --- src/main/java/com/zy/common/CodeRes.java | 14 +- src/main/java/com/zy/common/config/AdminInterceptor.java | 4 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java | 5 src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 2 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 235 ++++++++++++++++++++++++++++++++++++---------- src/main/java/com/zy/common/web/WcsController.java | 3 src/main/resources/license.lic | 0 src/main/resources/application.yml | 25 +++- 9 files changed, 220 insertions(+), 71 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 5ba2491..bf83a51 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -100,6 +100,9 @@ if (param.getCombMats().size()>1){ throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode()); } + if(Cools.isEmpty(param.getCombMats().get(0).getBatch())){ + throw new CoolException("鎵瑰彿锛堝敮涓�鐮侊級涓嶈兘涓虹┖===>>" + param.getBarcode()); + } int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode())); int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())); diff --git a/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java index 81bb8f3..e5f382a 100644 --- a/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java +++ b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java @@ -54,7 +54,10 @@ if(config.getStatus()==0){ return; } - + WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no",200)); + if(!Cools.isEmpty(wrkMast1)){ + return; + } BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 200)); if (Cools.isEmpty(basDevp.getLoading())||basDevp.getLoading().equals("N")) { //鎵惧埌鍏ュ簱鏈�鏃╃殑 diff --git a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java index 68e69a0..05e3fab 100644 --- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java @@ -52,7 +52,7 @@ List<WorkIssuedResult.Tasks> tasks = new ArrayList<>(); WorkIssuedResult.Tasks task = new WorkIssuedResult.Tasks(); - task.setTaskId(wrkMast.getWrkNo().toString()); + task.setTaskId(wrkMast.getWrkNo().toString()+"-"+new Date().getTime()); task.setBarCode(wrkMast.getBarcode()); task.setOrder(i); diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java index d71d3e4..71081eb 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -1,21 +1,30 @@ package com.zy.asrs.task.handler; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; +import com.core.exception.CoolException; import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.WrkMast; import com.zy.asrs.service.*; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; +import com.zy.common.service.CommonService; +import com.zy.common.utils.HttpHandler; +import com.zy.system.entity.Config; +import com.zy.system.service.ConfigService; +import javafx.scene.input.DataFormat; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; -import java.util.Iterator; -import java.util.List; +import java.text.SimpleDateFormat; +import java.util.*; /** * Created by vincent on 2020/7/6 @@ -38,62 +47,36 @@ private WaitPakinLogService waitPakinLogService; @Autowired private OrderService orderService; + @Value("${mes.address.url}") + private String url; + @Value("${mes.address.outaddressSave}") + private String outaddressSave; + @Autowired + private ApiLogService apiLogService; + @Autowired + private ConfigService configService; @Transactional public ReturnT<String> start(WrkMast wrkMast) { - try { - List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); - // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴� - if (!Cools.isEmpty(wrkDetls)) { - Iterator<WrkDetl> iterator = wrkDetls.iterator(); - while (iterator.hasNext()) { - WrkDetl wrkDetl = iterator.next(); - if (!Cools.isEmpty(wrkDetl.getOrderNo())) { - orderService.checkComplete(wrkDetl.getOrderNo()); - iterator.remove(); - } - } - } - - // 鍏ュ簱 -------------------------------------------------------------------------------- - if (wrkMast.getWrkSts() == 5) { + List<WrkDetl> wrkDetl = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String formattedDate = sdf.format(wrkMast.getModiTime()); + Config config=configService.selectConfigByCode("reportMes"); + if(config==null||!config.getValue().equals("Y")){ + if(wrkMast.getIoType() == 1){ // 鍏ㄦ澘鍏ュ簱 - if (wrkMast.getIoType() == 1) { - // 鍏ュ簱閫氱煡鍗� - if (!Cools.isEmpty(wrkMast.getBarcode())) { - // 淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。 - if (!waitPakinLogService.save(wrkMast.getBarcode())) { - exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo()); - } - // 鍒犻櫎鍏ュ簱閫氱煡妗� - if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) { - exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo()); - } + // 鍏ュ簱閫氱煡鍗� + if (!Cools.isEmpty(wrkMast.getBarcode())) { + // 淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。 + if (!waitPakinLogService.save(wrkMast.getBarcode())) { + exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo()); } -// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆� -// if (!Cools.isEmpty(wrkDetls)) { -// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) { -// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); -// } -// } - // 鎷f枡鍐嶅叆搴� - } else if (wrkMast.getIoType() == 53) { -// if (!Cools.isEmpty(wrkDetls)) { -// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { -// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); -// } -// } + // 鍒犻櫎鍏ュ簱閫氱煡妗� + if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) { + exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo()); + } } - - // 鍑哄簱 -------------------------------------------------------------------------------- - } else if (wrkMast.getWrkSts() == 15) { -// if (!Cools.isEmpty(wrkDetls)) { -// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { -// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); -// } -// } } - // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗� if (!wrkMastLogService.save(wrkMast.getWrkNo())) { exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo()); @@ -110,6 +93,156 @@ if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) { // exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo()); } + } + try { + LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>(); + String GnBm =""; + String Biaomc=""; + + List<LinkedHashMap<String,Object>> Baocuncanshus = new ArrayList<LinkedHashMap<String,Object>>(); + LinkedHashMap<String,Object> Baocuncanshu=new LinkedHashMap<String,Object>(); + + + // 鍏ュ簱 -------------------------------------------------------------------------------- + if (wrkMast.getIoType() == 1) { + GnBm = "bopp_ck1070d0e"; + Biaomc = "bopp_j000000"; + Baocuncanshu.put("bh",""); + Baocuncanshu.put("djlb","鍗婃垚鍝佸叆搴�"); + Baocuncanshu.put("rq",formattedDate); + Baocuncanshu.put("startStorageId","");//璧峰浣嶇疆 + Baocuncanshu.put("endStorageId","");//鐩爣浣嶇疆 + Baocuncanshu.put("tm_dp_wms",wrkMast.getBarcode());//鎵樼洏鐮� + Baocuncanshu.put("shbz","绔嬪簱");//浣嶇疆绫诲埆 + Baocuncanshu.put("bz","");//澶囨敞 + Baocuncanshu.put("ck","绔嬪簱");//浠撳簱 + Baocuncanshus.add(Baocuncanshu); + // 鍑哄簱 -------------------------------------------------------------------------------- + } else if (wrkMast.getIoType() == 101) { + GnBm = "bopp_ck1090d0e"; + Biaomc = "bopp_j000000"; + Baocuncanshu.put("bh",""); + Baocuncanshu.put("djlb","鏅�氳皟鎷�"); + Baocuncanshu.put("rq",formattedDate); + Baocuncanshu.put("yck","甯冨熀鍗婃垚鍝佷粨"); + Baocuncanshu.put("xck","澶嶅嵎1#鏈鸿捣鐐�"); + Baocuncanshu.put("bh_bopp_e050000",""); + Baocuncanshu.put("ykw","搴撲綅2"); + Baocuncanshu.put("bz","");//澶囨敞 + Baocuncanshu.put("xkw","FJ-01-01-01"); + Baocuncanshus.add(Baocuncanshu); + } + + LinkedHashMap<String,Object> YongHuCanShu= new LinkedHashMap<String,Object>(); + YongHuCanShu.put("QianMingId",""); + map.put("YongHuCanShu",YongHuCanShu); + + LinkedHashMap<String,Object> QiTaCanShu= new LinkedHashMap<String,Object>(); + QiTaCanShu.put("GnBm",GnBm); + QiTaCanShu.put("Operation", "1"); + QiTaCanShu.put("zid", ""); + QiTaCanShu.put("shbz", ""); + QiTaCanShu.put("shjg", ""); + + List<LinkedHashMap<String,Object>> Caozuojihes = new ArrayList<LinkedHashMap<String,Object>>(); + LinkedHashMap<String,Object>Caozuojihe =new LinkedHashMap<String,Object>(); + Caozuojihe.put("Xh1","1"); + Caozuojihe.put("Xh2","1"); + Caozuojihe.put("Biaomc",Biaomc); + + + Caozuojihe.put("Baocuncanshu",Baocuncanshus); + Caozuojihes.add(Caozuojihe); + + LinkedHashMap<String,Object> Caozuojihe1=new LinkedHashMap<String,Object>(); + Caozuojihe1.put("Xh1","1"); + Caozuojihe1.put("Xh2","4"); + Caozuojihe1.put("Biaomc","bopp_j000101"); + + List<LinkedHashMap<String,Object>> Baocuncanshus1 = new ArrayList<LinkedHashMap<String,Object>>(); + LinkedHashMap<String,Object> Baocuncanshu1=new LinkedHashMap<String,Object>(); + Baocuncanshu1.put("tm_xj",wrkDetl.get(0).getBatch());//鍞竴鐮� + Baocuncanshus1.add(Baocuncanshu1); + Caozuojihe1.put("Baocuncanshu",Baocuncanshus1); + + Caozuojihes.add(Caozuojihe1); + + QiTaCanShu.put("Caozuojihe", Caozuojihes); + + map.put("QiTaCanShu",QiTaCanShu); + + HashMap<String,Object>hashMap=new HashMap<String,Object>(); + hashMap.put("Quanjucanshu","%7B%22XiTongCanShu%22%3A%7B%22xt_id%22%3A%2230077%22%2C%22xt_bm%22%3A%22undefined%22%2C%22xt_yhid%22%3A%22156%22%2C%22xt_yhms%22%3A%22%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98%22%2C%22xt_yhbm%22%3A%22admin%22%2C%22xt_qyms%22%3A%221%22%2C%22xt_qyjc%22%3A%221%22%2C%22xt_jsms%22%3A%22%E7%AE%A1%E7%90%86%E5%91%98%22%2C%22xt_yuyan%22%3A%22%22%7D%2C%22NeiBuCanShu%22%3A%7B%7D%7D"); + + String jsonString = JSON.toJSONString(map); + HashMap<String,Object>hashMap1=new HashMap<String,Object>(); + hashMap1.put("CanShuJi",jsonString); + String response = ""; + boolean success = false; + try { + response = new HttpHandler.Builder() + .setHeaders(hashMap) + .setUri(url) + .setPath(outaddressSave) + .setParams(hashMap1) + .build() + .doPost(); + JSONObject jsonObject = JSON.parseObject(response); + if (jsonObject.getString("BianHao").equals("0000")) { + success=true; + if(wrkMast.getIoType() == 1){ + // 鍏ㄦ澘鍏ュ簱 + // 鍏ュ簱閫氱煡鍗� + if (!Cools.isEmpty(wrkMast.getBarcode())) { + // 淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。 + if (!waitPakinLogService.save(wrkMast.getBarcode())) { + exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + // 鍒犻櫎鍏ュ簱閫氱煡妗� + if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) { + exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + } + } + // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗� + if (!wrkMastLogService.save(wrkMast.getWrkNo())) { + exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + // 鍒犻櫎宸ヤ綔涓绘。 + if (!wrkMastService.deleteById(wrkMast)) { + exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。 + if (!wrkDetlLogService.save(wrkMast.getWrkNo())) { +// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + // 鍒犻櫎宸ヤ綔鏄庣粏妗� + if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) { +// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + + } else { + log.error("wms涓婃姤缁撴灉缁檓es澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url+"/"+outaddressSave, JSON.toJSONString(map), response); + throw new CoolException("wms涓婃姤缁撴灉缁檓es澶辫触"); + } + } catch (Exception e) { + log.error("fail", e); +// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return FAIL.setMsg(e.getMessage()); + } finally { + try { + // 淇濆瓨鎺ュ彛鏃ュ織 + apiLogService.save( + "wms涓婃姤缁撴灉缁檓es", + url+"/"+outaddressSave, + null, + "127.0.0.1", + JSON.toJSONString(map), + response, + success + ); + } catch (Exception e) { log.error("", e); } + } } catch (Exception e) { log.error("fail", e); e.printStackTrace(); diff --git a/src/main/java/com/zy/common/CodeRes.java b/src/main/java/com/zy/common/CodeRes.java index 3aabc0f..23d9266 100644 --- a/src/main/java/com/zy/common/CodeRes.java +++ b/src/main/java/com/zy/common/CodeRes.java @@ -5,14 +5,14 @@ public interface CodeRes extends BaseRes { // user - String USER_10001 = "1-璐﹀彿涓嶅瓨鍦�"; - String USER_10002 = "1-璐﹀彿宸茶绂佺敤"; - String USER_10003 = "1-瀵嗙爜閿欒"; + String USER_10001 = "10001-璐﹀彿涓嶅瓨鍦�"; + String USER_10002 = "10002-璐﹀彿宸茶绂佺敤"; + String USER_10003 = "10003-瀵嗙爜閿欒"; - String SYSTEM_20001 = "1-璁稿彲璇佸凡澶辨晥"; + String SYSTEM_20001 = "20001-璁稿彲璇佸凡澶辨晥"; - String EXIST_500 = "1-宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�"; - String PICK_600 = "1-鎷f枡浠诲姟"; - String NO_COMB_700 = "1-璇峰厛缁勬墭"; + String EXIST_500 = "500-宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�"; + String PICK_600 = "600-鎷f枡浠诲姟"; + String NO_COMB_700 = "700-璇峰厛缁勬墭"; } diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java index 547ba96..320c631 100644 --- a/src/main/java/com/zy/common/config/AdminInterceptor.java +++ b/src/main/java/com/zy/common/config/AdminInterceptor.java @@ -119,8 +119,8 @@ User user = userService.selectById(userLogin.getUserId()); // String deToken = Cools.deTokn(token, user.getPassword()); // long timestamp = Long.parseLong(deToken.substring(0, 13)); - // 15鍒嗛挓鍚庤繃鏈� - if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){ + // 180鍒嗛挓鍚庤繃鏈� + if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 10800000){ Http.response(response, BaseRes.DENIED); return false; } diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 4225924..ee11139 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -321,7 +321,8 @@ @PostMapping("/fromwcs/task") @ResponseBody public Re status(@RequestBody StatusParam statusParam) { - WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", statusParam.getTaskId())); + String[] wrkNo=statusParam.getTaskId().split("-",2); + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.parseInt(wrkNo[0]))); if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()!=8){ return Re.error("娌℃湁鎵惧埌:"+statusParam.getTaskId()+"杩欐潯浠诲姟"); }else if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8){ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a8a014e..9d0d342 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8085 + port: 8086 servlet: context-path: /@pom.build.finalName@ @@ -19,7 +19,7 @@ host: localhost port: 6379 database: 0 -# password: xltys1995 + # password: xltys1995 servlet: multipart: maxFileSize: 100MB @@ -58,17 +58,17 @@ # 鍙虫繁搴撲綅鎺掑彿 doubleLocsRight: 4,8,12,16 #鏄惁寮�鍚痺ms涓嬪彂浠诲姟缁檞cs - workIssued-fig : true + workIssued-fig: true #鍦板潃 - url : 192.168.110.100:8082 + url: 192.168.110.100:8082 #wms涓嬪彂浠诲姟缁檞cs - workIssued : fromWms/taskReceive + workIssued: fromWms/taskReceive #搴撲綅鍚屾 loc: fromWms/cargoNoSyn #鍏ュ簱绔� - inDevp : 100 + inDevp: 100 #鍑哄簱绔� - outDevp : 200 + outDevp: 200 # wms鍙傛暟閰嶇疆 wms-parameter: # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏� @@ -82,6 +82,15 @@ comb: limit: 5000 + +#mes瀵规帴 +mes: + switch: + boo: false + address: + url: http://220.189.244.250:10082 + outaddressSave: hmxtapi/Yh_SP/TiJiaoShuJu_AnNui + #erp瀵规帴 erp: @@ -107,7 +116,7 @@ #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧� outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc # 鐧诲綍璐﹀彿绠$悊 - login : + login: acctID: "647e849ab6fa0f" username: "llw" password: "666666" diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic index fd02b05..20a1259 100644 --- a/src/main/resources/license.lic +++ b/src/main/resources/license.lic Binary files differ -- Gitblit v1.9.1