From f366507862db332da6c75e6d2f09b7d299292a2a Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 17 十月 2023 11:13:09 +0800
Subject: [PATCH] 苏州配置文件简化
---
hd/pipe/materialsManage/src/main/resources/application-dev.yml | 12
hd/pipe/materialsManage/src/main/resources/application-pro.yml | 10
hd/pipe/StaffManage/src/main/java/com/thhy/staff/utils/StringToJsonSerizlizerConfig.java | 16 ++
hd/pipe/engineeringManage/src/main/resources/application-pro.yml | 8
hd/pipe/filectrl/src/main/resources/application-pro.yml | 6
hd/pipe/secure/src/main/resources/application-dev.yml | 12
hd/pipe/UserCore/src/main/resources/application-dev.yml | 12
hd/pipe/StaffManage/src/main/resources/application-dev.yml | 23 --
hd/pipe/screen/src/main/resources/application-dev.yml | 12 +
hd/pipe/gateway/src/main/resources/application-dev.yml | 9
hd/pipe/engineeringManage/src/main/resources/application-dev.yml | 8
hd/pipe/StaffManage/src/main/java/com/thhy/staff/config/FaceConfig.java | 21 ++
hd/pipe/StaffManage/src/main/resources/mapping/FaceDeviceMapper.xml | 4
hd/pipe/screen/src/main/resources/application-pro.yml | 12 +
hd/pipe/gateway/src/main/resources/application-pro.yml | 7
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java | 136 +++++-----------
hd/pipe/StaffManage/src/main/java/com/thhy/staff/utils/MqUtils.java | 16 +
hd/pipe/mobile/src/main/resources/application-pro.yml | 8
hd/pipe/mobile/src/main/resources/application-dev.yml | 12
hd/pipe/secure/src/main/resources/application-pro.yml | 10
hd/pipe/ProjectManage/src/main/resources/application-pro.yml | 10
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/entity/MqContent.java | 29 +++
hd/pipe/StaffManage/src/main/resources/application-pro.yml | 12 +
hd/pipe/ProjectManage/src/main/resources/application-dev.yml | 12
hd/pipe/filectrl/src/main/resources/application-dev.yml | 6
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/mapper/FaceDeviceMapper.java | 2
hd/pipe/UserCore/src/main/resources/application-pro.yml | 8
27 files changed, 261 insertions(+), 172 deletions(-)
diff --git a/hd/pipe/ProjectManage/src/main/resources/application-dev.yml b/hd/pipe/ProjectManage/src/main/resources/application-dev.yml
index 51ace43..29ee1c0 100644
--- a/hd/pipe/ProjectManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/ProjectManage/src/main/resources/application-dev.yml
@@ -1,13 +1,11 @@
-server:
- port: 8883
spring:
config:
activate:
on-profile: dev
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -15,6 +13,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
- group: sunacos
\ No newline at end of file
+ group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/ProjectManage/src/main/resources/application-pro.yml b/hd/pipe/ProjectManage/src/main/resources/application-pro.yml
index f1dacbe..ebe85f8 100644
--- a/hd/pipe/ProjectManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/ProjectManage/src/main/resources/application-pro.yml
@@ -4,8 +4,8 @@
on-profile: pro
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -13,6 +13,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
- group: sunacos
\ No newline at end of file
+ group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/config/FaceConfig.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/config/FaceConfig.java
new file mode 100644
index 0000000..296787c
--- /dev/null
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/config/FaceConfig.java
@@ -0,0 +1,21 @@
+package com.thhy.staff.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.io.Serializable;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "face")
+public class FaceConfig implements Serializable {
+
+ private String urlPrefix;
+
+ private String notify;
+
+ private String singlePer;
+
+ private String batchPer;
+}
diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/entity/MqContent.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/entity/MqContent.java
new file mode 100644
index 0000000..062a5a9
--- /dev/null
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/entity/MqContent.java
@@ -0,0 +1,29 @@
+package com.thhy.staff.modules.biz.face.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.thhy.staff.utils.StringToJsonSerizlizerConfig;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MqContent implements Serializable {
+
+ private String method;
+
+ private String notify;
+
+ @JSONField(serializeUsing = StringToJsonSerizlizerConfig.class)
+ private Object data;
+
+ private Object params = new JSONObject();
+
+ public MqContent() {
+ }
+
+ public MqContent(String method, String notify) {
+ this.method = method;
+ this.notify = notify;
+ }
+}
diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/mapper/FaceDeviceMapper.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/mapper/FaceDeviceMapper.java
index 8892e93..6fd8949 100644
--- a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/mapper/FaceDeviceMapper.java
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/mapper/FaceDeviceMapper.java
@@ -21,6 +21,8 @@
List<FaceDevice> findList(FaceDevice facedevice);
+ List<String> queryDevSn();
+
List<FaceDevice> findAll();
int countByDevSn(String devSn);
diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java
index d5117c7..3b4b3c8 100644
--- a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java
@@ -9,30 +9,27 @@
import com.thhy.general.exception.BasicException;
import com.thhy.general.utils.ScreenMqUtils;
import com.thhy.general.utils.UserInfoUtils;
+import com.thhy.staff.config.EmqxConfig;
+import com.thhy.staff.config.FaceConfig;
import com.thhy.staff.modules.biz.applyhistory.entity.UserApplyHistory;
import com.thhy.staff.modules.biz.applyhistory.mapper.UserApplyHistoryMapper;
import com.thhy.staff.modules.biz.depart.entity.OtherUser;
+import com.thhy.staff.modules.biz.face.entity.MqContent;
+import com.thhy.staff.modules.biz.face.mapper.FaceDeviceMapper;
import com.thhy.staff.modules.biz.group.entity.GroupUser;
import com.thhy.staff.modules.biz.netty.NettyServerHandler;
-import com.thhy.staff.modules.biz.platuser.controller.FaceServer;
import com.thhy.staff.modules.biz.platuser.entity.*;
import com.thhy.staff.modules.biz.platuser.mapper.PlatUserMapper;
import com.thhy.staff.modules.biz.platuser.service.PlatUserService;
-import com.thhy.staff.modules.biz.platuser.service.SysUserService;
-import com.thhy.staff.modules.biz.position.mapper.PositionMapper;
import com.thhy.staff.utils.ProcessFlag;
import com.thhy.staff.utils.StaffNoUtils;
import io.netty.channel.ChannelHandlerContext;
+import org.checkerframework.checker.units.qual.A;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.websocket.Session;
-import java.io.IOException;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -53,16 +50,19 @@
private PlatUserMapper platUserMapper;
@Autowired
- private SysUserService sysUserService;
-
- @Autowired
private UserApplyHistoryMapper historyMapper;
@Autowired
- private PositionMapper positionMapper;
+ private ScreenMqUtils screenMqUtils;
@Autowired
- private ScreenMqUtils screenMqUtils;
+ private FaceDeviceMapper faceDeviceMapper;
+
+ @Autowired
+ private EmqxConfig emqxConfig;
+
+ @Autowired
+ private FaceConfig faceConfig;
public PlatUser get(Serializable id){
return platUserMapper.queryById(id);
@@ -387,6 +387,21 @@
platUserMapper.updateFace(faceDto);
if(faceDto.getSyncToDevice()==1){
//下发
+ List<String> sns = faceDeviceMapper.queryDevSn();
+
+ MqContent mqContent = new MqContent("sync_person", faceConfig.getUrlPrefix()+faceConfig.getNotify());
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("path",faceConfig.getUrlPrefix()+faceConfig.getSinglePer());
+ JSONObject pathParamJson = new JSONObject();
+ pathParamJson.put("dev_sno","");
+ pathParamJson.put("limit",10);
+ pathParamJson.put("offset",0);
+ pathParamJson.put("total",1);
+ pathParamJson.put("person_list","[\""+faceDto.getUserId()+"\"]");
+ pathParamJson.put("person_type","4");
+ jsonObject.put("path_params",pathParamJson);
+ mqContent.setData(jsonObject);
/*Map<String,Object> map = AcsMain.addFace(fd.getJobNum(),filePrefix+"/"+fd.getPhoto());
if(map.containsKey("code")){
if(Integer.parseInt(map.get("code").toString())!=0){
@@ -528,82 +543,6 @@
platUserMapper.insertDoorLis(doorLis);
}
-
- public static void main(String[] args) {
- String eventLog = "{\n" +
- "\t\"ipAddress\":\t\"192.168.1.12\",\n" +
- "\t\"ipv6Address\":\t\"240e:345:129e:cf00:e2ca:3cff:fef0:d933\",\n" +
- "\t\"portNo\":\t443,\n" +
- "\t\"protocol\":\t\"HTTPS\",\n" +
- "\t\"macAddress\":\t\"e0:ca:3c:f0:d9:33\",\n" +
- "\t\"channelID\":\t1,\n" +
- "\t\"dateTime\":\t\"2023-09-05T15:44:04+08:00\",\n" +
- "\t\"activePostCount\":\t1,\n" +
- "\t\"eventType\":\t\"AccessControllerEvent\",\n" +
- "\t\"eventState\":\t\"active\",\n" +
- "\t\"eventDescription\":\t\"Access Controller Event\",\n" +
- "\t\"AccessControllerEvent\":\t{\n" +
- "\t\t\"deviceName\":\t\"Access Controller\",\n" +
- "\t\t\"majorEventType\":\t5,\n" +
- "\t\t\"subEventType\":\t76,\n" +
- "\t\t\"cardReaderKind\":\t1,\n" +
- "\t\t\"cardReaderNo\":\t1,\n" +
- "\t\t\"verifyNo\":\t233,\n" +
- "\t\t\"serialNo\":\t437,\n" +
- "\t\t\"currentVerifyMode\":\t\"cardOrFace\",\n" +
- "\t\t\"frontSerialNo\":\t436,\n" +
- "\t\t\"attendanceStatus\":\t\"undefined\",\n" +
- "\t\t\"statusValue\":\t0,\n" +
- "\t\t\"mask\":\t\"no\",\n" +
- "\t\t\"helmet\":\t\"unknown\",\n" +
- "\t\t\"picturesNumber\":\t1,\n" +
- "\t\t\"purePwdVerifyEnable\":\ttrue,\n" +
- "\t\t\"FaceRect\":\t{\n" +
- "\t\t\t\"height\":\t0.116000,\n" +
- "\t\t\t\"width\":\t0.065000,\n" +
- "\t\t\t\"x\":\t0.546000,\n" +
- "\t\t\t\"y\":\t0.634000\n" +
- "\t\t}\n" +
- "\t}\n" +
- "}";
- JSONObject jsonObject = JSONObject.parseObject(eventLog);
-
- if(!jsonObject.containsKey("eventType")){
- //platUserMapper.addDoorHis(eventLog);
- return;
- }
- String eventType = jsonObject.getString("eventType");
- if(!"AccessControllerEvent".equals(eventType)){
- //platUserMapper.addDoorHis(eventLog);
- return;
- }
-
- JSONObject control = jsonObject.getJSONObject("AccessControllerEvent");
-
- String majorEventType = control.getString("majorEventType");
- if(!"1".equals(majorEventType)&&!"5".equals(majorEventType)){
- //platUserMapper.addDoorHis(eventLog);
- return;
- }
-
- DoorLis doorLis = new DoorLis();
- //doorLis.setOriStr(eventLog);
- doorLis.setIpAddress(jsonObject.getString("ipAddress"));
- doorLis.setMacAddress(jsonObject.getString("macAddress"));
- doorLis.setNoticeType(Integer.parseInt(majorEventType));
- if("5".equals(majorEventType)){
- String subEventType = control.getString("subEventType");
- if("75".equals(subEventType)){
- doorLis.setVerify(1);
- doorLis.setName(control.getString("name"));
- doorLis.setEmployeeNoString(control.getString("employeeNoString"));
- }else if("76".equals(subEventType)){
- doorLis.setVerify(2);
- }
- }
-
- }
-
@Override
public Map<String, Object> faceRecord(String token) {
SysUserInfo userInfo = UserInfoUtils.getInstance().getUserInfo(token);
@@ -671,4 +610,23 @@
}
platUserMapper.insertDoorListener(doorLisPic);
}
+
+ public static void main(String[] args) {
+ MqContent mqContent = new MqContent("sync_person", "notify");
+ String uu = "02d32ee86bec2b11e4b23eb6";
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("path","/path");
+ JSONObject pathParamJson = new JSONObject();
+
+ pathParamJson.put("dev_sno","");
+ pathParamJson.put("limit",10);
+ pathParamJson.put("offset",0);
+ pathParamJson.put("total",1);
+ pathParamJson.put("person_list","[\""+uu+"\"]");
+ pathParamJson.put("person_type","4");
+ jsonObject.put("path_params",pathParamJson);
+ mqContent.setData(jsonObject);
+
+ System.out.println(pathParamJson.toJSONString());
+ }
}
diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/utils/MqUtils.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/utils/MqUtils.java
index 31f6ae0..f975e44 100644
--- a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/utils/MqUtils.java
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/utils/MqUtils.java
@@ -8,13 +8,14 @@
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import java.util.List;
+
public class MqUtils {
- public static void createClient(EmqxConfig emqxConfig){
+ public static void createClient(EmqxConfig emqxConfig, List<String> topics, String content){
String broker = "tcp://"+emqxConfig.getHost()+":"+emqxConfig.getPort();
String clientId = UUIDUtils.create();
MemoryPersistence persistence = new MemoryPersistence();
-
try {
MqttClient client = new MqttClient(broker, clientId, persistence);
@@ -39,11 +40,12 @@
//client.subscribe(subTopic);
// 消息发布所需参数
- /* MqttMessage message = new MqttMessage(content.getBytes());
- message.setQos(qos);
- client.publish(pubTopic, message);
- System.out.println("Message published");*/
-
+ MqttMessage message = new MqttMessage(content.getBytes());
+ message.setQos(emqxConfig.getQos());
+ for(String pubTopic : topics){
+ client.publish(pubTopic, message);
+ }
+ System.out.println("Message published");
client.disconnect();
} catch (MqttException e) {
throw new RuntimeException(e);
diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/utils/StringToJsonSerizlizerConfig.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/utils/StringToJsonSerizlizerConfig.java
new file mode 100644
index 0000000..70ebeb3
--- /dev/null
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/utils/StringToJsonSerizlizerConfig.java
@@ -0,0 +1,16 @@
+package com.thhy.staff.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.JSONSerializer;
+import com.alibaba.fastjson.serializer.ObjectSerializer;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+
+public class StringToJsonSerizlizerConfig implements ObjectSerializer {
+
+ @Override
+ public void write(JSONSerializer jsonSerializer, Object o, Object o1, Type type, int i) throws IOException {
+ jsonSerializer.write(JSONObject.parseObject(o.toString()));
+ }
+}
diff --git a/hd/pipe/StaffManage/src/main/resources/application-dev.yml b/hd/pipe/StaffManage/src/main/resources/application-dev.yml
index c172a05..9b922ae 100644
--- a/hd/pipe/StaffManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/StaffManage/src/main/resources/application-dev.yml
@@ -1,13 +1,11 @@
-server:
- port: 8882
spring:
config:
activate:
on-profile: dev
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -15,19 +13,12 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
group: sunacos
-global:
- filePrefix: https://pipe.thhy-tj.com/
-emqx:
- host: 111.30.93.215
- port: 1883
- username: thhy
- password: thhy123
- qos: 1
- topic: FF:AA:F4:12:67:05
- willTopic: FF:AA:F4:12:67:05-W
- willContent: FF:AA:F4:12:67:05-offline
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
netty:
- port: 10001
\ No newline at end of file
+ port: ${${spring.application.name}nettyport}
diff --git a/hd/pipe/StaffManage/src/main/resources/application-pro.yml b/hd/pipe/StaffManage/src/main/resources/application-pro.yml
index 180c871..2f83d6b 100644
--- a/hd/pipe/StaffManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/StaffManage/src/main/resources/application-pro.yml
@@ -4,8 +4,8 @@
on-profile: pro
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -13,8 +13,12 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
group: sunacos
-global:
- filePrefix: https://pipe.thhy-tj.com/
\ No newline at end of file
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
+netty:
+ port: ${${spring.application.name}nettyport}
\ No newline at end of file
diff --git a/hd/pipe/StaffManage/src/main/resources/mapping/FaceDeviceMapper.xml b/hd/pipe/StaffManage/src/main/resources/mapping/FaceDeviceMapper.xml
index f503fe0..7a2ce99 100644
--- a/hd/pipe/StaffManage/src/main/resources/mapping/FaceDeviceMapper.xml
+++ b/hd/pipe/StaffManage/src/main/resources/mapping/FaceDeviceMapper.xml
@@ -77,6 +77,10 @@
<include refid="condition_query" />
</select>
+ <select id="queryDevSn" resultType="string">
+ select t.dev_sno as devSno from t_face_device t
+ </select>
+
<!--查询列表-->
<select id="findAll" resultType="com.thhy.staff.modules.biz.face.entity.FaceDevice">
SELECT
diff --git a/hd/pipe/UserCore/src/main/resources/application-dev.yml b/hd/pipe/UserCore/src/main/resources/application-dev.yml
index ddac89d..22b8584 100644
--- a/hd/pipe/UserCore/src/main/resources/application-dev.yml
+++ b/hd/pipe/UserCore/src/main/resources/application-dev.yml
@@ -1,13 +1,11 @@
-server:
- port: 8881
spring:
config:
activate:
on-profile: dev
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -15,9 +13,13 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
group: sunacos
+ namespace: suzhou
wemp:
appId: wx993e9d4056f0f44e
- secret: 87f19fa7f1e6898fb143396283e733b8
\ No newline at end of file
+ secret: 87f19fa7f1e6898fb143396283e733b8
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/UserCore/src/main/resources/application-pro.yml b/hd/pipe/UserCore/src/main/resources/application-pro.yml
index a041661..a6c5c4e 100644
--- a/hd/pipe/UserCore/src/main/resources/application-pro.yml
+++ b/hd/pipe/UserCore/src/main/resources/application-pro.yml
@@ -4,8 +4,8 @@
on-profile: pro
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -18,4 +18,6 @@
group: sunacos
wemp:
appId: wx993e9d4056f0f44e
- secret: 87f19fa7f1e6898fb143396283e733b8
\ No newline at end of file
+ secret: 87f19fa7f1e6898fb143396283e733b8
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/engineeringManage/src/main/resources/application-dev.yml b/hd/pipe/engineeringManage/src/main/resources/application-dev.yml
index 1a1133a..490ac3d 100644
--- a/hd/pipe/engineeringManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/engineeringManage/src/main/resources/application-dev.yml
@@ -4,8 +4,8 @@
on-profile: dev
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -13,6 +13,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
diff --git a/hd/pipe/engineeringManage/src/main/resources/application-pro.yml b/hd/pipe/engineeringManage/src/main/resources/application-pro.yml
index 6646890..ebe85f8 100644
--- a/hd/pipe/engineeringManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/engineeringManage/src/main/resources/application-pro.yml
@@ -4,8 +4,8 @@
on-profile: pro
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -13,6 +13,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/filectrl/src/main/resources/application-dev.yml b/hd/pipe/filectrl/src/main/resources/application-dev.yml
index e8dc5f2..11f610b 100644
--- a/hd/pipe/filectrl/src/main/resources/application-dev.yml
+++ b/hd/pipe/filectrl/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@
on-profile: dev
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -12,6 +12,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
diff --git a/hd/pipe/filectrl/src/main/resources/application-pro.yml b/hd/pipe/filectrl/src/main/resources/application-pro.yml
index 012db33..0ea273e 100644
--- a/hd/pipe/filectrl/src/main/resources/application-pro.yml
+++ b/hd/pipe/filectrl/src/main/resources/application-pro.yml
@@ -4,7 +4,7 @@
on-profile: pro
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -12,6 +12,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
diff --git a/hd/pipe/gateway/src/main/resources/application-dev.yml b/hd/pipe/gateway/src/main/resources/application-dev.yml
index e267699..f8e401b 100644
--- a/hd/pipe/gateway/src/main/resources/application-dev.yml
+++ b/hd/pipe/gateway/src/main/resources/application-dev.yml
@@ -1,5 +1,3 @@
-server:
- port: 8880
spring:
cloud:
nacos:
@@ -8,11 +6,16 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
group: sunacos
+ namespace: suzhou
config:
activate:
on-profile: dev
import:
- - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
\ No newline at end of file
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/gateway/src/main/resources/application-pro.yml b/hd/pipe/gateway/src/main/resources/application-pro.yml
index bf4520a..1aeb7ac 100644
--- a/hd/pipe/gateway/src/main/resources/application-pro.yml
+++ b/hd/pipe/gateway/src/main/resources/application-pro.yml
@@ -6,11 +6,16 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
group: sunacos
+ namespace: suzhou
config:
activate:
on-profile: pro
import:
- - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
\ No newline at end of file
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/materialsManage/src/main/resources/application-dev.yml b/hd/pipe/materialsManage/src/main/resources/application-dev.yml
index 7b7de76..29ee1c0 100644
--- a/hd/pipe/materialsManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/materialsManage/src/main/resources/application-dev.yml
@@ -1,13 +1,11 @@
-server:
- port: 8892
spring:
config:
activate:
on-profile: dev
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -15,6 +13,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
- group: sunacos
\ No newline at end of file
+ group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/materialsManage/src/main/resources/application-pro.yml b/hd/pipe/materialsManage/src/main/resources/application-pro.yml
index f1dacbe..ebe85f8 100644
--- a/hd/pipe/materialsManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/materialsManage/src/main/resources/application-pro.yml
@@ -4,8 +4,8 @@
on-profile: pro
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -13,6 +13,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
- group: sunacos
\ No newline at end of file
+ group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/mobile/src/main/resources/application-dev.yml b/hd/pipe/mobile/src/main/resources/application-dev.yml
index 821bb43..29ee1c0 100644
--- a/hd/pipe/mobile/src/main/resources/application-dev.yml
+++ b/hd/pipe/mobile/src/main/resources/application-dev.yml
@@ -1,13 +1,11 @@
-server:
- port: 8884
spring:
config:
activate:
on-profile: dev
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -15,6 +13,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
- group: sunacos
\ No newline at end of file
+ group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/mobile/src/main/resources/application-pro.yml b/hd/pipe/mobile/src/main/resources/application-pro.yml
index f1dacbe..8b95dc3 100644
--- a/hd/pipe/mobile/src/main/resources/application-pro.yml
+++ b/hd/pipe/mobile/src/main/resources/application-pro.yml
@@ -4,8 +4,8 @@
on-profile: pro
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -15,4 +15,6 @@
group: supipe
config:
file-extension: yml
- group: sunacos
\ No newline at end of file
+ group: sunacos
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/screen/src/main/resources/application-dev.yml b/hd/pipe/screen/src/main/resources/application-dev.yml
index f5bd292..d272ba8 100644
--- a/hd/pipe/screen/src/main/resources/application-dev.yml
+++ b/hd/pipe/screen/src/main/resources/application-dev.yml
@@ -4,8 +4,8 @@
on-profile: dev
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -13,6 +13,12 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
- group: sunacos
\ No newline at end of file
+ group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
+netty:
+ port: ${${spring.application.name}nettyport}
\ No newline at end of file
diff --git a/hd/pipe/screen/src/main/resources/application-pro.yml b/hd/pipe/screen/src/main/resources/application-pro.yml
index f1dacbe..2f83d6b 100644
--- a/hd/pipe/screen/src/main/resources/application-pro.yml
+++ b/hd/pipe/screen/src/main/resources/application-pro.yml
@@ -4,8 +4,8 @@
on-profile: pro
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -13,6 +13,12 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
- group: sunacos
\ No newline at end of file
+ group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
+netty:
+ port: ${${spring.application.name}nettyport}
\ No newline at end of file
diff --git a/hd/pipe/secure/src/main/resources/application-dev.yml b/hd/pipe/secure/src/main/resources/application-dev.yml
index b8519ec..29ee1c0 100644
--- a/hd/pipe/secure/src/main/resources/application-dev.yml
+++ b/hd/pipe/secure/src/main/resources/application-dev.yml
@@ -1,13 +1,11 @@
-server:
- port: 8886
spring:
config:
activate:
on-profile: dev
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -15,6 +13,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
- group: sunacos
\ No newline at end of file
+ group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
diff --git a/hd/pipe/secure/src/main/resources/application-pro.yml b/hd/pipe/secure/src/main/resources/application-pro.yml
index f1dacbe..ebe85f8 100644
--- a/hd/pipe/secure/src/main/resources/application-pro.yml
+++ b/hd/pipe/secure/src/main/resources/application-pro.yml
@@ -4,8 +4,8 @@
on-profile: pro
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
@@ -13,6 +13,10 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
- group: sunacos
\ No newline at end of file
+ group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
--
Gitblit v1.9.3