From 2ace0260c38082770c02b909f66584fc0d49a31c Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期三, 13 九月 2023 13:47:10 +0800
Subject: [PATCH] 修改生产环境配置，利用率列表三级分层顺序
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 6
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 135 +++++++++++++++++----------------
lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml | 22 ++++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java | 42 ++++++++++
5 files changed, 133 insertions(+), 74 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
index e5c2999..796493d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
import org.jeecg.modules.mdc.entity.XYZAliases;
@@ -17,6 +18,7 @@
private String equipmentModel;
//閲囬泦鏃堕棿
+ @JSONField(name = "CollectTime")
private Date CollectTime;
//璁惧缂栧彿
private String equipmentID;
@@ -39,8 +41,10 @@
//瀹為檯杩涚粰閫熷害
private String actualfeedrate;
//绋嬪簭鎵ц琛屾暟
+ @JSONField(name = "Programnumber")
private String Programnumber;
//搴忓垪鍙�
+ @JSONField(name = "Sequencenumber")
private String Sequencenumber;
//鎵ц浠ｇ爜
private String executingcode;
@@ -53,36 +57,55 @@
//宸ヤ綔鐘舵��
private String workstate;
//鎶ヨ鐘舵��
+ @JSONField(name = "ALRMstate")
private String ALRMstate;
//宸ヤ欢鍚嶇О
+ @JSONField(name = "ProductName")
private String ProductName;
+ //宸ヤ欢鏁伴噺
+ @JSONField(name = "ProductCount")
+ private String ProductCount;
//鏈哄簥X杞村潗鏍�
+ @JSONField(name = "Xmachine")
private String Xmachine;
//鏈哄簥Y杞村潗鏍�
+ @JSONField(name = "Ymachine")
private String Ymachine;
//鏈哄簥Y杞村潗鏍�
+ @JSONField(name = "Zmachine")
private String Zmachine;
//鏈哄簥Z杞村潗鏍�
+ @JSONField(name = "Amachine")
private String Amachine;
//鏈哄簥A杞村潗鏍�
+ @JSONField(name = "Bmachine")
private String Bmachine;
//X杞村潗鏍囩粷瀵瑰潗鏍�
+ @JSONField(name = "Xabsolute")
private String Xabsolute;
//X杞村潗鏍囩粷瀵瑰潗鏍�
+ @JSONField(name = "Yabsolute")
private String Yabsolute;
//X杞村潗鏍囩粷瀵瑰潗鏍�
+ @JSONField(name = "Zabsolute")
private String Zabsolute;
//X杞村潗鏍囩粷瀵瑰潗鏍�
+ @JSONField(name = "Aabsolute")
private String Aabsolute;
//X杞村潗鏍囩粷瀵瑰潗鏍�
+ @JSONField(name = "Babsolute")
private String Babsolute;
//绯荤粺鐗堟湰鍙�
+ @JSONField(name = "SystemVersion")
private String SystemVersion;
//鏁版帶绯荤粺鍨嬪彿
+ @JSONField(name = "SystemType")
private String SystemType;
//鏈�澶ц酱鏁�
+ @JSONField(name = "MaxAxis")
private String MaxAxis;
//鏈夋晥杞存暟
+ @JSONField(name = "ValidAxis")
private String ValidAxis;
//璁惧鍔熺巼
@@ -176,43 +199,62 @@
private String equipmentNormalTime;
// 璁惧ID
+ @JSONField(name = "EquipmentID")
private String EquipmentID;
// KI1鐘舵��
+ @JSONField(name = "P1001")
private String P1001;
// KI2鐘舵��
+ @JSONField(name = "P1002")
private String P1002;
// KI3鐘舵��
+ @JSONField(name = "P1003")
private String P1003;
// KI4鐘舵��
+ @JSONField(name = "P1004")
private String P1004;
// AI1鏁版嵁
+ @JSONField(name = "P1005")
private String P1005;
// AI2鏁版嵁
+ @JSONField(name = "P1006")
private String P1006;
// KI1璁℃暟
+ @JSONField(name = "P1007")
private String P1007;
// KI2璁℃暟
+ @JSONField(name = "P1008")
private String P1008;
// KI3璁℃暟
+ @JSONField(name = "P1009")
private String P1009;
// KI4璁℃暟
+ @JSONField(name = "P1010")
private String P1010;
// KO1杈撳嚭
+ @JSONField(name = "P1011")
private String P1011;
// KO2杈撳嚭
+ @JSONField(name = "P1012")
private String P1012;
//璁惧杩愯鏃堕棿
+ @JSONField(name = "EquipmentTime")
private String EquipmentTime;
//褰撳墠鍒�鍏峰彿
+ @JSONField(name = "ToolNum")
private String ToolNum;
//NC鐗堟湰
+ @JSONField(name = "NCVersion")
private String NCVersion;
//TNC鐗堟湰
+ @JSONField(name = "TNCVersion")
private String TNCVersion;
//OPT鐗堟湰
+ @JSONField(name = "OPTVersion")
private String OPTVersion;
//PLC鐗堟湰
+ @JSONField(name = "PLCVersion")
private String PLCVersion;
//澶囨敞
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
index 04bfbad..ef07a3a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
@@ -64,7 +64,7 @@
ei.setFeedrate(map.get("feedrate") == null ? null : map.get("feedrate").toString());
ei.setFeedbeilv(map.get("feedbeilv") == null ? null : map.get("feedbeilv").toString());
ei.setProgramnumber(map.get("Programnumber") == null ? null : map.get("Programnumber").toString());
- ei.setSequencenumber(map.get("SEQUENCENUMBER") == null ? null : map.get("SEQUENCENUMBER").toString());
+ ei.setSequencenumber(map.get("Sequencenumber") == null ? null : map.get("Sequencenumber").toString());
ei.setExecutingcode(map.get("executingcode") == null ? null : map.get("executingcode").toString());
ei.setProductName(map.get("ProductName") == null ? null : map.get("ProductName").toString());
dto.add(ei);
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index c1803fa..8244246 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -110,7 +110,7 @@
// 閮ㄩ棬灞傜骇
List<MdcEquDepDto> equipmentList = mdcEquipmentService.findEquDepList(vo.getEquipmentIdList());
// 鏌ヨ鎵�鏈夐儴闂ㄤ俊鎭�
- List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()));
+ List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(SysDepart::getDepartName));
for (MdcEquDepDto mdcEquDepDto : equipmentList) {
MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto();
@@ -290,7 +290,7 @@
// 閮ㄩ棬灞傜骇
List<MdcEquDepDto> equipmentList = mdcEquipmentService.findEquDepList(vo.getEquipmentIdList());
// 鏌ヨ鎵�鏈夐儴闂ㄤ俊鎭�
- List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()));
+ List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(SysDepart::getDepartName));
for (MdcEquDepDto mdcEquDepDto : equipmentList) {
MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto();
@@ -470,7 +470,7 @@
// 閮ㄩ棬灞傜骇
List<MdcEquDepDto> equipmentList = mdcEquipmentService.findEquDepList(vo.getEquipmentIdList());
// 鏌ヨ鎵�鏈夐儴闂ㄤ俊鎭�
- List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()));
+ List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(SysDepart::getDepartName));
// 鐝鍚嶇О鏄剧ず澶勭悊
String shiftSubName = "";
if (StringUtils.isBlank(vo.getShiftId())) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 6214b1d..4a9d25f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -18,6 +18,7 @@
import org.jeecg.modules.mdc.mapper.XYZAliasesMapper;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
import org.jeecg.modules.mdc.service.*;
+import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.FindsEquipmentDepartUtil;
import org.jeecg.modules.mdc.util.FindsEquipmentProductionUtil;
import org.jeecg.modules.mdc.vo.MdcEquipmentDepVo;
@@ -379,76 +380,82 @@
String englishName = mdcDriveTypeParamConfig.getEnglishName();
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(dto);
Object result = jsonObject.get(englishName);
- String value = result == null ? null : result.toString();
+ String value = "";
+ if ("CollectTime".equals(englishName)) {
+ Date date = result == null ? null : (Date) result;
+ value = DateUtils.format(date, DateUtils.STR_DATE_TIME_SMALL);
+ } else {
+ value = result == null ? null : result.toString();
+ }
mdcDriveTypeParamConfig.setValue(value);
}
mdcEquipmentDto.setMdcDriveTypeParamConfigList(mdcDriveTypeParamList);
}
}
- // 璁惧鍧愭爣鏁� 鑾峰彇璁惧闇�瑕侀噰闆嗙殑鍧愭爣淇℃伅
- List<XYZAliases> equipmentCoordinateList = xyzAliasesMapper.getCoordinateByEquipmentId(mdcEquipment.getEquipmentId());
- // 璁惧閲囬泦鐨勫潗鏍囦俊鎭�
- EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipment.getEquipmentId());
- JSONObject jsonEquipmentXYZ = (JSONObject) JSONObject.toJSON(equipmentXYZ);
- if (equipmentCoordinateList != null && !equipmentCoordinateList.isEmpty()) {
- for (XYZAliases xyzAliases : equipmentCoordinateList) {
- String englishName = xyzAliases.getXYZFieldName().toLowerCase();
- englishName = englishName.substring(0, 1) + "_" + englishName.substring(1, englishName.length());
- englishName = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, englishName);
- Object orgValue = jsonEquipmentXYZ.get(englishName);
- String value = orgValue != null ? orgValue.toString() : null;
- // 鍧愭爣鏁版嵁鐨則itle 鏉ヨ嚜 xyzAliases 琛�, 鏍规嵁 鏄惁鍖呭惈 absolute 鍜� machine 鍒ゆ柇鏄粷瀵瑰潗鏍囪繕鏄満搴婂潗鏍�
- String title = englishName.substring(0, 1).toUpperCase();
- title = englishName.contains("absolute") ? "缁濆鍧愭爣" + title : "鏈哄簥鍧愭爣" + title;
- xyzAliases.setTitle(title);
- xyzAliases.setValue(value);
- }
- mdcEquipmentDto.setXyzAliasesList(equipmentCoordinateList);
- }
+// // 璁惧鍧愭爣鏁� 鑾峰彇璁惧闇�瑕侀噰闆嗙殑鍧愭爣淇℃伅
+// List<XYZAliases> equipmentCoordinateList = xyzAliasesMapper.getCoordinateByEquipmentId(mdcEquipment.getEquipmentId());
+// // 璁惧閲囬泦鐨勫潗鏍囦俊鎭�
+// EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipment.getEquipmentId());
+// JSONObject jsonEquipmentXYZ = (JSONObject) JSONObject.toJSON(equipmentXYZ);
+// if (equipmentCoordinateList != null && !equipmentCoordinateList.isEmpty()) {
+// for (XYZAliases xyzAliases : equipmentCoordinateList) {
+// String englishName = xyzAliases.getXYZFieldName().toLowerCase();
+// englishName = englishName.substring(0, 1) + "_" + englishName.substring(1, englishName.length());
+// englishName = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, englishName);
+// Object orgValue = jsonEquipmentXYZ.get(englishName);
+// String value = orgValue != null ? orgValue.toString() : null;
+// // 鍧愭爣鏁版嵁鐨則itle 鏉ヨ嚜 xyzAliases 琛�, 鏍规嵁 鏄惁鍖呭惈 absolute 鍜� machine 鍒ゆ柇鏄粷瀵瑰潗鏍囪繕鏄満搴婂潗鏍�
+// String title = englishName.substring(0, 1).toUpperCase();
+// title = englishName.contains("absolute") ? "缁濆鍧愭爣" + title : "鏈哄簥鍧愭爣" + title;
+// xyzAliases.setTitle(title);
+// xyzAliases.setValue(value);
+// }
+// mdcEquipmentDto.setXyzAliasesList(equipmentCoordinateList);
+// }
- if (equipmentXYZ != null) {
- mdcEquipmentDto.setXmachine(equipmentXYZ.getXMachine());
- mdcEquipmentDto.setYmachine(equipmentXYZ.getYMachine());
- mdcEquipmentDto.setZmachine(equipmentXYZ.getZMachine());
- mdcEquipmentDto.setAmachine(equipmentXYZ.getAMachine());
- mdcEquipmentDto.setBmachine(equipmentXYZ.getBMachine());
- mdcEquipmentDto.setXabsolute(equipmentXYZ.getXAbsolute());
- mdcEquipmentDto.setYabsolute(equipmentXYZ.getYAbsolute());
- mdcEquipmentDto.setZabsolute(equipmentXYZ.getZAbsolute());
- mdcEquipmentDto.setAabsolute(equipmentXYZ.getAAbsolute());
- mdcEquipmentDto.setBabsolute(equipmentXYZ.getBAbsolute());
- }
- EquipmentBaseInfo equipmentBaseInfo = equipmentBaseInfoService.getByEquipmentId(mdcEquipment.getEquipmentId());
- if (equipmentBaseInfo != null) {
- mdcEquipmentDto.setMaxAxis(equipmentBaseInfo.getMaxAxis());
- mdcEquipmentDto.setValidAxis(equipmentBaseInfo.getValidAxis());
- }
- if (controlSystem.getDriveType().equals("SIEMENS840DSL")) {
- EquipmentTemperatureDto equipmentTemperature = equipmentTemperatureService.getEquipmentTemperature(mdcEquipment.getEquipmentId());
- if (equipmentTemperature != null) {
- mdcEquipmentDto.setTemperatureX(equipmentTemperature.getX());
- mdcEquipmentDto.setTemperatureY(equipmentTemperature.getY());
- mdcEquipmentDto.setTemperatureZ(equipmentTemperature.getZ());
- mdcEquipmentDto.setTemperatureA(equipmentTemperature.getA());
- mdcEquipmentDto.setTemperatureB(equipmentTemperature.getB());
- }
- EquipmentTemperatureDto equipmentLagError = equipmentTemperatureService.getEquipmentLagError(mdcEquipment.getEquipmentId());
- if (equipmentLagError != null) {
- mdcEquipmentDto.setEquipmentLagErrorX(equipmentLagError.getX());
- mdcEquipmentDto.setEquipmentLagErrorY(equipmentLagError.getY());
- mdcEquipmentDto.setEquipmentLagErrorZ(equipmentLagError.getZ());
- mdcEquipmentDto.setEquipmentLagErrorA(equipmentLagError.getA());
- mdcEquipmentDto.setEquipmentLagErrorB(equipmentLagError.getB());
- }
- }
- EquipmentTemperatureDto equipmentCurrent = equipmentTemperatureService.getEquipmentCurrent(mdcEquipment.getEquipmentId());
- if (equipmentCurrent != null) {
- mdcEquipmentDto.setEquipmentCurrentX(equipmentCurrent.getX());
- mdcEquipmentDto.setEquipmentCurrentY(equipmentCurrent.getY());
- mdcEquipmentDto.setEquipmentCurrentZ(equipmentCurrent.getZ());
- mdcEquipmentDto.setEquipmentCurrentA(equipmentCurrent.getA());
- mdcEquipmentDto.setEquipmentCurrentB(equipmentCurrent.getB());
- }
+// if (equipmentXYZ != null) {
+// mdcEquipmentDto.setXmachine(equipmentXYZ.getXMachine());
+// mdcEquipmentDto.setYmachine(equipmentXYZ.getYMachine());
+// mdcEquipmentDto.setZmachine(equipmentXYZ.getZMachine());
+// mdcEquipmentDto.setAmachine(equipmentXYZ.getAMachine());
+// mdcEquipmentDto.setBmachine(equipmentXYZ.getBMachine());
+// mdcEquipmentDto.setXabsolute(equipmentXYZ.getXAbsolute());
+// mdcEquipmentDto.setYabsolute(equipmentXYZ.getYAbsolute());
+// mdcEquipmentDto.setZabsolute(equipmentXYZ.getZAbsolute());
+// mdcEquipmentDto.setAabsolute(equipmentXYZ.getAAbsolute());
+// mdcEquipmentDto.setBabsolute(equipmentXYZ.getBAbsolute());
+// }
+// EquipmentBaseInfo equipmentBaseInfo = equipmentBaseInfoService.getByEquipmentId(mdcEquipment.getEquipmentId());
+// if (equipmentBaseInfo != null) {
+// mdcEquipmentDto.setMaxAxis(equipmentBaseInfo.getMaxAxis());
+// mdcEquipmentDto.setValidAxis(equipmentBaseInfo.getValidAxis());
+// }
+// if (controlSystem.getDriveType().equals("SIEMENS840DSL")) {
+// EquipmentTemperatureDto equipmentTemperature = equipmentTemperatureService.getEquipmentTemperature(mdcEquipment.getEquipmentId());
+// if (equipmentTemperature != null) {
+// mdcEquipmentDto.setTemperatureX(equipmentTemperature.getX());
+// mdcEquipmentDto.setTemperatureY(equipmentTemperature.getY());
+// mdcEquipmentDto.setTemperatureZ(equipmentTemperature.getZ());
+// mdcEquipmentDto.setTemperatureA(equipmentTemperature.getA());
+// mdcEquipmentDto.setTemperatureB(equipmentTemperature.getB());
+// }
+// EquipmentTemperatureDto equipmentLagError = equipmentTemperatureService.getEquipmentLagError(mdcEquipment.getEquipmentId());
+// if (equipmentLagError != null) {
+// mdcEquipmentDto.setEquipmentLagErrorX(equipmentLagError.getX());
+// mdcEquipmentDto.setEquipmentLagErrorY(equipmentLagError.getY());
+// mdcEquipmentDto.setEquipmentLagErrorZ(equipmentLagError.getZ());
+// mdcEquipmentDto.setEquipmentLagErrorA(equipmentLagError.getA());
+// mdcEquipmentDto.setEquipmentLagErrorB(equipmentLagError.getB());
+// }
+// }
+// EquipmentTemperatureDto equipmentCurrent = equipmentTemperatureService.getEquipmentCurrent(mdcEquipment.getEquipmentId());
+// if (equipmentCurrent != null) {
+// mdcEquipmentDto.setEquipmentCurrentX(equipmentCurrent.getX());
+// mdcEquipmentDto.setEquipmentCurrentY(equipmentCurrent.getY());
+// mdcEquipmentDto.setEquipmentCurrentZ(equipmentCurrent.getZ());
+// mdcEquipmentDto.setEquipmentCurrentA(equipmentCurrent.getA());
+// mdcEquipmentDto.setEquipmentCurrentB(equipmentCurrent.getB());
+// }
}
return mdcEquipmentDto;
}
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
index bf9bf19..2a44c8b 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 9999
tomcat:
max-swallow-size: -1
error:
@@ -132,11 +132,21 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://192.168.0.29:1433;databasename=LXZN_TEST_430
+ url: jdbc:sqlserver://166.0.1.10:1433;databasename=LXZN_TEST_430
username: sa
- password: LXZN@1688
+ password: 123
#password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ #url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ #username: root
+ #password: root
+ #driver-class-name: com.mysql.cj.jdbc.Driver
+ # 澶氭暟鎹簮閰嶇疆
+ #multi-datasource1:
+ # url: jdbc:sqlserver://192.168.0.118:1433;databasename=lxzn_test
+ # username: sa
+ # password: 123
+ # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
#redis 閰嶇疆
redis:
database: 0
@@ -169,7 +179,7 @@
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
# 绛惧悕鎷︽埅鎺ュ彛
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
- #local\minio\alioss
+ #local銆乵inio銆乤lioss
uploadType: local
# 鍓嶇璁块棶鍦板潃
domainUrl:
@@ -177,9 +187,9 @@
app: http://localhost:8051
path:
#鏂囦欢涓婁紶鏍圭洰褰� 璁剧疆
- upload: /opt/jeecg-boot/upload
+ upload: /opt/upFiles
#webapp鏂囦欢璺緞
- webapp: /opt/jeecg-boot/webapp
+ webapp: /opt/webapp
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
#闃块噷浜憃ss瀛樺偍鍜屽ぇ楸肩煭淇＄閽ラ厤缃�
--
Gitblit v1.9.3