Skip to content

A
amos-boot-biz
Commit 5a72e0c1 authored by KeYong's avatar KeYong
Browse files
Options

Merge branch 'develop_dl_bugfix' of http://36.40.66.175:5000/moa/amos-boot-biz…

Merge branch 'develop_dl_bugfix' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_dl_bugfix
parents 502277ed 76956efb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 692 additions and 487 deletions
amos-boot-biz-common/pom.xml
View file @ 5a72e0c1
......@@ -136,6 +136,12 @@
<artifactId>pagehelper</artifactId>
<version>5.1.10</version>
</dependency>
<!-- 配置文件密码加密相关 -->
<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
</dependencies>
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/ExcelUtil.java
View file @ 5a72e0c1
......@@ -43,7 +43,9 @@ public class ExcelUtil {
Class<?> model, DataSources dataDictionaryMapper, boolean flag) {
HorizontalCellStyleStrategy horizontalCellStyleStrategy = setMyCellStyle();
OutputStream outputStream = null;
try {
outputStream = getOutputStream(fileName, response, ExcelTypeEnum.XLSX);
//下拉列表集合
Map<Integer, String[]> explicitListConstraintMap = new HashMap<>();
if (flag) {
......@@ -56,16 +58,25 @@ public class ExcelUtil {
resolveExplicitConstraint(explicitListConstraintMap, explicitConstraint, dataDictionaryMapper);
}
}
EasyExcel.write(getOutputStream(fileName, response, ExcelTypeEnum.XLSX), model)
.excelType(ExcelTypeEnum.XLSX).sheet(sheetName)
.registerWriteHandler(new TemplateCellWriteHandlerDate(explicitListConstraintMap))
.registerWriteHandler(new TemplateCellWriteHandler())
.registerWriteHandler(horizontalCellStyleStrategy)
.doWrite(data);
if (null != outputStream) {
EasyExcel.write(outputStream, model)
.excelType(ExcelTypeEnum.XLSX).sheet(sheetName)
.registerWriteHandler(new TemplateCellWriteHandlerDate(explicitListConstraintMap))
.registerWriteHandler(new TemplateCellWriteHandler())
.registerWriteHandler(horizontalCellStyleStrategy)
.doWrite(data);
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("系统异常！");
} finally {
if (null != outputStream) {
try {
outputStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
......@@ -85,7 +96,9 @@ public class ExcelUtil {
boolean flag) {
HorizontalCellStyleStrategy horizontalCellStyleStrategy = setMyCellStyle();
OutputStream outputStream = null;
try {
outputStream = getOutputStream(fileName, response, ExcelTypeEnum.XLSX);
// 组装表头
List<List<String>> dutyCarTitleList = new ArrayList<>();
Field[] declaredFields = model.getDeclaredFields();
......@@ -124,16 +137,25 @@ public class ExcelUtil {
}
// String s = new String(fileName.getBytes(), "UTF-8");
// response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(s, "UTF-8"));
ExcelWriterSheetBuilder excelWriterSheetBuilder = EasyExcel.write(getOutputStream(fileName, response,
ExcelTypeEnum.XLSX)).head(dutyCarTitleList).excelType(ExcelTypeEnum.XLSX)
.sheet(sheetName).registerWriteHandler(new TemplateCellWriteHandlerDate(explicitListConstraintMap))
.registerWriteHandler(new TemplateCellWriteHandler())
.registerWriteHandler(horizontalCellStyleStrategy);
excelWriterSheetBuilder.doWrite(data);
if (null != outputStream) {
ExcelWriterSheetBuilder excelWriterSheetBuilder = EasyExcel.write(outputStream)
.head(dutyCarTitleList).excelType(ExcelTypeEnum.XLSX)
.sheet(sheetName).registerWriteHandler(new TemplateCellWriteHandlerDate(explicitListConstraintMap))
.registerWriteHandler(new TemplateCellWriteHandler())
.registerWriteHandler(horizontalCellStyleStrategy);
excelWriterSheetBuilder.doWrite(data);
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("系统异常！");
} finally {
if (null != outputStream) {
try {
outputStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/WorkflowExcuteServiceImpl.java
View file @ 5a72e0c1
......@@ -6,6 +6,7 @@ import com.google.common.collect.Sets;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
import com.yeejoin.amos.boot.biz.common.service.IWorkflowExcuteService;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -29,9 +30,8 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String newDate = sdf.format(new Date());
String result = "";
Random random = new Random();
for (int i = 0; i < 3; i++) {
result += random.nextInt(10);
result += SecureRandomUtil.getIntSecureRandom(10);
}
return newDate + result;
}
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DynamicEnumUtil.java
View file @ 5a72e0c1
......@@ -109,22 +109,26 @@ public class DynamicEnumUtil {
AccessibleObject.setAccessible(new Field[]{valuesField}, true);
try {
// 2. 将他拷贝到数组
T[] previousValues = (T[]) valuesField.get(enumType);
List<T> values = new ArrayList<T>(Arrays.asList(previousValues));
if (null != valuesField) {
// 2. 将他拷贝到数组
T[] previousValues = (T[]) valuesField.get(enumType);
List<T> values = new ArrayList<T>(Arrays.asList(previousValues));
// 3. 创建新的枚举项
T newValue = (T) makeEnum(enumType, enumName, values.size(), additionalTypes, additionalValues);
// 3. 创建新的枚举项
T newValue = (T) makeEnum(enumType, enumName, values.size(), additionalTypes, additionalValues);
// 4. 添加新的枚举项
values.add(newValue);
// 4. 添加新的枚举项
values.add(newValue);
// 5. 设定拷贝的数组，到枚举类型
setFailsafeFieldValue(valuesField, null, values.toArray((T[]) Array.newInstance(enumType, 0)));
// 5. 设定拷贝的数组，到枚举类型
setFailsafeFieldValue(valuesField, null, values.toArray((T[]) Array.newInstance(enumType, 0)));
// 6. 清楚枚举的缓存
cleanEnumCache(enumType);
return newValue;
// 6. 清楚枚举的缓存
cleanEnumCache(enumType);
return newValue;
} else {
return null;
}
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
}
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/QRCodeUtil.java
View file @ 5a72e0c1
......@@ -58,10 +58,9 @@ public class QRCodeUtil {
try {
res = simpleDateFormat.format(new Date(System.currentTimeMillis())).substring(5, 8) + String.valueOf(IdWorker.getFlowIdWorkerInstance().nextId()).substring(0, 10) + randomNumForQrCode;
} catch (Exception e) {
Random random = new Random(System.currentTimeMillis());
String tmp = "";
for (int i = 0; i < 13; i++) {
tmp += random.nextInt(10);
tmp += SecureRandomUtil.getIntSecureRandom(10);
}
res = simpleDateFormat.format(new Date(System.currentTimeMillis())).substring(2, 8) + tmp.substring(0, 10) + randomNumForQrCode;
} finally {
......@@ -78,7 +77,7 @@ public class QRCodeUtil {
*/
public static String temporaryQrCode() {
long qrCode = -1 * System.currentTimeMillis();
qrCode += (long) (random.nextDouble() * 10000000);
qrCode += (long) (SecureRandomUtil.getIntSecureRandomByDouble() * 10000000);
return String.valueOf(qrCode);
}
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/SecureRandomUtil.java 0 → 100644
View file @ 5a72e0c1
package com.yeejoin.amos.boot.biz.common.utils;
import java.security.SecureRandom;
import java.util.Random;
public class SecureRandomUtil {
public static int getIntSecureRandom(Integer bound) {
SecureRandom secureRandom = new SecureRandom();
return secureRandom.nextInt(bound);
}
public static Double getIntSecureRandomByDouble() {
SecureRandom secureRandom = new SecureRandom();
return secureRandom.nextDouble();
}
public static int getIntSecureRandom(Integer bound, SecureRandom secureRandom) {
return secureRandom.nextInt(bound);
}
public static void main(String[] args) {
SecureRandom secureRandom = new SecureRandom();
System.out.println((secureRandom.nextDouble() * 9 + 1) * 100000 + "-----");
Random random = new Random();
System.out.println((Math.random() * 9 + 1) * 100000);
System.out.println((int) (secureRandom.nextDouble() * 900 + 100));
}
}
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/TreeParser.java
View file @ 5a72e0c1
......@@ -322,7 +322,10 @@ public class TreeParser {
String.valueOf(NAMEMethodNameme.invoke(entity)),
String.valueOf(NAMEMethodNameme.invoke(entity)),
String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
String.valueOf(nodeTypeMethod == null ? "0" : nodeTypeMethod.invoke(entity)));
"0");
if (null != nodeTypeMethod && null != nodeTypeMethod.invoke(entity)) {
menu.setNodeType(String.valueOf(nodeTypeMethod.invoke(entity)));
}
resultList.add(menu);
}
}
......@@ -385,7 +388,10 @@ public class TreeParser {
String.valueOf(NAMEMethodNameme.invoke(entity)),
String.valueOf(NAMEMethodNameme.invoke(entity)),
String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
String.valueOf(nodeTypeMethod == null ? "0" : nodeTypeMethod.invoke(entity)));
"0");
if (null != nodeTypeMethod && null != nodeTypeMethod.invoke(entity)) {
menu.setNodeType(String.valueOf(nodeTypeMethod.invoke(entity)));
}
childList.add(menu);
}
} else {
......@@ -396,7 +402,10 @@ public class TreeParser {
String.valueOf(NAMEMethodNameme.invoke(entity)),
String.valueOf(NAMEMethodNameme.invoke(entity)),
String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
String.valueOf(nodeTypeMethod == null ? "0" : nodeTypeMethod.invoke(entity)));
"0");
if (null != nodeTypeMethod && null != nodeTypeMethod.invoke(entity)) {
menu.setNodeType(String.valueOf(nodeTypeMethod.invoke(entity)));
}
childList.add(menu);
}
}
......@@ -420,11 +429,9 @@ public class TreeParser {
public static String genTreeCode() {
int length = CODE_LENGTH;
String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
Random random = new Random();
StringBuffer sb = new StringBuffer();
for (int i = 0; i < length; i++) {
int number = random.nextInt(62);
sb.append(str.charAt(number));
sb.append(str.charAt(SecureRandomUtil.getIntSecureRandom(62)));
}
return sb.toString();
}
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/WordConverterUtils.java
View file @ 5a72e0c1
......@@ -82,7 +82,8 @@ public class WordConverterUtils {
* @param fileService 图片上传接口
*/
private static void docToHtml( String imagePathStr,String readUrl,String srcFile, File targetFile, FileService fileService,String product,String appKey,String token ) {
try {
InputStream in = null;
try {
File imagePath = new File(imagePathStr);
if (!imagePath.exists()) {
imagePath.mkdirs();
......@@ -91,39 +92,48 @@ public class WordConverterUtils {
//链接url
URLConnection uc = url.openConnection();
//获取输入流
InputStream in = uc.getInputStream();
HWPFDocument wordDocument = new HWPFDocument(in);
org.w3c.dom.Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
WordToHtmlConverter wordToHtmlConverter = new WordToHtmlConverter(document);
wordToHtmlConverter.setPicturesManager((content, pictureType, name, width, height) -> {
try {
FileOutputStream out = new FileOutputStream(imagePathStr + name);
out.write(content);
String urlString= fileService.uploadFile(fileToMultipartFile(new File(imagePathStr + name)), product, appKey, token );
//上传平台
return readUrl+urlString;
} catch (Exception e) {
e.printStackTrace();
return "";
}
});
wordToHtmlConverter.processDocument(wordDocument);
org.w3c.dom.Document htmlDocument = wordToHtmlConverter.getDocument();
DOMSource domSource = new DOMSource(htmlDocument);
StreamResult streamResult = new StreamResult(targetFile);
TransformerFactory tf = TransformerFactory.newInstance();
Transformer serializer = tf.newTransformer();
serializer.setOutputProperty(OutputKeys.ENCODING, "utf-8");
serializer.setOutputProperty(OutputKeys.INDENT, "yes");
serializer.setOutputProperty(OutputKeys.METHOD, "html");
serializer.transform(domSource, streamResult);
in = uc.getInputStream();
if (null != in) {
HWPFDocument wordDocument = new HWPFDocument(in);
org.w3c.dom.Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
WordToHtmlConverter wordToHtmlConverter = new WordToHtmlConverter(document);
wordToHtmlConverter.setPicturesManager((content, pictureType, name, width, height) -> {
try {
FileOutputStream out = new FileOutputStream(imagePathStr + name);
out.write(content);
String urlString = fileService.uploadFile(fileToMultipartFile(new File(imagePathStr + name)), product, appKey, token);
//上传平台
return readUrl + urlString;
} catch (Exception e) {
e.printStackTrace();
return "";
}
});
wordToHtmlConverter.processDocument(wordDocument);
org.w3c.dom.Document htmlDocument = wordToHtmlConverter.getDocument();
DOMSource domSource = new DOMSource(htmlDocument);
StreamResult streamResult = new StreamResult(targetFile);
TransformerFactory tf = TransformerFactory.newInstance();
Transformer serializer = tf.newTransformer();
serializer.setOutputProperty(OutputKeys.ENCODING, "utf-8");
serializer.setOutputProperty(OutputKeys.INDENT, "yes");
serializer.setOutputProperty(OutputKeys.METHOD, "html");
serializer.transform(domSource, streamResult);
}
} catch (Exception e) {
e.printStackTrace();
}
} finally {
if (null != in) {
try {
in.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/oConvertUtils.java
View file @ 5a72e0c1
......@@ -544,9 +544,8 @@ public class oConvertUtils {
public static String randomGen(int place) {
String base = "qwertyuioplkjhgfdsazxcvbnmQAZWSXEDCRFVTGBYHNUJMIKLOP0123456789";
StringBuffer sb = new StringBuffer();
Random rd = new Random();
for(int i=0;i<place;i++) {
sb.append(base.charAt(rd.nextInt(base.length())));
sb.append(base.charAt(SecureRandomUtil.getIntSecureRandom(62)));
}
return sb.toString();
}
......@@ -657,12 +656,23 @@ public class oConvertUtils {
*/
public static String readStatic(String url) {
String json = "";
InputStream stream = null;
try {
//换个写法，解决springboot读取jar包中文件的问题
InputStream stream = oConvertUtils.class.getClassLoader().getResourceAsStream(url.replace("classpath:", ""));
json = IOUtils.toString(stream,"UTF-8");
stream = oConvertUtils.class.getClassLoader().getResourceAsStream(url.replace("classpath:", ""));
if (null != stream) {
json = IOUtils.toString(stream, "UTF-8");
}
} catch (IOException e) {
log.error(e.getMessage(),e);
} finally {
if (null != stream) {
try {
stream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return json;
}
......
amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/utils/HttpContentTypeUtil.java
View file @ 5a72e0c1
......@@ -401,37 +401,37 @@ public class HttpContentTypeUtil {
return sendHttpGet(httpGet);
}
/**
* 发送 delete请求带请求头
*/
public static String sendHttpDeleteJsonWithHeader(String httpUrl, String paramsJson, Map<String, String> headerMap) {
StringBuffer content = new StringBuffer();
try {
URL url = new URL(httpUrl);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("DELETE");
connection.setDoInput(true);
connection.setDoOutput(true);
connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
for (Map.Entry<String, String> entry : headerMap.entrySet()) {
connection.setRequestProperty(entry.getKey(), entry.getValue());
}
PrintWriter printWriter = new PrintWriter(connection.getOutputStream());
printWriter.write(paramsJson);
printWriter.flush();
BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String line;
while ((line = br.readLine()) != null) {
content.append(line);
}
br.close();
connection.disconnect();
} catch (Exception e) {
}
return content.toString();
}
// /**
// * 发送 delete请求带请求头
// */
// public static String sendHttpDeleteJsonWithHeader(String httpUrl, String paramsJson, Map<String, String> headerMap) {
// StringBuffer content = new StringBuffer();
// try {
// URL url = new URL(httpUrl);
// HttpURLConnection connection = (HttpURLConnection) url.openConnection();
// connection.setRequestMethod("DELETE");
// connection.setDoInput(true);
// connection.setDoOutput(true);
// connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
// for (Map.Entry<String, String> entry : headerMap.entrySet()) {
// connection.setRequestProperty(entry.getKey(), entry.getValue());
// }
// PrintWriter printWriter = new PrintWriter(connection.getOutputStream());
// printWriter.write(paramsJson);
// printWriter.flush();
//
// BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream()));
// String line;
// while ((line = br.readLine()) != null) {
// content.append(line);
// }
// br.close();
// connection.disconnect();
// } catch (Exception e) {
//
// }
// return content.toString();
// }
/**
* 发送 post请求
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/TemplateDynamicCellWriteHandlerDate.java
View file @ 5a72e0c1
package com.yeejoin.amos.boot.module.common.api.excel;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Random;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import org.apache.poi.ss.usermodel.DataValidation;
import org.apache.poi.ss.usermodel.DataValidationConstraint;
import org.apache.poi.ss.usermodel.DataValidationHelper;
......@@ -72,8 +74,7 @@ public class TemplateDynamicCellWriteHandlerDate implements SheetWriteHandler{
if (v.length > LIMIT_NUMBER) {
//定义sheet的名称
//1.创建一个隐藏的sheet 名称为 hidden + k+随机数防止数据过多造成的名字重复
Random random = new Random();
String sheetName = "hidden" +startIndex + k+random.nextInt(1000);
String sheetName = "hidden" +startIndex + k+ SecureRandomUtil.getIntSecureRandom(1000);
Workbook workbook = writeWorkbookHolder.getWorkbook();
Sheet hiddenSheet = workbook.createSheet(sheetName);
for (int i = 0, length = v.length; i < length; i++) {
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/QRCodeUtil.java
View file @ 5a72e0c1
......@@ -7,6 +7,7 @@ import com.google.zxing.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import org.apache.commons.lang3.StringUtils;
import javax.imageio.ImageIO;
......@@ -14,6 +15,7 @@ import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.security.SecureRandom;
import java.text.SimpleDateFormat;
import java.util.Base64;
import java.util.Date;
......@@ -70,10 +72,10 @@ public class QRCodeUtil {
try {
res = simpleDateFormat.format(new Date(System.currentTimeMillis())).substring(5, 8) + String.valueOf(IdWorker.getFlowIdWorkerInstance().nextId()).substring(0, 10) + randomNumForQrCode;
} catch (Exception e) {
Random random = new Random(System.currentTimeMillis());
SecureRandom random = new SecureRandom();
String tmp = "";
for (int i = 0; i < 13; i++) {
tmp += random.nextInt(10);
tmp += SecureRandomUtil.getIntSecureRandom(10, random);
}
res = simpleDateFormat.format(new Date(System.currentTimeMillis())).substring(2, 8) + tmp.substring(0, 10) + randomNumForQrCode;
} finally {
......@@ -90,7 +92,7 @@ public class QRCodeUtil {
*/
public static String temporaryQrCode() {
long qrCode = -1 * System.currentTimeMillis();
qrCode += (long) (random.nextDouble() * 10000000);
qrCode += (long) (SecureRandomUtil.getIntSecureRandomByDouble() * 10000000);
return String.valueOf(qrCode);
}
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/RandomUtil.java
View file @ 5a72e0c1
package com.yeejoin.equipmanage.common.utils;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import java.security.SecureRandom;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Random;
......@@ -12,9 +15,9 @@ public class RandomUtil {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
String newDate = sdf.format(new Date());
String result = "";
Random random = new Random();
SecureRandom random = new SecureRandom();
for (int i = 0; i < 3; i++) {
result += random.nextInt(10);
result += SecureRandomUtil.getIntSecureRandom(10, random);
}
return newDate + result;
}
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/RandomUtils.java
View file @ 5a72e0c1
package com.yeejoin.equipmanage.common.utils;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import java.security.SecureRandom;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Random;
......@@ -17,9 +20,9 @@ public class RandomUtils {
SimpleDateFormat sdf = new SimpleDateFormat("ddHHmmss");
String newDate = sdf.format(new Date());
String result = "";
Random random = new Random();
SecureRandom random = new SecureRandom();
for (int i = 0; i < 3; i++) {
result += random.nextInt(10);
result += SecureRandomUtil.getIntSecureRandom(10, random);
}
return Long.valueOf(newDate + result);
}
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/WordTemplateUtils.java
View file @ 5a72e0c1
......@@ -197,9 +197,11 @@ public class WordTemplateUtils {
e1.printStackTrace();
}
try {
data = new byte[in.available()];
in.read(data);
in.close();
if (null != in) {
data = new byte[in.available()];
in.read(data);
in.close();
}
} catch (IOException e) {
e.printStackTrace();
} finally {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java
View file @ 5a72e0c1
......@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.dto.CurrentStatusDto;
import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
......@@ -550,9 +551,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String newDate = sdf.format(new Date());
String result = "";
Random random = new Random();
for (int i = 0; i < 3; i++) {
result += random.nextInt(10);
result += SecureRandomUtil.getIntSecureRandom(10);
}
return newDate + result;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 5a72e0c1
......@@ -3090,7 +3090,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
String code = key.substring(0, key.indexOf("Code"));
o = map.get(code);
}
if (!ObjectUtils.isEmpty(o)) {
if (null != o && !ObjectUtils.isEmpty(o)) {
dynamicFormInstanceDto.setFieldValue(value.toString());
dynamicFormInstanceDto.setFieldValueLabel(o.toString());
} else {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java
View file @ 5a72e0c1
......@@ -282,7 +282,7 @@ public class ConfigureController extends AbstractBaseController {
unit = fireFightingSystemMapper.getWaterlevelUnit(s, "FHS_WirelessliquidDetector_WaterLevel");
}
}
if (!ObjectUtils.isEmpty(unit) && "CM".equals(unit.get("unit")) || "cm".equals(unit.get("unit")) || "厘米".equals(unit.get("unit"))){
if (!ObjectUtils.isEmpty(unit) && ("CM".equals(unit.get("unit")) || "cm".equals(unit.get("unit")) || "厘米".equals(unit.get("unit")))){
BigDecimal divide = new BigDecimal(100);
if (!ObjectUtils.isEmpty(record.get("nowLevel")) && !"--".equals(record.get("nowLevel"))){
BigDecimal nowLevel = new BigDecimal(String.valueOf(record.get("nowLevel")));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java
View file @ 5a72e0c1
......@@ -211,8 +211,8 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
long startTime = weekStart.getTime();
long endTime = weekEnd.getTime();
long startTime = null != weekStart ? weekStart.getTime() : 0;
long endTime = null != weekEnd ? weekEnd.getTime() : 0;
HashMap<String, Object> mapData = new HashMap<>();
for (Map<String, Object> map : maps) {
Date check = null;
......@@ -221,7 +221,7 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
if (!ObjectUtils.isEmpty(check) && check.getTime() >= startTime && check.getTime() <= endTime) {
if (null != check && !ObjectUtils.isEmpty(check) && check.getTime() >= startTime && check.getTime() <= endTime) {
if (!ObjectUtils.isEmpty(mapData)) {
BigDecimal old = new BigDecimal(String.valueOf(mapData.get("faultNum")));
BigDecimal add = new BigDecimal(String.valueOf(map.get("faultNum")));
......@@ -259,8 +259,8 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
long startTime1 = weekStart1.getTime();
long endTime1 = weekEnd1.getTime();
long startTime1 = null != weekStart1 ? weekStart1.getTime() : 0;
long endTime1 = null != weekEnd1 ? weekEnd1.getTime() : 0;
HashMap<String, Object> mapData1 = new HashMap<>();
for (Map<String, Object> map : maps) {
Date check = null;
......@@ -269,7 +269,7 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
if (!ObjectUtils.isEmpty(check) && check.getTime() >= startTime1 && check.getTime() <= endTime1) {
if (null != check && !ObjectUtils.isEmpty(check) && check.getTime() >= startTime1 && check.getTime() <= endTime1) {
if (!ObjectUtils.isEmpty(mapData1)) {
BigDecimal old = new BigDecimal(String.valueOf(mapData1.get("faultNum")));
BigDecimal add = new BigDecimal(String.valueOf(map.get("faultNum")));
......@@ -358,8 +358,8 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
long startTime = weekStart.getTime();
long endTime = weekEnd.getTime();
long startTime = null != weekStart ? weekStart.getTime() : 0;
long endTime = null != weekEnd ? weekEnd.getTime() : 0;
HashMap<String, Object> mapData = new HashMap<>();
for (Map<String, Object> map : maps) {
Date check = null;
......@@ -368,7 +368,7 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
if (!ObjectUtils.isEmpty(check) && check.getTime() >= startTime && check.getTime() <= endTime) {
if (null != check && !ObjectUtils.isEmpty(check) && check.getTime() >= startTime && check.getTime() <= endTime) {
if (!ObjectUtils.isEmpty(mapData)) {
BigDecimal old = new BigDecimal(String.valueOf(mapData.get("controlCabinetAlarmNum")));
BigDecimal add = new BigDecimal(String.valueOf(map.get("controlCabinetAlarmNum")));
......@@ -407,8 +407,8 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
long startTime1 = weekStart1.getTime();
long endTime1 = weekEnd1.getTime();
long startTime1 = null != weekStart1 ? weekStart1.getTime() : 0;
long endTime1 = null != weekEnd1 ? weekEnd1.getTime() : 0;
HashMap<String, Object> mapData1 = new HashMap<>();
for (Map<String, Object> map : maps) {
Date check = null;
......@@ -417,7 +417,7 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
if (!ObjectUtils.isEmpty(check) && check.getTime() >= startTime1 && check.getTime() <= endTime1) {
if (null != check && !ObjectUtils.isEmpty(check) && check.getTime() >= startTime1 && check.getTime() <= endTime1) {
if (!ObjectUtils.isEmpty(mapData1)) {
BigDecimal old = new BigDecimal(String.valueOf(mapData1.get("controlCabinetAlarmNum")));
BigDecimal add = new BigDecimal(String.valueOf(map.get("controlCabinetAlarmNum")));
......@@ -479,8 +479,8 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
long startTime = weekStart.getTime();
long endTime = weekEnd.getTime();
long startTime = null != weekStart ? weekStart.getTime() : 0;
long endTime = null != weekEnd ? weekEnd.getTime() : 0;
HashMap<String, Object> mapData = new HashMap<>();
for (Map<String, Object> map : maps) {
Date check = null;
......@@ -489,7 +489,7 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
if (!ObjectUtils.isEmpty(check) && check.getTime() >= startTime && check.getTime() <= endTime) {
if (null != check && !ObjectUtils.isEmpty(check) && check.getTime() >= startTime && check.getTime() <= endTime) {
if (!ObjectUtils.isEmpty(mapData)) {
BigDecimal old = new BigDecimal(String.valueOf(mapData.get("powerLossNum")));
BigDecimal add = new BigDecimal(String.valueOf(map.get("powerLossNum")));
......@@ -534,8 +534,8 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
long startTime1 = weekStart1.getTime();
long endTime1 = weekEnd1.getTime();
long startTime1 = null != weekStart1 ? weekStart1.getTime() : 0;
long endTime1 = null != weekEnd1 ? weekEnd1.getTime() : 0;
HashMap<String, Object> mapData1 = new HashMap<>();
for (Map<String, Object> map : maps) {
Date check = null;
......@@ -544,7 +544,7 @@ public class EmergencyController extends AbstractBaseController {
} catch (ParseException e) {
e.printStackTrace();
}
if (!ObjectUtils.isEmpty(check) && check.getTime() >= startTime1 && check.getTime() <= endTime1) {
if (null != check && !ObjectUtils.isEmpty(check) && check.getTime() >= startTime1 && check.getTime() <= endTime1) {
if (!ObjectUtils.isEmpty(mapData1)) {
BigDecimal old = new BigDecimal(String.valueOf(mapData1.get("powerLossNum")));
BigDecimal add = new BigDecimal(String.valueOf(map.get("powerLossNum")));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentIndexController.java
View file @ 5a72e0c1
......@@ -182,7 +182,7 @@ public class EquipmentIndexController {
for (CarProperty x : list) {
x.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
x.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
if (bool.get()) {
if (bool.get() && null != signalClassify) {
x.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
x.setIsAlarm(signalClassify.getIsAlarm());
x.setEmergencyLevel(signalClassify.getEmergencyLevel());
......@@ -200,7 +200,7 @@ public class EquipmentIndexController {
y.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
y.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
y.setValueEnum(equipmentIndex.getValueEnum());
if (bool.get() && !ObjectUtils.isEmpty(signalClassify)) {
if (bool.get() && null != signalClassify && !ObjectUtils.isEmpty(signalClassify)) {
y.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
y.setIsAlarm(signalClassify.getIsAlarm());
y.setEmergencyLevel(signalClassify.getEmergencyLevel());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @ 5a72e0c1
......@@ -1068,7 +1068,7 @@ public class TopographyController extends AbstractBaseController {
}
j++;
}
if (!CollectionUtils.isEmpty(list)) {
if (!CollectionUtils.isEmpty(list) && null != iotIndexRes) {
iotIndexRes.setIotData(list);
}
if (!ObjectUtils.isEmpty(iotIndexRes)) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/operation/AreaSynRiskOperator.java
View file @ 5a72e0c1
package com.yeejoin.equipmanage.operation;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import com.yeejoin.equipmanage.common.vo.AreaResquest;
import com.yeejoin.equipmanage.context.SpringContextHolder;
import com.yeejoin.equipmanage.remote.RiskModelFeign;
......@@ -7,6 +8,7 @@ import com.yeejoin.equipmanage.remote.RiskSource;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.security.SecureRandom;
import java.util.Random;
@Getter
......@@ -32,9 +34,9 @@ public enum AreaSynRiskOperator {
public RiskSource getRiskSource(AreaResquest areaResquest){
RiskSource riskSource = new RiskSource();
StringBuilder code = new StringBuilder();
Random random = new Random();
SecureRandom random = new SecureRandom();
for (int i = 0; i < 24; i++) {
code.append(random.nextInt(10));
code.append(SecureRandomUtil.getIntSecureRandom(10, random));
}
riskSource.setCode(code.toString());
riskSource.setId(Long.parseLong(String.valueOf(areaResquest.getId())));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentIndexImpl.java
View file @ 5a72e0c1
......@@ -133,7 +133,7 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
carProperty.setEquipmentIndexId(equipmentIndex.getId());
carProperty.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
carProperty.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
if (bool.get()) {
if (bool.get() && null != signalClassify) {
carProperty.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
carProperty.setIsAlarm(signalClassify.getIsAlarm());
carProperty.setEmergencyLevel(signalClassify.getEmergencyLevel());
......@@ -160,7 +160,7 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
equipmentSpecificIndex.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
equipmentSpecificIndex.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
equipmentSpecificIndex.setEquipmentSpecificName(y.getName());
if (bool.get()) {
if (bool.get() && null != signalClassify) {
equipmentSpecificIndex.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
equipmentSpecificIndex.setIsAlarm(signalClassify.getIsAlarm());
equipmentSpecificIndex.setEmergencyLevel(signalClassify.getEmergencyLevel());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java
View file @ 5a72e0c1
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.equipmanage.common.entity.DynamicFormGroup;
import com.yeejoin.equipmanage.common.entity.EquipmentManageEntity;
......@@ -137,7 +138,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
@Override
public String checkCode(String param) {
int num = (int) (Math.random() * 900 + 100);
int num = (int) (SecureRandomUtil.getIntSecureRandomByDouble() * 900 + 100);
;
String val = param;
val += String.valueOf(num);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java
View file @ 5a72e0c1
......@@ -788,18 +788,19 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
int allNum = 0;
// 启动次数
int startNum = 0;
ResponseModel all = iotFeign.selectListNew(vo.getIotCode().substring(0,8),null, startTime, endTime,null, pressurePumpStart);
if (200 == all.getStatus() && !ObjectUtils.isEmpty(all.getResult())) {
String json1 = JSON.toJSONString(all.getResult());
List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
allNum = listObject1.size();
}
ResponseModel start = iotFeign.selectListNew(vo.getIotCode().substring(0,8),null, startTime, endTime,"true", pressurePumpStart);
if (200 == start.getStatus() && !ObjectUtils.isEmpty(start.getResult())) {
String json1 = JSON.toJSONString(start.getResult());
List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
startNum = listObject1.size();
if (null != vo) {
ResponseModel all = iotFeign.selectListNew(vo.getIotCode().substring(0, 8), null, startTime, endTime, null, pressurePumpStart);
if (200 == all.getStatus() && !ObjectUtils.isEmpty(all.getResult())) {
String json1 = JSON.toJSONString(all.getResult());
List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
allNum = listObject1.size();
}
ResponseModel start = iotFeign.selectListNew(vo.getIotCode().substring(0, 8), null, startTime, endTime, "true", pressurePumpStart);
if (200 == start.getStatus() && !ObjectUtils.isEmpty(start.getResult())) {
String json1 = JSON.toJSONString(start.getResult());
List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
startNum = listObject1.size();
}
}
Map<String, Object> retMap = new HashMap<>();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ 5a72e0c1
......@@ -590,7 +590,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
p.setDataConfig(map);
if (StringUtils.isEmpty(id)) {
// 建筑
if (equipSpecificIds.contains(valueOf(equipSpecificId))) {
if (null != equipSpecificIds && equipSpecificIds.contains(valueOf(equipSpecificId))) {
p.setBinding(true);
} else {
p.setBinding(false);
......@@ -671,7 +671,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
p.setDataConfig(map);
if (StringUtils.isEmpty(id)) {
// 建筑
if (equipSpecificIds.contains(valueOf(equipSpecificId))) {
if (null != equipSpecificIds && equipSpecificIds.contains(valueOf(equipSpecificId))) {
p.setBinding(true);
} else {
p.setBinding(false);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ 5a72e0c1
......@@ -577,9 +577,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
jsonObjectData.put("astId", equipmentSpeIndex.getSpecificCode());
jsonObjectData.put("equipType", equipmentSpeIndex.getEquipmentCode());
jsonObjectData.put("name", equipmentSpeIndex.getEquipmentSpecificName() + "-" + equipmentSpeIndex.getEquipmentSpecificIndexName());
if (value.equals("true")) {
if (null != value && value.equals("true")) {
jsonObjectData.put("value", "1");
} else if (value.equals("false")) {
} else if (null != value && value.equals("false")) {
jsonObjectData.put("value", "0");
} else {
jsonObjectData.put("value", value);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WarehouseStructureServiceImpl.java
View file @ 5a72e0c1
......@@ -331,7 +331,7 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur
if(ws.getParentId() == null) {
ws.setCellCode(ws.getCode());
}else {
ws.setCellCode(parent.getCellCode() + code);
ws.setCellCode(null != parent ? parent.getCellCode() : "" + code);
}
save(ws);
} else {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
View file @ 5a72e0c1
......@@ -574,7 +574,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
for (Map<String, Object> orgUser : orgUsers) {
AlertSubmittedObject alertSubmittedObject = new AlertSubmittedObject();
if(!alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode())) {
alertSubmittedObject.setAlertSubmittedId(alertSubmittedNew.getSequenceNbr());
if (null != alertSubmittedNew) {
alertSubmittedObject.setAlertSubmittedId(alertSubmittedNew.getSequenceNbr());
}
} else {
alertSubmittedObject.setAlertSubmittedId(Long.parseLong(alertSubmittedId));
}
......@@ -620,7 +622,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
// 调用短信发送接口
Map<String,String> besidesMap = new HashMap<>();
besidesMap.put(alterId,String.valueOf(alertCalled.getSequenceNbr()));
if (null != alertCalled) {
besidesMap.put(alterId, String.valueOf(alertCalled.getSequenceNbr()));
}
if(alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode())) {
alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
......@@ -648,8 +652,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
emqKeeper.getMqttClient().publish(topic, alertCalledId.getBytes(), RuleConfig.DEFAULT_QOS, false);
if (null != alertCalledId) {
emqKeeper.getMqttClient().publish(topic, alertCalledId.getBytes(), RuleConfig.DEFAULT_QOS, false);
}
}
/**
......@@ -1019,7 +1024,6 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
if (!ValidationUtil.isEmpty(report)) {
String os = System.getProperty("os.name");
InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("templates/check-report-template.docx");
String path = this.getClass().getProtectionDomain().getCodeSource().getLocation().getPath();
String filePath = "";
......@@ -1040,6 +1044,20 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
Configure.ConfigureBuilder configureBuilder = Configure.newBuilder();
configureBuilder.setElMode(ELMode.SPEL_MODE).bind("alertCalledPowerInfoDtoList", calledPowerInfoTablePolicy)
.bind("alertCallCommandDtoList", alertCallCommandTablePolicy).build();
InputStream resourceAsStream = null;
try {
resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("templates/check-report-template.docx");
} catch (Exception e) {
} finally {
if (null != resourceAsStream) {
try {
resourceAsStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
XWPFTemplate template = XWPFTemplate.compile(resourceAsStream, configureBuilder.build()).render(report);
File file = new File(fileName);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/VoiceRecordLogServiceImpl.java
View file @ 5a72e0c1
......@@ -102,15 +102,16 @@ public class VoiceRecordLogServiceImpl extends BaseService<VoiceRecordLogDto,Voi
model.setFileType("坐席呼出");
}
Map<String, String> downloadFile = null;
if(downloadFile.isEmpty()) {
this.updateById(l);
return;
}
for(Map.Entry<String,String> file : downloadFile.entrySet()) {
model.setFilePath(file.getKey());
}
// 注掉无用代码
// Map<String, String> downloadFile = null;
//
// if(downloadFile.isEmpty()) {
// this.updateById(l);
// return;
// }
// for(Map.Entry<String,String> file : downloadFile.entrySet()) {
// model.setFilePath(file.getKey());
// }
});
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java
View file @ 5a72e0c1
......@@ -350,13 +350,13 @@ public class CheckServiceImpl implements ICheckService {
score += checkInput.getScore();
checkItemList.add(checkInput);
EquipmentInputItemRo equipmentInputItemRo = new EquipmentInputItemRo();
if(!StringUtils.isBlank(pointClassify.getName())){
if(null != pointClassify && !StringUtils.isBlank(pointClassify.getName())){
equipmentInputItemRo.setEquipmentName(pointClassify.getName());
}
equipmentInputItemRo.setCheckResult(item.getInputValue());
equipmentInputItemRo.setRuleType(RuleTypeEnum.CHECKRESULT.getCode());
equipmentInputItemRo.setCheckContent(inputItem.getItemNo());
if(!StringUtils.isBlank(pointClassify.getEquipmentId())){
if(null != pointClassify && !StringUtils.isBlank(pointClassify.getEquipmentId())){
equipmentInputItemRoList.add(equipmentInputItemRo);
}
}
......@@ -432,7 +432,7 @@ public class CheckServiceImpl implements ICheckService {
if(imgList.size()>0){
checkService.saveCheckImg(imgList);
}
if (check.getPlanTaskId() > 0) {
if (check.getPlanTaskId() > 0 && null != detail) {
planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), requestParam.getPointId(), requestParam.getPlanTaskId(), user.getUserId());
} else {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
......@@ -686,7 +686,7 @@ public class CheckServiceImpl implements ICheckService {
if (imgList.size() > 0) {
checkService.saveCheckImg(imgList);
}
if (check.getPlanTaskId() > 0) {
if (check.getPlanTaskId() > 0 && null != detail) {
planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), requestParam.getPointId(), requestParam.getPlanTaskId(), requestParam.getUserId());
} else {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java
View file @ 5a72e0c1
......@@ -728,7 +728,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
}
// 延期治理选择的延期日期不能早于整改日期校验
if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理)) {
if (latentDangerBo.getReformLimitDate().compareTo(DateUtil.longStr2Date(latentDangerExcuteParam.getDelayLimitDate())) >= 0) {
if (null != latentDangerBo && latentDangerBo.getReformLimitDate().compareTo(DateUtil.longStr2Date(latentDangerExcuteParam.getDelayLimitDate())) >= 0) {
executeSubmitDto.setIsOk(false);
executeSubmitDto.setMsg("延期日期不能早于整改期限");
return executeSubmitDto;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java
View file @ 5a72e0c1
......@@ -1413,11 +1413,13 @@ public class PointServiceImpl implements IPointService {
for (Map<String, String> statusEnum : statusEnums) {
String code = statusEnum.get("value");
boolean isCreate = true;
for (HashMap<String, Object> c : content) {
if (code.equals(c.get("status"))) {
isCreate = false;
rContent.add(c);
break;
if (null != content) {
for (HashMap<String, Object> c : content) {
if (code.equals(c.get("status"))) {
isCreate = false;
rContent.add(c);
break;
}
}
}
if (isCreate) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/SynDataServiceImpl.java
View file @ 5a72e0c1
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import com.yeejoin.amos.patrol.business.constants.XJConstant;
import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
import com.yeejoin.amos.patrol.business.dao.repository.*;
......@@ -537,6 +538,6 @@ public class SynDataServiceImpl implements ISynDataService {
}
private String buildRandomNum(String originalId) {
return "SPC_" + (int) ((Math.random() * 9 + 1) * 100000) + "_" + originalId;
return "SPC_" + (int) ((SecureRandomUtil.getIntSecureRandomByDouble() * 9 + 1) * 100000) + "_" + originalId;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/DateUtil.java
View file @ 5a72e0c1
package com.yeejoin.amos.patrol.business.util;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import org.apache.commons.lang.StringUtils;
import java.security.SecureRandom;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.ParsePosition;
......@@ -1092,8 +1094,10 @@ public class DateUtil {
{
;
}
long day = (date.getTime() - mydate.getTime()) / (24 * 60 * 60 * 1000);
return day;
if (null != date && null != mydate) {
return (date.getTime() - mydate.getTime()) / (24 * 60 * 60 * 1000);
}
return 0;
}
/**
......@@ -1136,13 +1140,13 @@ public class DateUtil {
*/
private static String getRandom(int i)
{
Random jjj = new Random();
SecureRandom jjj = new SecureRandom();
// int suiJiShu = jjj.nextInt(9);
if (i == 0) return "";
String jj = "";
for (int k = 0; k < i; k++)
{
jj = jj + jjj.nextInt(9);
jj = jj + SecureRandomUtil.getIntSecureRandom(9, jjj);
}
return jj;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/PlanTaskUtil.java
View file @ 5a72e0c1
......@@ -298,17 +298,19 @@ public static List<HashMap<String, Date>> genExeDate(Plan plan, CalDateVo vo,Str
init = init + exeInt;
calDate = DateUtil.getIntervalDate(exeDate,init);
}else if(XJConstant.PLAN_TYPE_WEEK.equals(planType)){//周计划
for(String str :strArr){
HashMap<String, Date> tempMap = new HashMap<String, Date>();
int inter = Integer.parseInt(str);
calDate = DateUtil.getIntervalDate(weekDate,inter);
if(calDate.getTime() >= exeDate.getTime() && (calDate.getTime()>=exeBeginDate.getTime() && calDate.getTime() <= exeEndDate.getTime())){
tempMap.put("begin_date", calDate);
tempMap.put("end_date", calDate);
tempMap.put("next_gen_date", calDate);
dateList.add(tempMap);
if (null != strArr) {
for (String str : strArr) {
HashMap<String, Date> tempMap = new HashMap<String, Date>();
int inter = Integer.parseInt(str);
calDate = DateUtil.getIntervalDate(weekDate, inter);
if (calDate.getTime() >= exeDate.getTime() && (calDate.getTime() >= exeBeginDate.getTime() && calDate.getTime() <= exeEndDate.getTime())) {
tempMap.put("begin_date", calDate);
tempMap.put("end_date", calDate);
tempMap.put("next_gen_date", calDate);
dateList.add(tempMap);
}
}
}
}
init = init + exeInt;
weekDate = DateUtil.getIntervalWeekDate(exeDate,init);
}else if(XJConstant.PLAN_TYPE_MONTH.equals(planType)){//月计划
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/QRCodeUtil.java
View file @ 5a72e0c1
......@@ -5,6 +5,7 @@ import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
......@@ -49,7 +50,7 @@ public class QRCodeUtil {
*/
public static String temporaryQrCode() {
long qrCode = -1 * System.currentTimeMillis();
qrCode += (long)(random.nextDouble() * 10000000);
qrCode += (long)(SecureRandomUtil.getIntSecureRandomByDouble() * 10000000);
return String.valueOf(qrCode);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/RandomUtil.java
View file @ 5a72e0c1
package com.yeejoin.amos.patrol.business.util;
import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
import java.security.SecureRandom;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Random;
......@@ -10,9 +13,9 @@ public class RandomUtil {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
String newDate = sdf.format(new Date());
String result = "";
Random random = new Random();
SecureRandom random = new SecureRandom();
for (int i = 0; i < 3; i++) {
result += random.nextInt(10);
result += SecureRandomUtil.getIntSecureRandom(10, random);
}
return newDate + result;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/WordTemplateUtils.java
View file @ 5a72e0c1
......@@ -222,9 +222,11 @@ public class WordTemplateUtils {
e1.printStackTrace();
}
try {
data = new byte[in.available()];
in.read(data);
in.close();
if (null != in) {
data = new byte[in.available()];
in.read(data);
in.close();
}
} catch (IOException e) {
e.printStackTrace();
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/core/util/DateUtil.java
View file @ 5a72e0c1
......@@ -382,8 +382,10 @@ public class DateUtil {
} catch (Exception e) {
e.printStackTrace();
}
Time date = new Time(d.getTime());
return date;
if (null != d) {
return new Time(d.getTime());
}
return null;
}
/**
......
amos-boot-system-avic/src/main/resources/application-dev.properties
View file @ 5a72e0c1
## DB properties:
spring.datasource.url=jdbc:mysql://172.16.3.18:3306/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(Vpur3enH/WA59bJ7++PHltRldC2pMUxie5kwsTygdMgQaD4nmFEMEmBtwGeATE6c)
## eureka properties:
eureka.instance.hostname=172.16.3.18
eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
......@@ -9,7 +9,7 @@ eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eu
spring.redis.database=1
spring.redis.host=172.16.3.18
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(FA2Go2IWIMdAxKDElRvf6izRbTFHZCsps6NmHbZd4GRxo4cXlV43HEzHhpO3x3MK)
upload.temp.dir=E:\\ftp\\
avic.file.store.path=E:\\webservice
......@@ -19,7 +19,7 @@ avic.time.receive.timeout=100000
amos.auth.user-name=avic_test
amos.auth.password=a1234560
amos.auth.password=ENC(UuNFxY2WD17qIU8onLrd7JbWqjdb+4+4UXXRPO6axIzUTptaZkySKMWuzoayNQTx)
amos.auth.app-key=AMOS_STUDIO
amos.auth.product=AMOS_STUDIO_WEB
......
amos-boot-system-cas/amos-boot-module-cas-biz/src/main/resources/application-dev.properties
View file @ 5a72e0c1
......@@ -3,7 +3,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://172.16.10.210:3306/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(96IlE89CnozZTw3IJI+7Rl/71Mst72B1KjQpOp2++FsEEZaytAggrjGnkWKZLrqe)
##eureka properties:
eureka.client.service-url.defaultZone =http://172.16.10.210:10001/eureka/
......@@ -19,7 +19,7 @@ eureka.instance.metadata-map.management.api-docs=http://172.16.3.99:${server.por
spring.redis.database=1
spring.redis.host=172.16.10.210
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(HgBSQYsE40aH0MFsZoSUZI9Pzi6cQ7p4YCh71Jv5BV+HUS5fE0otpJJDhc6f4cce)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......
amos-boot-system-cas/amos-boot-module-cas-biz/src/main/resources/application.properties
View file @ 5a72e0c1
......@@ -47,6 +47,6 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.90:1883
emqx.user-name=super
emqx.password=123456
emqx.password=ENC(cOsjObSVn0vn4se0yiQSt1EpAQtKC6kpZGRsZGPKnvaQZCcbbJohIQXyPuOY+qcD)
fire-rescue=123
\ No newline at end of file
amos-boot-system-ccs/src/main/resources/application-dev.properties
View file @ 5a72e0c1
## DB properties:
spring.datasource.url=jdbc:mysql://172.16.11.201:3306/dl_ccs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(AKLEkMXmSH1ahPb4yCPLf4dboh72taRBlN1995wU3OM066YT3Xy8g4PSmo5bXU5w)
## eureka properties:
eureka.instance.hostname=172.16.11.201
eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
......@@ -9,13 +9,13 @@ eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eu
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.password=ENC(2FDlTJDGXAfqBqn7QMeZ3cXPAdzjQBs9Yde/Ajc8TAVXxymomLieBPZxSF0R7wK9)
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(Lz+MNIZ0XP5lVzyswe7b1RyFAEImtD/qmYpkWilkGrj1myMjSnyf9ZS0l/hMD/Er)
#mqtt.scene.host=mqtt://172.16.10.201:18083/mqtt
......
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @ 5a72e0c1
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(ooSbV2vO5UUB3BuAVYjYxm4OVY4rCv275/HxXJNz+Nbf2I8EjuylP9tTh30s2j7g)
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
......@@ -20,7 +20,7 @@ eureka.instance.prefer-ip-address = true
eureka.instance.hostname=172.16.11.201
#eureka服务配置的校验账号及密码,配置需和eureka服务后台配置文件中一致
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.password=ENC(8Avkl0Wjal6xBOWKXQ+X1QCbtDt3n1JZS7dHehmtYFTPYNd+6diNNogVGZCPVHjE)
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:10001/eureka/
##########eureka配置信息###############
......@@ -29,7 +29,7 @@ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${sprin
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(/T7d22Zy0QgL+Ff1+FC81syDFAVOpo4CoWrDVUELyjR2XEXuk+gmNnzkyK3B5ibi)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -41,14 +41,14 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(GGQmxuyl6uOxAsDhjRo+USgUybWC8Ns4Q7mlnyq3JqJE9LsFgYBNK8gzJ7H/Znw+)
mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
# influxDB
spring.influx.url=http://172.16.11.201:8086
spring.influx.password=Yeejoin@2020
spring.influx.password=ENC(ooSbV2vO5UUB3BuAVYjYxm4OVY4rCv275/HxXJNz+Nbf2I8EjuylP9tTh30s2j7g)
spring.influx.user=root
spring.influx.database=iot_platform
spring.influx.retention_policy=default
......@@ -59,7 +59,7 @@ spring.influx.bufferLimit=20000
#系统机器人账号
amos.system.user.user-name=fas_system
amos.system.user.password=a1234560
amos.system.user.password=ENC(y/vybU3OfM6Sn1s/2Ts6JSYje9LEnOi9pbwMmAXI7ngaWE//yIubxY98Ij866qez)
amos.system.user.app-key=studio_normalapp_3056965
amos.system.user.product=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......
amos-boot-system-equip/src/main/resources/application-docker.properties
View file @ 5a72e0c1
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(wbnd1DzfQJDDUcEzyxst4JXjq+lA7LMt857dlHlNCFDiW3S37WnF2KrXRgH8zM3J)
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
......@@ -20,7 +20,7 @@ eureka.instance.prefer-ip-address = true
eureka.instance.hostname=eureka
#eureka服务配置的校验账号及密码,配置需和eureka服务后台配置文件中一致
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.password=ENC(y3P1kF8S6BXc9m4bWaqE3QITeRURDFDvCmtj7ZOPaQaWyl+3R5nRWMZuRxNzwh7e)
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:10001/eureka/
##########eureka配置信息###############
......@@ -29,7 +29,7 @@ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${sprin
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(m1XoN2lj3IknRnk40w134upFkDiJii2zLCucVkrbf1sA3k0zbaBzwS/3kAqm8LrF)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -41,14 +41,14 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(X2ZEAhE0U0KJqtQHU+TjL8WR6is04xBIji30FpnJCbat9k6dBMCJfm/Vf/b0hCPl)
mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
# influxDB
spring.influx.url=http://172.16.11.201:8086
spring.influx.password=Yeejoin@2020
spring.influx.password=ENC(wbnd1DzfQJDDUcEzyxst4JXjq+lA7LMt857dlHlNCFDiW3S37WnF2KrXRgH8zM3J)
spring.influx.user=root
spring.influx.database=iot_platform
spring.influx.retention_policy=default
......@@ -59,7 +59,7 @@ spring.influx.bufferLimit=20000
#系统机器人账号
amos.system.user.user-name=fas_system
amos.system.user.password=a1234560
amos.system.user.password=ENC(WY91Y66oky3RRn6umfE9+r7bznoSHuOOIcaFfjNJxG7Kid+Ogxk2LWqdFNKKwCfW)
amos.system.user.app-key=studio_normalapp_3056965
amos.system.user.product=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......
amos-boot-system-equip/src/main/resources/application-jcs.properties
View file @ 5a72e0c1
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(a4CNHoARWdj/yhxMrLPsqisOc1yojpnyQIXBSgCfJCQoqZwDPr98V07daIUWrHJc)
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
......@@ -20,7 +20,7 @@ eureka.instance.prefer-ip-address = true
eureka.instance.hostname=eureka
#eureka服务配置的校验账号及密码,配置需和eureka服务后台配置文件中一致
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.password=ENC(DtETPPQLD5DHnCjqyl4r858f9bhD1u+BeSGLW2hGnM+aLPMSo04tm9ZHsnvioQrm)
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:10001/eureka/
##########eureka配置信息###############
......@@ -29,7 +29,7 @@ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${sprin
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(fc4qPNfRhTbj2vCKC4lTvSEPIrBh18Y58HmRAD04Wkp7HrF84Kugz7iNZYo6ZsQW)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -41,14 +41,14 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(srgCLv3AyU0NTJXS4iNxkf4zjx+mjxHf8Jdv4jqsDgluFO2oUgPHMnRQYTtt/Ivg)
mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
# influxDB
spring.influx.url=http://172.16.11.201:8086
spring.influx.password=Yeejoin@2020
spring.influx.password=ENC(a4CNHoARWdj/yhxMrLPsqisOc1yojpnyQIXBSgCfJCQoqZwDPr98V07daIUWrHJc)
spring.influx.user=root
spring.influx.database=iot_platform
spring.influx.retention_policy=default
......@@ -59,7 +59,7 @@ spring.influx.bufferLimit=20000
#系统机器人账号
amos.system.user.user-name=fas_system
amos.system.user.password=a1234560
amos.system.user.password=ENC(DtETPPQLD5DHnCjqyl4r858f9bhD1u+BeSGLW2hGnM+aLPMSo04tm9ZHsnvioQrm)
amos.system.user.app-key=studio_normalapp_3056965
amos.system.user.product=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......
amos-boot-system-equip/src/main/resources/application-qa.properties
View file @ 5a72e0c1
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(0SYiEi7VoI3HMTzgMb3+iEWr5kksfvy984vQy0lPM+i++3zE4G7yJUmkd0DV7N0w)
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
......@@ -20,7 +20,7 @@ eureka.instance.prefer-ip-address = true
eureka.instance.hostname=eureka
#eureka服务配置的校验账号及密码,配置需和eureka服务后台配置文件中一致
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.password=ENC(YK0zeOGyLUHU8PLwcPYOteXKo8M7tJ4lQlZ0VkRIcACkfFmRBRrs9nDRLGnvjxrN)
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:10001/eureka/
##########eureka配置信息###############
......@@ -29,7 +29,7 @@ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${sprin
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(Kvg5Y6H4mVyMhUs0IWgxUpSZGx5bHGnr28Ss4t872gItOsrWYvnDzNzDaMLCCdQd)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -41,14 +41,14 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(DuaVOeFwh3f7oH9rroTwg5M/Prx/US38savsyTmQ1pSVVXZNNdbj/Lcfjip20VXm)
mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
# influxDB
spring.influx.url=http://172.16.11.201:8086
spring.influx.password=Yeejoin@2020
spring.influx.password=ENC(0SYiEi7VoI3HMTzgMb3+iEWr5kksfvy984vQy0lPM+i++3zE4G7yJUmkd0DV7N0w)
spring.influx.user=root
spring.influx.database=iot_platform
spring.influx.retention_policy=default
......@@ -59,7 +59,7 @@ spring.influx.bufferLimit=20000
#系统机器人账号
amos.system.user.user-name=fas_system
amos.system.user.password=a1234560
amos.system.user.password=ENC(YK0zeOGyLUHU8PLwcPYOteXKo8M7tJ4lQlZ0VkRIcACkfFmRBRrs9nDRLGnvjxrN)
amos.system.user.app-key=studio_normalapp_3056965
amos.system.user.product=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......
amos-boot-system-equip/src/main/resources/application-test.properties
View file @ 5a72e0c1
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(r2XLpXCTDr6ieRFdyI4E0cYm8Nx1/2H2KytqN1jGBcaEG7m/966RfoYpZVCFeBbM)
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
......@@ -20,7 +20,7 @@ eureka.instance.prefer-ip-address = true
eureka.instance.hostname=eureka
#eureka服务配置的校验账号及密码,配置需和eureka服务后台配置文件中一致
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.password=ENC(MGIIwxvw4ptiCk9a0b+yBJJrRK5p+ryr4+cX6rNxv7ieJGLvPeiNp3WJOyUeCT+f)
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:10001/eureka/
##########eureka配置信息###############
......@@ -29,7 +29,7 @@ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${sprin
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(X0hBV3H+gclKN7WaPyRddaWdzXk+f16hpdKQE36G9IojJucojnpGrBUPiI6/2P9H)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -41,14 +41,14 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(dRiUEDTcM21M9w1wK0Dom1CAANdG81rFb45KEm6kZ0/fPhYRhkGGgQk7uw3q0NAg)
mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
# influxDB
spring.influx.url=http://172.16.11.201:8086
spring.influx.password=Yeejoin@2020
spring.influx.password=ENC(r2XLpXCTDr6ieRFdyI4E0cYm8Nx1/2H2KytqN1jGBcaEG7m/966RfoYpZVCFeBbM)
spring.influx.user=root
spring.influx.database=iot_platform
spring.influx.retention_policy=default
......@@ -59,7 +59,7 @@ spring.influx.bufferLimit=20000
#系统机器人账号
amos.system.user.user-name=fas_system
amos.system.user.password=a1234560
amos.system.user.password=ENC(MGIIwxvw4ptiCk9a0b+yBJJrRK5p+ryr4+cX6rNxv7ieJGLvPeiNp3WJOyUeCT+f)
amos.system.user.app-key=studio_normalapp_3056965
amos.system.user.product=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......
amos-boot-system-equip/src/main/resources/application.properties
View file @ 5a72e0c1
......@@ -113,8 +113,8 @@ biz.elasticsearch.address=172.16.11.201
spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username= elastic
elasticsearch.password= Yeejoin@2020
elasticsearch.username=elastic
elasticsearch.password=ENC(ooSbV2vO5UUB3BuAVYjYxm4OVY4rCv275/HxXJNz+Nbf2I8EjuylP9tTh30s2j7g)
# \u6743\u9650\u6807\u8BC6-\u7269\u8054\u533A\u57DF
auth-key-area=area_info
......
amos-boot-system-fas/src/main/resources/application-dev.properties
View file @ 5a72e0c1
#DB properties:
spring.datasource.url=jdbc:mysql://172.16.10.66:3306/safety-business-3.0.1?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=root_123
spring.datasource.password=ENC(TS08J0PIn2hehZeqJRdPszc0/W0XoGSrfuUXt76Zpe8a3oYWpwixeZwMa5G8egCc)
spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
......@@ -9,7 +9,7 @@ spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
#系统服务账号，用户后端服务调用
security.password=a1234560
security.password=ENC(VYrU750c08MOt4EN6Gw2Wv2Xl7SPssN2lspVTV+Gy6wJQHSezIBXRPOsU+UqHpFC)
security.loginId=fas_autosys
#应用product appkey
......@@ -33,7 +33,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(3uvmO1K1QiSrQ8J8uLS0Jc1Re32ScrjKC0F7z1J5e1YInysi1VS6rdQ22ViePHUZ)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -53,7 +53,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(e0puQgHcLshj+SaycIrhSnuLNdDLUHQtfcqaHqjVmnDRAoyJWmkvMNjt1pdCPOnr)
#文件服务器地址
file.url=http://39.98.45.134:9000/
amos-boot-system-fas/src/main/resources/application-docker.properties
View file @ 5a72e0c1
#DB properties:
spring.datasource.url=jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=root_123
spring.datasource.password=ENC(+7hONo/BRMGljgnSruJWYy9ZVUjvZ2icdKzV/fjCXZGfwiNt5BisYFgni+JDs2Lb)
spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
......@@ -9,7 +9,7 @@ spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
#系统服务账号，用户后端服务调用
security.password=a1234560
security.password=ENC(onxze6j+RaFpi42fofdReHWOEMbY3dy8aBumHniml3b9T10pyXniLro9LKlZVXVZ)
security.loginId=fas_autosys
#应用product appkey
......@@ -28,7 +28,7 @@ eureka.instance.prefer-ip-address=true
spring.redis.database=1
spring.redis.host=172.16.11.20
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.password=ENC(NuFO3iZ2zg+EsSRtFrLEkwubuTSqVC9OlaMArPpOaiIJmYOpSucU5hpyvmZ7uFYr)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -48,7 +48,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.33:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(ZCkHjJtiLg1aguo4I/OXOwAoJ/EzcxnrTL0gxUgktsyIFqeLkKpPMY6jn/MChpjv)
#文件服务器地址
file.url=http://39.98.246.31:8888/
amos-boot-system-fas/src/main/resources/application-jcs.properties
View file @ 5a72e0c1
#DB properties:
spring.datasource.url=jdbc:mysql://11.11.16.4:3306/xiy_safety_business_v3.0.1_20100712?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(foZHtITIAiQsbRVHph0gzudeXbqvoAK7FnKryP+R9tAG4twaD3qCMqPFZ8JzwDI0)
spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
......@@ -9,7 +9,7 @@ spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
#系统服务账号，用户后端服务调用
security.password=a1234560
security.password=ENC(wFrtgw3uEIfPSHVERbGcs4bofNdBFgvn3QtyxK12eBBQopbZRPmzB1+t5hHJX4dP)
security.loginId=jc_fas_autosys
#应用product appkey
......@@ -33,7 +33,7 @@ eureka.instance.metadata-map.management.api-docs=http://11.11.16.1:${server.port
spring.redis.database=1
spring.redis.host=11.11.16.1
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(8sVsMalFQOe1BuRJ4zdRPQZy0KkWSfCUcjhZyMCGtBRNe+zf9bA7T88ee2biJzY2)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -53,7 +53,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://11.11.16.1:2883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(z5FeZv8ZpthHXLvFMthDvSvtve/suOu7oiGsIJNX/yWNeJSHNuj0qCZcyKHSuldK)
#文件服务器地址
file.url=http://11.11.16.1:9000/
amos-boot-system-fas/src/main/resources/application-qa.properties
View file @ 5a72e0c1
#DB properties:
spring.datasource.url=jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=root_123
spring.datasource.password=ENC(O2Dt7VRCfD/0u0dhyrkvvP+a4KPiU2yemN0PpzkmUk59UuMhElhhhfUqfRswciL0)
spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
......@@ -9,7 +9,7 @@ spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
#系统服务账号，用户后端服务调用
security.password=a1234560
security.password=ENC(+3BentsRx3UQSw0wz3/gSZnXt7eut1y7p266mIv0GDC3J6SSD/r8xzb37i63NRXr)
security.loginId=fas_autosys
#应用product appkey
......@@ -33,7 +33,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
spring.redis.database=1
spring.redis.host=172.16.11.20
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.password=ENC(7NyPF7mqPcC1PX9gYu0Wvd8ZTzCnR57EQ8X/LaZg25Ed7ib25npOz4Q6rgXDost2)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -53,7 +53,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.33:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(WDylw19tt1zmwfkfHhS2AgugfTlGzS5MNElC5LqrUWXnIRyPPCA2mZbantTWFkhj)
#文件服务器地址
file.url=http://39.98.246.31:8888/
amos-boot-system-fas/src/main/resources/application-test.properties
View file @ 5a72e0c1
#DB properties:
spring.datasource.url=jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=root_123
spring.datasource.password=ENC(I3feJigrWrwrnPLo7KpfcfTV6G4m2vcTQ1BqlcPxjj15wv9I1Tsycy44lG0Uvv9F)
spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
......@@ -9,7 +9,7 @@ spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
#系统服务账号，用户后端服务调用
security.password=a1234560
security.password=ENC(A6pSiCa7YDgS5ivTJ/s6xWaVXeY0gCRztht985GRnFCz/H4wbHDIhKs1YNKsqV6u)
security.loginId=fas_autosys
#应用product appkey
......@@ -28,7 +28,7 @@ eureka.instance.prefer-ip-address=true
spring.redis.database=1
spring.redis.host=172.16.11.20
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.password=ENC(NZIEgHAV80FOrrvteRggxHPJHNOnmysOfWlu+rOxDQQOSSk2ufsfJGpXka/qDhLH)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -48,7 +48,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.33:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(YPyOgMYvSm1s20HN03RewespKNyomI+NdungqiYFv+uXGwRkH0RL8+061DxEj++M)
#文件服务器地址
file.url=http://39.98.246.31:8888/
amos-boot-system-fas/src/main/resources/application.properties
View file @ 5a72e0c1
......@@ -4,7 +4,7 @@ server.port = 8085
#environment
spring.profiles.active=dev
#spring.freemarker.cache=false
#spring.freemarker.cache=false
spring.devtools.restart.enabled=true
spring.devtools.restart.additional-paths=src/main/java
spring.devtools.restart.exclude=WEB-INF/**
......@@ -95,7 +95,7 @@ data.type.hydrant=3105
outSystem.fegin.name=unKnow
outSystem.user.password=a1234560
outSystem.user.password=ENC(poZOhmc0nL52OOUE5HjGDAkVKo24xNOrAqGTi6GDNjS0IXOEDfSiLORpK0qDezT4)
privilege.fegin.name=AMOS-API-PRIVILEGE
## redis失效时间
redis.cache.failure.time=10800
......
amos-boot-system-jcs/src/main/resources/application-dev.properties
View file @ 5a72e0c1
......@@ -3,18 +3,18 @@
spring.datasource.url=jdbc:mysql://172.16.11.201:3306/dl_amos_common_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(tPXldVBJjiRAQ0rk11qOVCSJFWtkGGvlTqcWtmkxrNA/W9PJ7TibZdTQfd3K5fjy)
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.11.201:10001/eureka/
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.password=ENC(rHjQVV3WgAJnhci3sOKjqyXfNB7E/bj8g9NCQfbDSFGUlq6oxRzZp/Fp2+KZoxF5)
## redis properties:danger/list
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(lWqTEY3X3h2PiIxJKR073v5L9aiF6MWZlhglsLr+8QrIGeV3M28y+ByVpFVrGItf)
## ES properties:
......@@ -22,20 +22,20 @@ biz.elasticsearch.address=172.16.10.215
spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username= elastic
elasticsearch.password= Yeejoin@2020
elasticsearch.username=elastic
elasticsearch.password=ENC(tPXldVBJjiRAQ0rk11qOVCSJFWtkGGvlTqcWtmkxrNA/W9PJ7TibZdTQfd3K5fjy)
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(yVcJLlSl9/CXSEMT/SjcyzaLAvGU4o8OhU0AVnaF40Olfvo9kT+VxykM6bunDzcb)
#activeMq
spring.activemq.broker-url=tcp://172.16.11.201:61616
spring.activemq.user=admin
spring.activemq.password=public
spring.activemq.password=ENC(yVcJLlSl9/CXSEMT/SjcyzaLAvGU4o8OhU0AVnaF40Olfvo9kT+VxykM6bunDzcb)
spring.jms.pub-sub-domain=false
#启用连接池
spring.activemq.pool.enabled=true
......
amos-boot-system-jcs/src/main/resources/application-jcs.properties
View file @ 5a72e0c1
## DB properties:
spring.datasource.url=jdbc:mysql://11.11.16.4:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(JSMsplTAjqWQ4dWJFOlg8FzLf+SEQJyG3ILlGpwKWYhtJOuqq0sofjTwB9AQxo5W)
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://11.11.16.1:10001/eureka/
......@@ -10,7 +10,7 @@ eureka.client.serviceUrl.defaultZone=http://11.11.16.1:10001/eureka/
spring.redis.database=1
spring.redis.host=11.11.16.1
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(PM3FL24Mej0SoUxGsuW0DNJDTRHOG/7QKV97GSCzvdNOF3hB3xBGEosbZ3APCwtx)
## ES properties:
biz.elasticsearch.address=11.11.16.1
......@@ -23,7 +23,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://11.11.16.1:2883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(lsUzcQULDnEaqXtDJYGztWUa1hUKpz714my0EzynE86xAD5nmYUEhFOiv0bJzjch)
## 规则配置 properties:
rule.definition.load=false
......
amos-boot-system-jcs/src/main/resources/application-qa.properties
View file @ 5a72e0c1
## DB properties:
spring.datasource.url=jdbc:mysql://localhost:3306/amos-jcs-biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=root_123
spring.datasource.password=ENC(m+53z+9+MJdXEeQ4Jox4YIs7ZJExTICLCnlmLS+MVOCPsY7Lb3oa0nXSJX5DNnkH)
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://39.98.45.134:10001/eureka/
......@@ -10,7 +10,7 @@ eureka.client.serviceUrl.defaultZone=http://39.98.45.134:10001/eureka/
spring.redis.database=1
spring.redis.host=39.98.45.134
spring.redis.port=56379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(04emFp6pyJmFO9tZ5oF7lhEvOHjDW/XdTEgh2z8GYqfeANZMJ1crAipnKNJODfWk)
## ES properties:
biz.elasticsearch.address=113.141.179.44
......@@ -23,7 +23,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://39.98.45.134:1883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(6jzGMkPiiUXER1UhMjiBTVAwzCn3K3tAwrUpEICoXYwAcwcqndNQuEnGrEI+53jJ)
## 规则配置 properties:
rule.definition.load=false
......
amos-boot-system-jcs/src/main/resources/application.properties
View file @ 5a72e0c1
......@@ -142,7 +142,7 @@ mqtt.topic.command.car.jw=carCoordinates
management.security.enabled=true
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.password=ENC(rHjQVV3WgAJnhci3sOKjqyXfNB7E/bj8g9NCQfbDSFGUlq6oxRzZp/Fp2+KZoxF5)
#?????????
#system.type=dl
......
amos-boot-system-kgd/src/main/resources/application-dev.properties
View file @ 5a72e0c1
## DB properties:
spring.datasource.url=jdbc:mysql://172.16.3.18:3306/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(Ou/UCHy99d2rrRpBALxXgZSaeyRUfaihQJ92+uhJ1JqIkdltRM76rUq+HH8zGj2q)
## eureka properties:
eureka.instance.hostname=172.16.3.18
eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
......@@ -9,7 +9,7 @@ eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eu
spring.redis.database=1
spring.redis.host=172.16.3.18
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(N9krrWFvAm/20KiBqbq18J1UPbDwmQVgecPchtD1mnjyJ04rDU4bghsyh3E2seh7)
spring.cache.type=GENERIC
......@@ -45,12 +45,12 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.3.18:2883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(hqcljkebJzk/mWPZCj6/Gj6a3nkOrUj/1Yzde1pmm/J4fpMJ8juIgeSFwi16v3cJ)
emqx.max-inflight=1000
spring.influx.url=http://39.98.246.31:8086
spring.influx.password=Yeejoin@2020
spring.influx.password=ENC(Ou/UCHy99d2rrRpBALxXgZSaeyRUfaihQJ92+uhJ1JqIkdltRM76rUq+HH8zGj2q)
spring.influx.user=root
spring.influx.database=iot_platform
spring.influx.retention_policy=default
......@@ -63,8 +63,8 @@ knife4j.production=false
knife4j.enable=true
knife4j.basic.enable=true
knife4j.basic.username=admin
knife4j.basic.password=a1234560
knife4j.basic.password=ENC(ptK54RHTySvkMyTnTdRUY4jd1DfJD7oyJdaOxU0vYwZLyA7tdP6gjrDeQfXBW2P2)
management.security.enabled=true
spring.security.user.name=admin
spring.security.user.password=a1234560
\ No newline at end of file
spring.security.user.password=ENC(ptK54RHTySvkMyTnTdRUY4jd1DfJD7oyJdaOxU0vYwZLyA7tdP6gjrDeQfXBW2P2)
\ No newline at end of file
amos-boot-system-knowledgebase/src/main/resources/application-dev.properties
View file @ 5a72e0c1
......@@ -2,7 +2,7 @@
# jdbc_config
spring.datasource.url=jdbc:mysql://172.16.3.18:3306/knowledge?characterEncoding=utf8&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(sa8xTsculw9hnpmMoW2qX8js8G++6Hkr0TMiq5632zzXwUSqF3FIJHx84oao8tU+)
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#not support for spring-boot v1.5+, use org.apache.tomcat.jdbc.pool.DataSource by default.
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
......@@ -21,7 +21,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
spring.redis.database=1
spring.redis.host=172.16.3.18
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(wIAGbr75Y+VSDHYULMoBJtWWilrxkJlzFInT7bLByClKuE1ifHJK+mG6kp8VpyXU)
spring.redis.timeout=0
......@@ -48,7 +48,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.3.18:2883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(BRNhmVnl0ioUEI/GazSkeYtogsl1y7lRrXopoZ5Kig9YL9TrHyqfTDudI34lrLuy)
emqx.max-inflight=1000
#DIY
......@@ -75,4 +75,4 @@ file.url=http://39.98.45.134:9000/
elasticsearch.username= elastic
elasticsearch.password= 123456
\ No newline at end of file
elasticsearch.password= ENC(UvIBUWC3jEL6gA1QliE58FQyZOCZS5M3L6v8yZFkcS5IQ2JqgU6R/Mc20X8IPUkH)
\ No newline at end of file
amos-boot-system-knowledgebase/src/main/resources/application-jcs.properties
View file @ 5a72e0c1
......@@ -2,7 +2,7 @@
# jdbc_config
spring.datasource.url=jdbc:mysql://11.11.16.4:3306/xiy_knowledge_v3.0.1_20210712?characterEncoding=utf8&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(844VgY7A/UZQzG8UWdOPyHJBEwzCrYa9KWcnR/5dWVRTiePzV9lyJLRtoQpTclP2)
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#not support for spring-boot v1.5+, use org.apache.tomcat.jdbc.pool.DataSource by default.
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
......@@ -21,7 +21,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
spring.redis.database=1
spring.redis.host=11.11.16.1
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(TJoy/jFtUsaae72hU02SOE1p80Eg+FMREruL+S4pCdb1LBtf/FMlgFZ7xNu+FG9I)
spring.redis.timeout=0
......@@ -47,7 +47,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://11.11.16.1:2883
emqx.user-name=knowledge
emqx.password=a123456
emqx.password=ENC(tgbYZ8KgZN01mGJCmgYhJwMhVvJESOlB01NXzcSAND04iV9RqtdhEB0d8gBX6St8)
emqx.max-inflight=1000
#DIY
......
amos-boot-system-knowledgebase/src/main/resources/application-qa.properties
View file @ 5a72e0c1
......@@ -2,7 +2,7 @@
# jdbc_config
spring.datasource.url=jdbc:mysql://172.16.10.66:3306/knowledge_base?characterEncoding=utf8&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=root_123
spring.datasource.password=ENC(P9j0fADzUEgs4HSHBjbx330pA/OzI+g0eC8QWTWGTimBq7DViiwIhZl6w3QT1ifW)
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#not support for spring-boot v1.5+, use org.apache.tomcat.jdbc.pool.DataSource by default.
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
......@@ -21,7 +21,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(btWnci7rMZ5/N/xf2HjmcpoCa/b77pzb6qsTXG2yeuggvD8ZoF/jIGTlcnHr0kpO)
spring.redis.timeout=0
......@@ -47,7 +47,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(eN2mhzWo59KZmjw5cuujBMHno77e2k1jmXhSEH4CcpAEiecIW7vdSRhgo/7+UzeF)
emqx.max-inflight=1000
#DIY
......
amos-boot-system-knowledgebase/src/main/resources/application-test.properties
View file @ 5a72e0c1
......@@ -2,7 +2,7 @@
# jdbc_config
spring.datasource.url=jdbc:mysql://172.16.10.85:3306/knowledge_base?characterEncoding=utf8&serverTimezone=Asia/Shanghai
spring.datasource.username=knowledge_base
spring.datasource.password=knowledge_base
spring.datasource.password=ENC(IzkDKbybASOa7iVTTeFB0YJHKtU35Gz2eHni4Nq88aot/wu+cMIrhqQesx4GEr+/)
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#not support for spring-boot v1.5+, use org.apache.tomcat.jdbc.pool.DataSource by default.
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
......@@ -21,7 +21,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(JXUH5VTjbh7HeKxJ8b/ZmerscAN1bAhozeHRbJJ3E8g78UxPNyChUbuJ1kw+M7MM)
spring.redis.timeout=0
......@@ -47,7 +47,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(eVGQ8GcDlYMAo4PuzTfT4SEkBdhDmnAFrE0/g1fayeTLgEwVKVRVe6pxgvrpYcwv)
emqx.max-inflight=1000
#DIY
......
amos-boot-system-latentdanger/src/main/resources/application-dev.properties
View file @ 5a72e0c1
......@@ -20,14 +20,14 @@ ribbon.MaxAutoRetries = 1
#DB properties:
spring.datasource.url = jdbc:mysql://172.16.10.211:3306/xiy_safety_business_v3.0.1_20100712?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= Yeejoin@2020
spring.datasource.password= ENC(PpcR0IdNRnb8R7xok+2QsyVc7UisDRoQy4JZ4yWDiNWEguxI+s5cpuYkCWhytuvB)
spring.datasource.driver-class-name = com.mysql.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
security.password=a1234560
security.password=ENC(Q2UDSg6NzaT3mVxuzCQurH84EOfOBr4/T8s5xxgOlDu/RTuh+O4fG+S3j4wR3CkJ)
security.loginId=jc_wjk006
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -37,7 +37,7 @@ security.appKey=studio_normalapp_3168830
spring.redis.database=1
spring.redis.host=172.16.10.211
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(qNlsl1Fhu+GygxqgMjnYTT/Y66kLTKCz0A05uhVJSqi4PRK2weUvX/DO5hWw5/N7)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -83,7 +83,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(qV5LV4xIsXBnd+Q1P+dDUqx1zwVqAR5YcZSss/hZidit4XG+TgXBUtQh8n+BVakG)
emqx.max-inflight=1000
fire-rescue=12321
......
amos-boot-system-latentdanger/src/main/resources/application-docker.properties
View file @ 5a72e0c1
......@@ -14,7 +14,7 @@ ribbon.MaxAutoRetries = 1
#DB properties:
spring.datasource.url = jdbc:mysql://172.16.10.66:3306/safety-business-3.0.1?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= root_123
spring.datasource.password= ENC(Rvz2Tr0/cHKrl81jfhhP7yRWV5xxk1EM087LH2tdkdJDHQl2si8g31RLBq2H5UY9)
spring.datasource.driver-class-name = com.mysql.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
......@@ -22,7 +22,7 @@ spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
security.password=a1234560
security.password=ENC(8Va8m6sfRNzO/Qf5+uPdxMOVFYcPaKBsKV4z1IGBSuCgaSMz524bXxOhFXGBr9b+)
security.loginId=jc_wjk006
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -32,7 +32,7 @@ security.appKey=studio_normalapp_3168830
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(c54JRE/8Cs+6ykmlU1xevjGmFFhhjRsnkhTTKQfRtSLLvd+qKPFtVLbeIkc5/z5f)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -78,7 +78,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(k+rmkOo3F50CUtKAN92MZgGS5eAvLEl+ezfsRoSP89wYw7oV0SSj+B7iTw+Bk5/h)
emqx.max-inflight=1000
file.url=http://39.98.45.134:9000/
\ No newline at end of file
amos-boot-system-latentdanger/src/main/resources/application-test.properties
View file @ 5a72e0c1
......@@ -14,7 +14,7 @@ ribbon.MaxAutoRetries = 1
#DB properties:
spring.datasource.url = jdbc:mysql://172.16.10.66:3306/safety-business-3.0.1?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= root_123
spring.datasource.password= ENC(zAiAa7CGXZqroheMkNVJM02vcNyszGv5mxdKO4HJKg4y1/yXCKwkVZ7vPOJbyFJa)
spring.datasource.driver-class-name = com.mysql.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
......@@ -22,7 +22,7 @@ spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
security.password=a1234560
security.password=ENC(2kW1G1SFK6pCNQwQlkuPUYv10cwqXdLTRy5EI0d5sDyZIPsL5Y/Ce3JACmyw90jm)
security.loginId=jc_wjk006
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -32,7 +32,7 @@ security.appKey=studio_normalapp_3168830
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(msxvFkNsgLVe79ii5MK6podvnwHi3XRvsKWCYsPwuhrOBwGqscnPkFdXR9/Cvp7n)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -78,7 +78,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(Xm0idEy22WFaWaIHxmShsk/sfjrIZXZBdD/PlGgUNpwb6rnzuWoQlLIJS2khM8aH)
emqx.max-inflight=1000
file.url=http://39.98.45.134:9000/
\ No newline at end of file
amos-boot-system-maintenance/src/main/resources/application-dev.properties
View file @ 5a72e0c1
......@@ -3,13 +3,13 @@
spring.application.name = AMOS-MAINTENANCE-API
spring.datasource.url = jdbc:mysql://172.16.10.211:3306/xiy_maintenance_20210729?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= Yeejoin@2020
spring.datasource.password= ENC(qUXwws7ORg1jTn3n/KULNmlSU+p1TabyJYJLoREyBtS43tJxBheDvzpJ4tlx2U2H)
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.10.211:10001/eureka/
jcs.fegin.name=JCS
security.password=a1234560
security.password=ENC(fylWEAvpKIwcKcZz1tuSp87svvaNRaeNNE5NJm4jLpJZ+I0vpZ0P9PO8KRDCa/ZG)
security.loginId=jc_wjk006
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -18,7 +18,7 @@ security.appKey=studio_normalapp_3168830
spring.redis.database=1
spring.redis.host=172.16.10.211
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(AE9nun//Id3V26rsmYdFV1X74bSbB2XlfrKjcBsUpbduKzqfjl84bY+Owqjq3TYr)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -44,7 +44,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(plHHeaMcUrvvF/jAG6zZsbYVW63oqE9szljel6qsAh0y/R1ZP2K97jTukGshWDxW)
emqx.max-inflight=1000
file.url=http://39.98.45.134:9000/
\ No newline at end of file
amos-boot-system-maintenance/src/main/resources/application-jcs.properties
View file @ 5a72e0c1
#DB properties:
spring.datasource.url = jdbc:mysql://11.11.16.4:3306/xiy_maintenance_20210729?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= Yeejoin@2020
spring.datasource.password= ENC(2lMw9qjzr1gSOnX5xrTL93XDHcP1WZ86yFni7nven5ESUZtvsgyhONPUVyaCP5ZI)
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://11.11.16.1:10001/eureka/
security.password=a1234560
security.password=ENC(x9Fs4JDUV6SY9K5BsB3alYmd0Pl/ydKo/G4w8ok3aYtn5kbRok+JgxKhLWIx8yBr)
security.loginId=jc_wjk006
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -15,7 +15,7 @@ security.appKey=studio_normalapp_3168830
spring.redis.database=1
spring.redis.host=11.11.16.1
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(MVWAt/LfAKmWRmjs1xni9odSK0Zdq9sLuoj03bwdWgVviyQ0YIzaP7zwnBdmi2Ut)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -41,7 +41,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://11.11.16.1:2883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(u6uzXt+v9awsBoBq2R/Y39dgBtYOuM7wssNhlofJHttg9ed9M8dw4wN2r/o0vN57)
emqx.max-inflight=1000
file.url=http://11.11.16.1:9000/
\ No newline at end of file
amos-boot-system-patrol/src/main/resources/application-dev.properties
View file @ 5a72e0c1
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.11.201:10001/eureka/
eureka.client.registry-fetch-interval-seconds=5
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.password=ENC(UBbZb84sdgrjubOYukSL8IBqPg0hY5L+FaY/VZVD0cdm/cn0GGEvnbIqdbvqoJeh)
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
......@@ -22,14 +22,14 @@ spring.reactor.debug-agent.enabled=true
#DB properties:
spring.datasource.url=jdbc:mysql://172.16.11.201:3306/dl_business_v3.0.1.3?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(8GbrjHtpyDdesJUcq1DSQK67Yrb/VOIDBlpgF8WMRjlPbHI9FsOxmQK//qAToyeH)
spring.datasource.driver-class-name = com.mysql.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
security.password=a1234560
security.password=ENC(UBbZb84sdgrjubOYukSL8IBqPg0hY5L+FaY/VZVD0cdm/cn0GGEvnbIqdbvqoJeh)
security.loginId=admin
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -39,7 +39,7 @@ security.appKey=studio_normalapp_3056965
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(BikorL2ThGGnAbp03IwocBJ/8TPZUpy+hnr9vFDAokyvQNeK+Kycy8725uXqxWxT)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -89,7 +89,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-3578
emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(5+PwujB0t52PNInudV/Qa0WPNrkRcJRTeXRlZ/WG1JLrhGHgpNm1IQW2UJC8Hx1w)
emqx.max-inflight=1000
file.url=http://172.16.11.201:9000/
......
amos-boot-system-patrol/src/main/resources/application-docker.properties
View file @ 5a72e0c1
......@@ -14,7 +14,7 @@ ribbon.MaxAutoRetries = 1
#DB properties:
spring.datasource.url = jdbc:mysql://172.16.10.66:3306/safety-business-3.0.1?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= root_123
spring.datasource.password= ENC(f3V+VZiSwCsYzXd1V5y2xx7f9a50NhH9p4HyhNuD2p1Yd3Yc5kLUGp7/npPjDYQt)
spring.datasource.driver-class-name = com.mysql.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
......@@ -22,7 +22,7 @@ spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
security.password=a1234560
security.password=ENC(+rDGhsa8bwQbKrm/Rc1C94wBSbvcwF4QHKzHJS2D/UB7A7lvB9jPnG6ZsaephRnq)
security.loginId=jc_wjk006
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -32,7 +32,7 @@ security.appKey=studio_normalapp_3168830
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(WQFxoQuhrx+7MdK/cVn8CZ3iP+oJDyOjKJb7gOGuqPMSaUkhexNdfJLyVEtIZhwg)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -79,7 +79,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(hZ3P601LVYc16F8pJyils9C0xUbtQn/NijVbXiQaUnSmEY+N+R+F2+cHsRO2mZjQ)
emqx.max-inflight=1000
file.url=http://39.98.45.134:9000/
\ No newline at end of file
amos-boot-system-patrol/src/main/resources/application-jcs.properties
View file @ 5a72e0c1
......@@ -19,14 +19,14 @@ ribbon.MaxAutoRetries = 1
#DB properties:
spring.datasource.url = jdbc:mysql://11.11.16.4:3306/xiy_safety_business_v3.0.1_20100712?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(7oNI3pU1nJxCOUoMlFMtOisbOD0b6tqsIxREjwj0VDWcu3tSx28S7WcsftK6MncZ)
spring.datasource.driver-class-name = com.mysql.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
security.password=a1234560
security.password=ENC(8H3ar5crMF5EB7SAxjZLK4KpmH8ekVnyeyWXDDEqgpqHfo0FaV3S00K9HrM74QYe)
security.loginId=jc_wjk006
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -36,7 +36,7 @@ security.appKey=studio_normalapp_3168830
spring.redis.database=1
spring.redis.host=11.11.16.1
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(ZAzBegw9yJcPhSM7oCxLJZW9JWtaQ2SZurNEb9UZpz+DAtPtq1rugBp8sTcSq9ie)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -83,7 +83,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://11.11.16.1:2883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(EuPZLjEccNFCYrINWXWg4LvC8BCpY6GstwrtV/visuMmjXXE+jtyjeLGPjPHn5pb)
emqx.max-inflight=1000
file.url=http://11.11.16.1:9000/
amos-boot-system-patrol/src/main/resources/application-test.properties
View file @ 5a72e0c1
......@@ -14,7 +14,7 @@ ribbon.MaxAutoRetries = 1
#DB properties:
spring.datasource.url = jdbc:mysql://172.16.10.66:3306/safety-business-3.0.1?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= root_123
spring.datasource.password= ENC(S90CeEABiQwwXJ+sKKSnvFQkAYhR9C76KfXSjNflO1zaIgIDX31wzvW83owm2nTe)
spring.datasource.driver-class-name = com.mysql.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
......@@ -22,7 +22,7 @@ spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
security.password=a1234560
security.password=ENC(tGYmYgQDl22QeVo+VSBI5DsJ1q1wsgvkuT8Qxbrr1gR5x3/z8PmUC3uncACNAtuR)
security.loginId=jc_wjk006
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -32,7 +32,7 @@ security.appKey=studio_normalapp_3168830
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(0T8U4mXCRCeP5itFb4pBtB/mJ2y2yKE8oTbIfhukey+ZG06hhgHKu+hJsjVoO0ei)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -79,7 +79,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(3XTg2UtPdtN9aGpMIsV0w+YIM7sJJDXOsMjzgM3jEmEk8Ovbd6L7Ji2Mf3hNoaCm)
emqx.max-inflight=1000
file.url=http://39.98.45.134:9000/
\ No newline at end of file
amos-boot-system-patrol/src/main/resources/application.properties
View file @ 5a72e0c1
......@@ -73,7 +73,7 @@ equipment.hierarchy=1,2,4,6
management.security.enabled=true
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.password=ENC(D8BgJLfZllarqs1DJQxPfHUCNF+IoCMsToagadZuIkdcXZMU/trrabLjLHa/dvz9)
#\u96EA\u82B1\u7B97\u6CD5\u53C2\u6570 \u7EC8\u7AEFID
generator.worker_id=1
......
amos-boot-system-precontrol/src/main/resource/application-dev.properties
View file @ 5a72e0c1
spring.datasource.url=jdbc:mysql://39.100.239.237:3306/precontrol?serverTimezone=GMT%2B8
spring.datasource.username=root
spring.datasource.password=yeejoin_123
spring.datasource.password=ENC(Vfge4mGDNB4aqT4K/qM2DT1x7elpG4EBx7aUimCfXaVpSWLMX4PsQMHHlx/huCwU)
spring.jackson.time-zone=GMT+8
fdfs.so-timeout=1501
fdfs.connect-timeout=601
......@@ -15,11 +15,11 @@ eureka.instance.prefer-ip-address=true
eureka.client.service-url.defaultZone=http://39.100.239.237:10001/eureka/
#redis database index
spring.redis.database=1
#redis ip
#redis ip
spring.redis.host=39.100.239.237
spring.redis.port=6379
#redis password (default is empty)
spring.redis.password=amos2019Redis
spring.redis.password=ENC(zVOksNgO6mulp1fK7NsiA3ow0S06D2/GXYp5UncyOKt3aooTENbjs2kbGfSJwObN)
#max connect number
spring.redis.pool.max-active=200
# redis max wait time ( -1 is not limit)
......@@ -64,7 +64,7 @@ spring.liquibase.enabled=false
spring.liquibase.drop-first=false
spring.liquibase.url=jdbc:mysql://39.100.239.237:3306/precontrol?serverTimezone=GMT%2B8
spring.liquibase.user=root
spring.liquibase.password=yeejoin_123
spring.liquibase.password=ENC(Vfge4mGDNB4aqT4K/qM2DT1x7elpG4EBx7aUimCfXaVpSWLMX4PsQMHHlx/huCwU)
##emqx
......@@ -72,7 +72,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://39.100.239.237:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(OSA64iMVlqZkH0frCyNCX+Mk1oLnp5AHRLBsL6GjrV+r6LIoNp8n8Zhhm2k6TD/T)
emqx.max-inflight=1000
#jxdj
......@@ -82,7 +82,7 @@ jxdj.id=1272442250430222338
admin.product=AMOS-SERVICE-ADMIN
admin.appkey=AMOS_ADMIN
admin.user=admin_jepcc
admin.password=a1234560
admin.password=ENC(J82ipWkMIK3d7TNxQvPjaGq2A2mJP09fXp1phZbOj266B0Ij+owacy6tGasYArQn)
admin.product.web=AMOS-WEB-ADMIN
amos.secret.key=qaz
......@@ -92,7 +92,7 @@ amos.not-auto-orgcode=false
#\uFFFD\u05BB\uFFFD\uFFFD\uFFFD\u00BC\u012C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
app.login.init.password=jxdj123456
app.login.init.password=ENC(LwcHgX9xS6BfEHFzZDO+YismzAJx0edXt2ucdkNGu1L4kc4/XX3c+M/IoZTkSEBu)
#\uFFFD\u05BB\uFFFD\uFFFD\uFFFD\u05A4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0427\u02B1\uFFFD\u48EC\uFFFD\uFFFD\u03BB\uFFFD\uFFFD
redis.key.expire.authCode=300
#\uFFFD\u05BB\uFFFD\uFFFD\uFFFD\u05A4\uFFFD\uFFFDredis\u01F0\uFFFDY
......
amos-boot-system-precontrol/src/main/resource/application-dev2.properties
View file @ 5a72e0c1
spring.datasource.url=jdbc:mysql://47.92.234.253:3306/precontrol?serverTimezone=GMT%2B8
spring.datasource.username=root
spring.datasource.password=yeejoin_1234
spring.datasource.password=ENC(yrlvuaaLuIuHDUxzzhik2ugEGTukH8y+e8VWdomirI74jl4LulRvVr43eNlhFtur)
spring.jackson.time-zone=GMT+8
fdfs.so-timeout=1501
fdfs.connect-timeout=601
......@@ -15,11 +15,11 @@ eureka.instance.prefer-ip-address=true
eureka.client.service-url.defaultZone=http://47.92.234.253:10001/eureka/
#redis database index
spring.redis.database=1
#redis ip
#redis ip
spring.redis.host=47.92.234.253
spring.redis.port=6379
#redis password (default is empty)
spring.redis.password=amos2019Redis
spring.redis.password=ENC(sUnO4QTJzRNUz983gu5qLYLrV7elidcV2o7wHbzLBpUCUpmjbYcK7O7djMFTe5n7)
#max connect number
spring.redis.pool.max-active=200
# redis max wait time ( -1 is not limit)
......@@ -64,7 +64,7 @@ spring.liquibase.enabled=false
spring.liquibase.drop-first=false
spring.liquibase.url=jdbc:mysql://47.92.234.253:3306/precontrol?serverTimezone=GMT%2B8
spring.liquibase.user=root
spring.liquibase.password=yeejoin_1234
spring.liquibase.password=ENC(yrlvuaaLuIuHDUxzzhik2ugEGTukH8y+e8VWdomirI74jl4LulRvVr43eNlhFtur)
##emqx
......@@ -72,7 +72,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://47.92.234.253:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(A+dlQa1l1oQx9rLboFUK0RgtSMJNVdezIMnAkq659CTHvmAWIqFiVRILmBSOVJoo)
emqx.max-inflight=1000
#jxdj
......@@ -82,7 +82,7 @@ jxdj.id=1272442250430222338
admin.product=AMOS-SERVICE-ADMIN
admin.appkey=AMOS_ADMIN
admin.user=admin_jepcc
admin.password=a1234560
admin.password=ENC(Vm+JAEzPlsQ4e0wYUiy0uuKOIr9R3Xo77U2C4GK0B7xYs4MtyQTgf0SrwCJXwC89)
admin.product.web=AMOS-WEB-ADMIN
amos.secret.key=qaz
......@@ -92,7 +92,7 @@ amos.not-auto-orgcode=false
#\uFFFD\u05BB\uFFFD\uFFFD\uFFFD\u00BC\u012C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
app.login.init.password=jxdj123456
app.login.init.password=ENC(xFJb8gGQPIZXLb60V4QzRpyv78y19cTy4oT8rjizBwlyqw2vDX8aNtXtyPhGRSOw)
#\uFFFD\u05BB\uFFFD\uFFFD\uFFFD\u05A4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0427\u02B1\uFFFD\u48EC\uFFFD\uFFFD\u03BB\uFFFD\uFFFD
redis.key.expire.authCode=300
#\uFFFD\u05BB\uFFFD\uFFFD\uFFFD\u05A4\uFFFD\uFFFDredis\u01F0\uFFFDY
......
amos-boot-system-precontrol/src/main/resource/application-docker.properties
View file @ 5a72e0c1
spring.datasource.url=jdbc:mysql://amos-mysql:3306/case_server?serverTimezone=GMT%2B8
spring.datasource.username=root
spring.datasource.password=yeejoin_1234
spring.datasource.password=ENC(uIHIMK748pxIQvLHPMgb4yCRaJfHpB4fkM4gOpY97ersw0wlUPDqrnx96yAouKf1)
fdfs.so-timeout=1501
fdfs.connect-timeout=601
fdfs.thumb-image.height=200
......@@ -12,11 +12,11 @@ eureka.instance.prefer-ip-address=true
eureka.client.serviceUrl.defaultZone:http://${eureka.instance.hostname}:10001/eureka/
#redis database index
spring.redis.database=5
#redis ip
#redis ip
spring.redis.host=amos-redis
spring.redis.port=6379
#redis password (default is empty)
spring.redis.password=redis2020
spring.redis.password=ENC(lTXin3K8GXaKxFsmDMEgQfWm1iazNEw8A8hkbogfT3aojpGTHyxxxq7mo1pVC00h)
#max connect number
spring.redis.pool.max-active=200
# redis max wait time ( -1 is not limit)
......@@ -29,11 +29,11 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(yTU4Z2TMe2O3iqkeCAVav7uvCIG1J8qgCky2VXy94k4sgtj8r/EET7+xNgl8EUxv)
emqx.max-inflight=1000
#手机登录默认密码
app.login.init.password=jxdj123456
app.login.init.password=ENC(MW8DV9xy3avoLrVT8CmZHdZmM8zP5/4kQ5O6UII0uFQ9n/j6qCZv/DAk3Y3G181x)
#手机验证码最大有效时间，单位秒
redis.key.expire.authCode=300
#手机验证码redis前綴
......
amos-boot-system-precontrol/src/main/resource/application-public.properties
View file @ 5a72e0c1
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/precontrol?serverTimezone=GMT%2B8
spring.datasource.username=root
spring.datasource.password=yeejoin_123
spring.datasource.password=ENC(oNxwEeDiI6UDbkhItiD0gK0fwFOnSGaRawkcf8N1KcUZ4SfN1rjgt/wVGekfv+jz)
fdfs.so-timeout=1501
fdfs.connect-timeout=601
fdfs.thumb-image.height=200
......@@ -14,11 +14,11 @@ eureka.instance.prefer-ip-address=true
eureka.client.service-url.defaultZone=http://localhost:10001/eureka/
#redis database index
spring.redis.database=5
#redis ip
#redis ip
spring.redis.host=127.0.0.1
spring.redis.port=6379
#redis password (default is empty)
spring.redis.password=amos2019Redis
spring.redis.password=ENC(qGAJEh8SDYfww4W6kCCDIALVwgh71ljhtQ1W5hX7LzXBTz8uk6yNt0QD8ok6i3s8)
#max connect number
spring.redis.pool.max-active=200
# redis max wait time ( -1 is not limit)
......@@ -56,18 +56,18 @@ spring.liquibase.enabled=true
spring.liquibase.drop-first=false
spring.liquibase.url=jdbc:mysql://127.0.0.1:3306/precontrol?serverTimezone=GMT%2B8
spring.liquibase.user=root
spring.liquibase.password=yeejoin_123
spring.liquibase.password=ENC(oNxwEeDiI6UDbkhItiD0gK0fwFOnSGaRawkcf8N1KcUZ4SfN1rjgt/wVGekfv+jz)
##emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(eQAzGB9pywIbkKtZbiJNQEbwHSM4X7xUA1JN4im6IJcAMFOpdndLBhjDDAUuYR+K)
emqx.max-inflight=1000
#手机登录默认密码
app.login.init.password=jxdj123456
app.login.init.password=ENC(DhqXJSpiLmfpE5XukksZ0aJjPOd43kOqo71PeCv6gUJiTsCcRmA+VbGZVMrnzzFA)
#手机验证码最大有效时间，单位秒
redis.key.expire.authCode=300
#手机验证码redis前綴
......
amos-boot-system-precontrol/src/main/resource/application-qa.properties
View file @ 5a72e0c1
spring.datasource.url=jdbc:mysql://39.100.239.237:3306/precontrol?serverTimezone=GMT%2B8
spring.datasource.username=root
spring.datasource.password=yeejoin_123
spring.datasource.password=ENC(To3o7waoSJrrNe94UjDo5mo2vHklcFvE4Hca9vl7lOW4sbdAM1ErR/dRGQEaaZ2j)
spring.jackson.time-zone=GMT+8
fdfs.so-timeout=1501
fdfs.connect-timeout=601
......@@ -15,11 +15,11 @@ eureka.instance.prefer-ip-address=true
eureka.client.service-url.defaultZone=http://39.100.239.237:10001/eureka/
#redis database index
spring.redis.database=5
#redis ip
#redis ip
spring.redis.host=39.100.239.237
spring.redis.port=6379
#redis password (default is empty)
spring.redis.password=amos2019Redis
spring.redis.password=ENC(TQaSDBrWc/qJz0D79nL6rfqCqq8mPXIhwAfK09q2WJnQlr1RT5sBm2JYAxpy7yiR)
#max connect number
spring.redis.pool.max-active=200
# redis max wait time ( -1 is not limit)
......@@ -63,7 +63,7 @@ spring.liquibase.enabled=true
spring.liquibase.drop-first=false
spring.liquibase.url=jdbc:mysql://39.100.239.237:3306/precontrol?serverTimezone=GMT%2B8
spring.liquibase.user=root
spring.liquibase.password=yeejoin_123
spring.liquibase.password=ENC(To3o7waoSJrrNe94UjDo5mo2vHklcFvE4Hca9vl7lOW4sbdAM1ErR/dRGQEaaZ2j)
##emqx
......@@ -71,7 +71,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://39.100.239.237:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(Z8Cf5vBqGB+qYSJhu2DKjgpGctqcvf1dysR/a9FymAWBKJ/G4CYyAl9ZgvFEJMfk)
emqx.max-inflight=1000
#jxdj
......@@ -81,7 +81,7 @@ jxdj.id=1272442250430222338
admin.product=AMOS-SERVICE-ADMIN
admin.appkey=AMOS_ADMIN
admin.user=admin_jepcc
admin.password=a1234560
admin.password=ENC(BoFtmRP+ywpMfnSpE0taQvP+3Z3zWpAO4tRhPLw9/SgTy/a5MlmRWKx9hX+uYul3)
admin.product.web=AMOS-WEB-ADMIN
#\u673A\u6784\u7528\u6237
......
amos-boot-system-supervision/src/main/resources/application-dev.properties
View file @ 5a72e0c1
#DB properties:
spring.datasource.url = jdbc:mysql://172.16.10.211:3306/xiy_supervision_1.0.0?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= Yeejoin@2020
spring.datasource.password= ENC(6f+kIb7gMn9e0ycPKMfRVKn3PGZ4BFez6hkxxLXxRgE6JVGYPeui1Zrz2Jb9LEO8)
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.10.211:10001/eureka/
security.password=a1234560
security.password=ENC(GwLN2ZJ2R/s3cn8cyVqONf79p5Z1BbtJIhpetRuF5xpdOBKNtZAPLxFbfZxHwzFg)
security.loginId=jc_wjk006
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -17,7 +17,7 @@ security.appKey=studio_normalapp_3168830
spring.redis.database=1
spring.redis.host=172.16.10.211
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(g83/5O3TYn3DQvygmWWz85WGirG0HdeUZmYUSmpV+40YmTmEllUAYq+8qij1LaMb)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -49,7 +49,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=super
emqx.password=a123456
emqx.password=ENC(H5ou9RR/Qj8EPGnwCoXh7tpCUB2dHpfkUSlBLKmIs+HOLqK0/C8IPVN6Cd6fPAkE)
emqx.max-inflight=1000
......
amos-boot-system-supervision/src/main/resources/application-jcs.properties
View file @ 5a72e0c1
#DB properties:
spring.datasource.url = jdbc:mysql://172.16.11.20:3306/amos-supervision_v1.0?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= root_123
spring.datasource.password= ENC(j2njcKSNVYBRTGzJZ47uXzcGLgyyf9uijuyx/f0mq/B7q99nAvGUN0CMdcVBGtVy)
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
security.password=a1234560
security.password=ENC(vkzY2c/Ad98YepFmPMG8BvIKf2aqNwIvJpai4fNN9BCbkxqHpAIPLmQTGcWgve3N)
security.loginId=jc_wjk006
security.productWeb=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
......@@ -15,7 +15,7 @@ security.appKey=studio_normalapp_3168830
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(89C3+NgJEwaFQMUttCJU0xgU3NZkXWzkOFtYstAcz/PbeUm7d2qdWOcVLjoVe82C)
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -47,7 +47,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://172.16.11.33:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(OtiAFcvYKHhEnjYxScPgdWbAXxDDBT4qgFWgvGc+90wxmdgN1a3CJnFZFXQc1lnv)
emqx.max-inflight=1000
file.url=http://39.98.45.134:9000/
\ No newline at end of file
amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/resources/application-dev.properties
View file @ 5a72e0c1
## DB properties:
spring.datasource.url=jdbc:mysql://172.16.10.215:3306/dl_amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(lr8ic/CgW4esCp8F9cwBlan1glhiB2h2NE8QixFXWPqlEgmP6/J76JYaJ682PejP)
## eureka properties:
#eureka.client.register-with-eureka=false
#eureka.client.fetchRegistry=false
......@@ -15,13 +15,13 @@ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${sprin
spring.redis.database=1
spring.redis.host=172.16.10.215
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(DL3Z9hoL084UizE7RO6heJboTMyWGzcMkNtxXTZTWuUw8zzp06MYUC2FKADBuB4c)
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.215:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(Gvv5Gg9Y5V+L7fG5DvCfkbyG91V0QG0/AUiHVaiYxvBP7VE7RMQvRNxZbN5wanwH)
#mqtt.scene.host=mqtt://172.16.10.201:18083/mqtt
......
amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/resources/application.properties
View file @ 5a72e0c1
......@@ -41,18 +41,18 @@ spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.password=ENC(K690fU244cKZl4VpV58c4Gep4GsVxNLoHpYr95otxGzaav4kXXwSrO+Y1myiGLqD)
knife4j.enable=true
knife4j.basic.enable=true
knife4j.basic.username= admin
knife4j.basic.password= a1234560
knife4j.basic.password= ENC(K690fU244cKZl4VpV58c4Gep4GsVxNLoHpYr95otxGzaav4kXXwSrO+Y1myiGLqD)
spring.boot.admin.client.enabled=true
spring.boot.admin.client.instance.metadata.user.name=${spring.security.user.name}
spring.boot.admin.client.instance.metadata.user.password=${spring.security.user.password}
spring.boot.admin.client.username=admin
spring.boot.admin.client.password=a1234560
spring.boot.admin.client.password=ENC(K690fU244cKZl4VpV58c4Gep4GsVxNLoHpYr95otxGzaav4kXXwSrO+Y1myiGLqD)
management.security.enabled=false
management.health.redis.enabled=false
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev.properties
View file @ 5a72e0c1
......@@ -3,7 +3,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://172.16.10.90:53306/tzs_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(hecvq7eHS0ta+0YLEzGUw90e1Duow0/p2MWtUG1XZN3sqCqgvCBiw4FDSsKJHqiI)
##eureka properties:
eureka.client.service-url.defaultZone =http://172.16.3.99:10001/eureka/
......@@ -22,7 +22,7 @@ spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username= elastic
elasticsearch.password= Yeejoin@2020
elasticsearch.password= ENC(hecvq7eHS0ta+0YLEzGUw90e1Duow0/p2MWtUG1XZN3sqCqgvCBiw4FDSsKJHqiI)
## unit(h)
alertcall.es.synchrony.time=48
......@@ -32,7 +32,7 @@ fileserver.domain=https://rpm.yeeamos.com:8888/
spring.redis.database=1
spring.redis.host=172.16.10.90
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(ft3gElv5SXf3gkfB8gRC07Kf6ZtCxvHL0O0jxtWDGhojn2uHxz562yaDoJmkAd6h)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -44,7 +44,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.90:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(ozAs7gHZMAFb1ihZ2Z26IH/MEqhvTrBbUYCa4jzZdvKBaziSnGTPR3AFvZDp1SIH)
tzs.cti.url=http://172.16.10.90:8000
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev2.properties
View file @ 5a72e0c1
......@@ -3,7 +3,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://172.16.10.90:53306/tzs_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(AlsuzZ4+nL9KcgJf4K4HhO96xIVpTqWF+5HoOMExvEWzE9TiyV/GFJ1p+aeNE0Hh)
##eureka properties:
eureka.client.service-url.defaultZone =http://172.16.3.99:10001/eureka/
......@@ -22,7 +22,7 @@ spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username= elastic
elasticsearch.password= 123456
elasticsearch.password= ENC(4Iz37aVpJNMQ7lmWj6dQzrfrTyyB2XyzoH4ZKVxMrszjGIVin4A/oKwlreDXieZI)
## unit(h)
alertcall.es.synchrony.time=48
......@@ -32,7 +32,7 @@ fileserver.domain=https://rpm.yeeamos.com:8888/
spring.redis.database=1
spring.redis.host=172.16.10.90
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(PdlKhla7qclGfDeYDcVS86WtKxh7YSwAEpIwY9gFWUNedpqgp21R7QurYf39PA/R)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -44,7 +44,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.90:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(/dB1fGCjMhkr6rH2dr4DnjG8mTxsuJ6ouophTI+YJgyquIJBpQ49cDAyCKv6V+4X)
tzs.cti.url=http://113.134.211.174:8000
......@@ -56,4 +56,4 @@ rule.definition.default-agency=tzs
org.filter.group.seq=1564150103147573249
elasticsearch.username= elastic
elasticsearch.password= Yeejoin@2020
\ No newline at end of file
elasticsearch.password= ENC(AlsuzZ4+nL9KcgJf4K4HhO96xIVpTqWF+5HoOMExvEWzE9TiyV/GFJ1p+aeNE0Hh)
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-jd.properties
View file @ 5a72e0c1
......@@ -3,7 +3,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://113.134.211.174:3306/xiy_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(b9x9ltHxbYR/Vd22e9Qyr2Cf/G91nbLpr1v6c/hfvN2M8BtyYtCY7Mh0sPnNiVld)
##eureka properties:
eureka.client.service-url.defaultZone =http://172.16.3.28:10001/eureka/
......@@ -29,7 +29,7 @@ alertcall.es.synchrony.time=48
spring.redis.database=1
spring.redis.host=172.16.3.28
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(awEHNWhI/o+xUHJVkg36KtrD4ZEOCXGYn0AIGz/BaaviGKXIHeMohW/RA4jJ7onx)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -41,7 +41,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.3.28:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(ct0pDXxkV3zVcxhOGdUzTjmMqokFmrKN4wuXxmYNf6YVNBPyttucTF7a6RePsoei)
tzs.cti.url=http://113.134.211.174:8000
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-qa.properties
View file @ 5a72e0c1
......@@ -3,7 +3,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://36.46.151.113:13306/tzs_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(WaJyKmFDEiDyu4qN7adwTIhe0vQD+kwYp6ZEmK9XCjiZbgmFSOiBC5+EAQtLTJM7)
##eureka properties:
eureka.client.service-url.defaultZone =http://36.46.151.113:10001/eureka/
......@@ -29,7 +29,7 @@ alertcall.es.synchrony.time=48
spring.redis.database=1
spring.redis.host=36.46.151.113
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(h1Y6NDQIFoK0Hxtx14E5sNJQ3irqIWgeCX+a7rSsZOhJTMwpGugoWEwnfpfzbMgv)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -41,6 +41,6 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://36.46.151.113:1883
emqx.user-name=admin
emqx.password=public
emqx.password=ENC(in1DRHeNHbqkD7wb2Yn/SmKdyJ4bskd+/dJcuPs/ZZrU4fcFYGfO6/Aq0FDfqabZ)
tzs.cti.url=http://113.134.211.174:8000
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application.properties
View file @ 5a72e0c1
......@@ -109,7 +109,7 @@ mqtt.topic.cyl.warning.push=/tzs/cyl_cyl_warning
cti.user.name=tzs_cti
cti.user.pwd=a1234567
cti.user.pwd=ENC(mR1zD09VqbcILrxiNC6Mrtiz/qH2bk6YN7XTLW8kYvKswoAn2gksBH5uKuXeZyPB)
flc.sms.tempCode=SMS_TZS_0001
......@@ -124,6 +124,6 @@ tzs.wechat.test.userId=3393279
admin.product=AMOS-SERVICE-ADMIN
admin.appkey=AMOS_ADMIN
admin.user=admin_tzs
admin.password=a1234560
admin.password=ENC(HbIrCMe+4A+3y0eni6xJEb2bIKgz4xV6Hm6uWhdyehtB8W9KDrkgwOd3ZMC75QIu)
admin.product.web=AMOS-WEB-ADMIN
amos.secret.key=qaz
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application-dev.properties
View file @ 5a72e0c1
......@@ -3,7 +3,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://39.98.45.134:3306/tzs_amos_ugp_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.password=ENC(LG1UvaTJpDHCsd8b2cUGOWlHaA5rvpkDQNVIuIUEA3NrZgSP7hcCitAfP50k69TD)
##eureka properties:
eureka.client.service-url.defaultZone =http://172.16.10.210:10001/eureka/
......@@ -19,7 +19,7 @@ eureka.instance.metadata-map.management.api-docs=http://172.16.3.99:${server.por
spring.redis.database=1
spring.redis.host=172.16.10.210
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.password=ENC(aVugHwS8dU276XFSdCL8mx/7YJByjt2576OyiuZ95QD43npJviw2y2Bh+QbK6ZVq)
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application.properties
View file @ 5a72e0c1
......@@ -47,6 +47,6 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.90:1883
emqx.user-name=super
emqx.password=123456
emqx.password=ENC(23pJcuCki2sX99sRZJgDjhDNXDvY6/EnTZIdMx2EwjyGgJmYf0Q0MjWYfu7HZDf6)
fire-rescue=123
\ No newline at end of file
amos-boot-utils/amos-boot-utils-jpush/src/main/java/com/yeejoin/amos/jpush/common/entity/DateUtil.java
View file @ 5a72e0c1
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.jpush.common.entity;
import org.apache.commons.lang.StringUtils;
import java.security.SecureRandom;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.ParsePosition;
......@@ -1070,8 +1071,10 @@ public class DateUtil {
{
;
}
long day = (date.getTime() - mydate.getTime()) / (24 * 60 * 60 * 1000);
return day;
if (null != date && null != mydate) {
return (date.getTime() - mydate.getTime()) / (24 * 60 * 60 * 1000);
}
return 0;
}
/**
......@@ -1114,7 +1117,7 @@ public class DateUtil {
*/
private static String getRandom(int i)
{
Random jjj = new Random();
SecureRandom jjj = new SecureRandom();
// int suiJiShu = jjj.nextInt(9);
if (i == 0) return "";
String jj = "";
......
amos-boot-utils/amos-boot-utils-jpush/src/main/java/com/yeejoin/amos/jpush/service/core/util/DateUtil.java
View file @ 5a72e0c1
......@@ -383,8 +383,10 @@ public class DateUtil {
} catch (Exception e) {
e.printStackTrace();
}
Time date = new Time(d.getTime());
return date;
if (null != d) {
return new Time(d.getTime());
}
return null;
}
/**
......
amos-boot-utils/amos-boot-utils-jpush/src/main/java/com/yeejoin/amos/jpush/util/DateUtil.java
View file @ 5a72e0c1
......@@ -1070,8 +1070,10 @@ public class DateUtil {
{
;
}
long day = (date.getTime() - mydate.getTime()) / (24 * 60 * 60 * 1000);
return day;
if (null != date && null != mydate) {
return (date.getTime() - mydate.getTime()) / (24 * 60 * 60 * 1000);
}
return 0;
}
/**
......
amos-boot-utils/amos-boot-utils-jpush/src/main/resources/application-dev.properties
View file @ 5a72e0c1
......@@ -12,6 +12,6 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(AblO28BP8PPLJD15FJg4kV2mKCqLw0wgyWFz5rgvwKXqFmVZpgh3jNi29MYxdoat)
params.isPush=true
\ No newline at end of file
amos-boot-utils/amos-boot-utils-message/src/main/resources/application-dev.properties
View file @ 5a72e0c1
......@@ -78,7 +78,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.client-user-name=admin
emqx.client-password=public
emqx.client-password=ENC(6pRD7dM5Hp6rjy+DcS8Il2TCdN/IYz8IXeZXkSlAZT/NV/vTe51acJDDu7lzF9Dx)
emqx.max-inflight=1000
......
amos-boot-utils/amos-boot-utils-message/src/main/resources/application-roma.properties
View file @ 5a72e0c1
......@@ -42,7 +42,7 @@ spring.kafka.producer.properties.sasl.jaas.config=org.apache.kafka.common.securi
username="b05fbb3e-f994-44a3-834b-daed08e499e6" \
password="eQl/-7kK%/d%Vj=%3t0k/kC!#.2HZX2PWsz8qI0n-@c0h$O0d9@5e/774@!EVWi6";
spring.kafka.producer.properties.ssl.truststore.location=D:/client.truststore.jks
spring.kafka.producer.properties.ssl.truststore.password=dms@kafka
spring.kafka.producer.properties.ssl.truststore.password=ENC(fAZQDcHATNzwZY8NAAi8+VckbjxCyizukM05oV1F6CZJxRwV52EySvshqMxHfCAp)
spring.kafka.producer.properties.ssl.endpoint.identification.algorithm=
# 消费者组
......@@ -60,7 +60,7 @@ spring.kafka.consumer.properties.sasl.jaas.config=org.apache.kafka.common.securi
username="b05fbb3e-f994-44a3-834b-daed08e499e6" \
password="eQl/-7kK%/d%Vj=%3t0k/kC!#.2HZX2PWsz8qI0n-@c0h$O0d9@5e/774@!EVWi6";
spring.kafka.consumer.properties.ssl.truststore.location=D:/client.truststore.jks
spring.kafka.consumer.properties.ssl.truststore.password=dms@kafka
spring.kafka.consumer.properties.ssl.truststore.password=ENC(fAZQDcHATNzwZY8NAAi8+VckbjxCyizukM05oV1F6CZJxRwV52EySvshqMxHfCAp)
spring.kafka.consumer.properties.ssl.endpoint.identification.algorithm=
# 当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，从头开始消费
# # 自动提交的频率 单位 ms
......@@ -94,7 +94,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.client-user-name=admin
emqx.client-password=public
emqx.client-password=ENC(e7sU0wBHIqXiGS4097G/ywpFFkIf8lks2zm9mWcqE4Cn8Xsh5mUSXVr+oqGwcyip)
emqx.max-inflight=1000
......@@ -122,7 +122,7 @@ queue.kafka.consumer.enable-auto-commit=false
# 是否开启消费者SSL
queue.kafka.ssl.enabled=true
queue.kafka.ssl.truststore.location=D:/client.truststore.jks
queue.kafka.ssl.truststore.password=dms@kafka
queue.kafka.ssl.truststore.password=ENC(fAZQDcHATNzwZY8NAAi8+VckbjxCyizukM05oV1F6CZJxRwV52EySvshqMxHfCAp)
queue.kafka.confluent.security.protocol=SASL_SSL
queue.kafka.confluent.sasl.mechanism=PLAIN
......
amos-boot-utils/amos-boot-utils-video/src/main/resources/application-dev.properties
View file @ 5a72e0c1
## DB properties:
spring.datasource.url=jdbc:mysql://172.16.6.60:3306/amos-jcs-biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=root_123
spring.datasource.password=ENC(gmOUJsHkRkkXBJPgPlht4OSv/pTgBl0nN4rMlxZ0oHD4wXUrz5PG2WDprOOYH5Lm)
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
......@@ -10,14 +10,14 @@ eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=ENC(I29tKqpJDIIu9+AvbVEAYsVHCg76jO3ZHCDCaKKpKXaOqJchLFEtbbX+zIgc7FPN)
## ES properties:
biz.elasticsearch.address=172.16.10.66
spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username= elastic
elasticsearch.password= 123456
elasticsearch.password= ENC(gufN64oeUwA39BAN3snaWjKyiKHxKV9n6yk+IUAIur69rV+LlWGtxGZtPYsmzXsL)
##biz custem properties
biz.hk.video.url=http://11.11.16.12:9017/artemis-web/debug
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment